fisharebest / webtrees

app/Schema/Migration11.php

Indentation +17 added lines, -17 removed lines

@@ -22,22 +22,22 @@
  * Upgrade the database schema from version 11 to version 12.
  */
 class Migration11 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// - delete the wt_name.n_list column; it has never been used
-		// - a bug in webtrees 1.1.2 caused the wt_name.n_full column
-		// to include slashes around the surname. These are unnecessary,
-		// and cause problems when we try to match the name from the
-		// gedcom with the name from the table.
-		// Remove slashes from INDI names
-		Database::exec("UPDATE `##name` SET n_full=REPLACE(n_full, '/', '') WHERE n_surn IS NOT NULL");
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // - delete the wt_name.n_list column; it has never been used
+        // - a bug in webtrees 1.1.2 caused the wt_name.n_full column
+        // to include slashes around the surname. These are unnecessary,
+        // and cause problems when we try to match the name from the
+        // gedcom with the name from the table.
+        // Remove slashes from INDI names
+        Database::exec("UPDATE `##name` SET n_full=REPLACE(n_full, '/', '') WHERE n_surn IS NOT NULL");
 
-		try {
-			Database::exec("ALTER TABLE `##name` DROP n_list");
-		} catch (PDOException $x) {
-			// Already done?
-		}
-	}
+        try {
+            Database::exec("ALTER TABLE `##name` DROP n_list");
+        } catch (PDOException $x) {
+            // Already done?
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,11 +21,13 @@
 /**
  * Upgrade the database schema from version 11 to version 12.
  */
-class Migration11 implements MigrationInterface {
+class Migration11 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// - delete the wt_name.n_list column; it has never been used
 		// - a bug in webtrees 1.1.2 caused the wt_name.n_full column
 		// to include slashes around the surname. These are unnecessary,

app/Schema/Migration34.php

Indentation +11 added lines, -11 removed lines

@@ -22,16 +22,16 @@
  * Upgrade the database schema from version 34 to version 35.
  */
 class Migration34 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// New modules (charts) have been added.
-		Module::getInstalledModules('enabled');
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // New modules (charts) have been added.
+        Module::getInstalledModules('enabled');
 
-		// Delete old/unused settings
-		Database::exec(
-			"DELETE FROM `##gedcom_setting` WHERE setting_name IN ('COMMON_NAMES_ADD', 'COMMON_NAMES_REMOVE', 'COMMON_NAMES_THRESHOLD')"
-		);
-	}
+        // Delete old/unused settings
+        Database::exec(
+            "DELETE FROM `##gedcom_setting` WHERE setting_name IN ('COMMON_NAMES_ADD', 'COMMON_NAMES_REMOVE', 'COMMON_NAMES_THRESHOLD')"
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,11 +21,13 @@
 /**
  * Upgrade the database schema from version 34 to version 35.
  */
-class Migration34 implements MigrationInterface {
+class Migration34 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// New modules (charts) have been added.
 		Module::getInstalledModules('enabled');
 

app/Schema/Migration2.php

Indentation +25 added lines, -25 removed lines

@@ -22,31 +22,31 @@
  * Upgrade the database schema from version 2 to version 2.
  */
 class Migration2 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// - create the wt_gedcom_chunk table to import gedcoms in
-		// blocks of data smaller than the max_allowed_packet restriction.
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // - create the wt_gedcom_chunk table to import gedcoms in
+        // blocks of data smaller than the max_allowed_packet restriction.
 
-		Database::exec(
-			"CREATE TABLE IF NOT EXISTS `##gedcom_chunk` (" .
-			" gedcom_chunk_id INTEGER AUTO_INCREMENT NOT NULL," .
-			" gedcom_id       INTEGER                NOT NULL," .
-			" chunk_data      MEDIUMBLOB             NOT NULL," .
-			" imported        BOOLEAN                NOT NULL DEFAULT FALSE," .
-			" PRIMARY KEY     (gedcom_chunk_id)," .
-			"         KEY ix1 (gedcom_id, imported)," .
-			" FOREIGN KEY `##gedcom_chunk_fk1` (gedcom_id) REFERENCES `##gedcom` (gedcom_id)" .
-			") COLLATE utf8_unicode_ci ENGINE=InnoDB"
-		);
+        Database::exec(
+            "CREATE TABLE IF NOT EXISTS `##gedcom_chunk` (" .
+            " gedcom_chunk_id INTEGER AUTO_INCREMENT NOT NULL," .
+            " gedcom_id       INTEGER                NOT NULL," .
+            " chunk_data      MEDIUMBLOB             NOT NULL," .
+            " imported        BOOLEAN                NOT NULL DEFAULT FALSE," .
+            " PRIMARY KEY     (gedcom_chunk_id)," .
+            "         KEY ix1 (gedcom_id, imported)," .
+            " FOREIGN KEY `##gedcom_chunk_fk1` (gedcom_id) REFERENCES `##gedcom` (gedcom_id)" .
+            ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
+        );
 
-		try {
-			Database::exec(
-				"ALTER TABLE `##gedcom` DROP import_gedcom, DROP import_offset"
-			);
-		} catch (PDOException $ex) {
-			// Perhaps we have already deleted these columns?
-		}
-	}
+        try {
+            Database::exec(
+                "ALTER TABLE `##gedcom` DROP import_gedcom, DROP import_offset"
+            );
+        } catch (PDOException $ex) {
+            // Perhaps we have already deleted these columns?
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,11 +21,13 @@
 /**
  * Upgrade the database schema from version 2 to version 2.
  */
-class Migration2 implements MigrationInterface {
+class Migration2 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// - create the wt_gedcom_chunk table to import gedcoms in
 		// blocks of data smaller than the max_allowed_packet restriction.
 

app/Schema/Migration22.php

Indentation +67 added lines, -67 removed lines

@@ -22,74 +22,74 @@
  * Upgrade the database schema from version 22 to version 23.
  */
 class Migration22 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// - data update for 1.4.0 media changes
-		$_cfgs = Database::prepare(
-			"SELECT gs1.gedcom_id AS gedcom_id, gs1.setting_value AS media_directory, gs2.setting_value AS use_media_firewall, gs3.setting_value AS media_firewall_thumbs, gs4.setting_value AS media_firewall_rootdir" .
-			" FROM `##gedcom_setting` gs1" .
-			" LEFT JOIN `##gedcom_setting` gs2 ON (gs1.gedcom_id = gs2.gedcom_id AND gs2.setting_name='USE_MEDIA_FIREWALL')" .
-			" LEFT JOIN `##gedcom_setting` gs3 ON (gs1.gedcom_id = gs3.gedcom_id AND gs3.setting_name='MEDIA_FIREWALL_THUMBS')" .
-			" LEFT JOIN `##gedcom_setting` gs4 ON (gs1.gedcom_id = gs4.gedcom_id AND gs4.setting_name='MEDIA_FIREWALL_ROOTDIR')" .
-			" WHERE gs1.setting_name = 'MEDIA_DIRECTORY'"
-		)->fetchAll();
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // - data update for 1.4.0 media changes
+        $_cfgs = Database::prepare(
+            "SELECT gs1.gedcom_id AS gedcom_id, gs1.setting_value AS media_directory, gs2.setting_value AS use_media_firewall, gs3.setting_value AS media_firewall_thumbs, gs4.setting_value AS media_firewall_rootdir" .
+            " FROM `##gedcom_setting` gs1" .
+            " LEFT JOIN `##gedcom_setting` gs2 ON (gs1.gedcom_id = gs2.gedcom_id AND gs2.setting_name='USE_MEDIA_FIREWALL')" .
+            " LEFT JOIN `##gedcom_setting` gs3 ON (gs1.gedcom_id = gs3.gedcom_id AND gs3.setting_name='MEDIA_FIREWALL_THUMBS')" .
+            " LEFT JOIN `##gedcom_setting` gs4 ON (gs1.gedcom_id = gs4.gedcom_id AND gs4.setting_name='MEDIA_FIREWALL_ROOTDIR')" .
+            " WHERE gs1.setting_name = 'MEDIA_DIRECTORY'"
+        )->fetchAll();
 
-		// The constant WT_DATA_DIR is not defined yet (although it was when this script was originally written).
-		$WT_DATA_DIR = realpath('data');
+        // The constant WT_DATA_DIR is not defined yet (although it was when this script was originally written).
+        $WT_DATA_DIR = realpath('data');
 
-		// Check the config for each tree
-		foreach ($_cfgs as $_cfg) {
-			if ($_cfg->use_media_firewall) {
-				// We’re using the media firewall.
-				$_mf_dir = realpath($_cfg->media_firewall_rootdir) . DIRECTORY_SEPARATOR;
-				if ($_mf_dir == $WT_DATA_DIR) {
-					// We’re already storing our media in the data folder - nothing to do.
-				} else {
-					// We’ve chosen a custom location for our media folder - need to update our media-folder to point to it.
-					// We have, for example,
-					// $_mf_dir = /home/fisharebest/my_pictures/
-					// $WT_DATA_DIR = /home/fisharebest/public_html/webtrees/data/
-					// Therefore we need to calculate ../../../my_pictures/
-					$_media_dir = '';
-					$_tmp_dir   = $WT_DATA_DIR;
-					while (strpos($_mf_dir, $_tmp_dir) !== 0) {
-						$_media_dir .= '../';
-						$_tmp_dir = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
-						if ($_tmp_dir == '') {
-							// Shouldn't get here - but this script is not allowed to fail...
-							continue 2;
-						}
-					}
-					$_media_dir .= $_cfg->media_directory;
-					Database::prepare(
-						"UPDATE `##gedcom_setting`" .
-						" SET setting_value=?" .
-						" WHERE gedcom_id=? AND setting_name='MEDIA_DIRECTORY'"
-					)->execute(array($_media_dir, $_cfg->gedcom_id));
-				}
-			} else {
-				// Not using the media firewall - just move the public folder to the new location (if we can).
-				if (
-					file_exists(WT_ROOT . $_cfg->media_directory) &&
-					is_dir(WT_ROOT . $_cfg->media_directory) &&
-					!file_exists($WT_DATA_DIR . $_cfg->media_directory)
-				) {
-					try {
-						rename(WT_ROOT . $_cfg->media_directory, $WT_DATA_DIR . $_cfg->media_directory);
-					} catch (\ErrorException $ex) {
-						// Cannot move the folder?
-					}
-					File::delete($WT_DATA_DIR . $_cfg->media_directory . '.htaccess');
-					File::delete($WT_DATA_DIR . $_cfg->media_directory . 'index.php');
-					File::delete($WT_DATA_DIR . $_cfg->media_directory . 'Mediainfo.txt');
-					File::delete($WT_DATA_DIR . $_cfg->media_directory . 'thumbs/Thumbsinfo.txt');
-				}
-			}
-		}
+        // Check the config for each tree
+        foreach ($_cfgs as $_cfg) {
+            if ($_cfg->use_media_firewall) {
+                // We’re using the media firewall.
+                $_mf_dir = realpath($_cfg->media_firewall_rootdir) . DIRECTORY_SEPARATOR;
+                if ($_mf_dir == $WT_DATA_DIR) {
+                    // We’re already storing our media in the data folder - nothing to do.
+                } else {
+                    // We’ve chosen a custom location for our media folder - need to update our media-folder to point to it.
+                    // We have, for example,
+                    // $_mf_dir = /home/fisharebest/my_pictures/
+                    // $WT_DATA_DIR = /home/fisharebest/public_html/webtrees/data/
+                    // Therefore we need to calculate ../../../my_pictures/
+                    $_media_dir = '';
+                    $_tmp_dir   = $WT_DATA_DIR;
+                    while (strpos($_mf_dir, $_tmp_dir) !== 0) {
+                        $_media_dir .= '../';
+                        $_tmp_dir = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
+                        if ($_tmp_dir == '') {
+                            // Shouldn't get here - but this script is not allowed to fail...
+                            continue 2;
+                        }
+                    }
+                    $_media_dir .= $_cfg->media_directory;
+                    Database::prepare(
+                        "UPDATE `##gedcom_setting`" .
+                        " SET setting_value=?" .
+                        " WHERE gedcom_id=? AND setting_name='MEDIA_DIRECTORY'"
+                    )->execute(array($_media_dir, $_cfg->gedcom_id));
+                }
+            } else {
+                // Not using the media firewall - just move the public folder to the new location (if we can).
+                if (
+                    file_exists(WT_ROOT . $_cfg->media_directory) &&
+                    is_dir(WT_ROOT . $_cfg->media_directory) &&
+                    !file_exists($WT_DATA_DIR . $_cfg->media_directory)
+                ) {
+                    try {
+                        rename(WT_ROOT . $_cfg->media_directory, $WT_DATA_DIR . $_cfg->media_directory);
+                    } catch (\ErrorException $ex) {
+                        // Cannot move the folder?
+                    }
+                    File::delete($WT_DATA_DIR . $_cfg->media_directory . '.htaccess');
+                    File::delete($WT_DATA_DIR . $_cfg->media_directory . 'index.php');
+                    File::delete($WT_DATA_DIR . $_cfg->media_directory . 'Mediainfo.txt');
+                    File::delete($WT_DATA_DIR . $_cfg->media_directory . 'thumbs/Thumbsinfo.txt');
+                }
+            }
+        }
 
-		// Delete old settings
-		Database::exec("DELETE FROM `##gedcom_setting` WHERE setting_name IN ('USE_MEDIA_FIREWALL', 'MEDIA_FIREWALL_THUMBS', 'MEDIA_FIREWALL_ROOTDIR')");
-	}
+        // Delete old settings
+        Database::exec("DELETE FROM `##gedcom_setting` WHERE setting_name IN ('USE_MEDIA_FIREWALL', 'MEDIA_FIREWALL_THUMBS', 'MEDIA_FIREWALL_ROOTDIR')");
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,11 +21,13 @@
 /**
  * Upgrade the database schema from version 22 to version 23.
  */
-class Migration22 implements MigrationInterface {
+class Migration22 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// - data update for 1.4.0 media changes
 		$_cfgs = Database::prepare(
 			"SELECT gs1.gedcom_id AS gedcom_id, gs1.setting_value AS media_directory, gs2.setting_value AS use_media_firewall, gs3.setting_value AS media_firewall_thumbs, gs4.setting_value AS media_firewall_rootdir" .

app/Schema/Migration27.php

Indentation +32 added lines, -32 removed lines

@@ -22,39 +22,39 @@
  * Upgrade the database schema from version 27 to version 28.
  */
 class Migration27 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// Delete old/unused settings
-		Database::exec(
-			"DELETE FROM `##gedcom_setting` WHERE setting_name IN ('USE_GEONAMES')"
-		);
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // Delete old/unused settings
+        Database::exec(
+            "DELETE FROM `##gedcom_setting` WHERE setting_name IN ('USE_GEONAMES')"
+        );
 
-		try {
-			// Indexes created by setup.php or schema update 17-18
-			Database::exec("ALTER TABLE `##site_access_rule` DROP INDEX ix1, DROP INDEX ix2, DROP INDEX ix3");
-			// Indexes created by schema update 17-18
-			Database::exec("ALTER TABLE `##site_access_rule` DROP INDEX ix4, DROP INDEX ix5, DROP INDEX ix6");
-		} catch (PDOException $ex) {
-			// Already done?
-		}
+        try {
+            // Indexes created by setup.php or schema update 17-18
+            Database::exec("ALTER TABLE `##site_access_rule` DROP INDEX ix1, DROP INDEX ix2, DROP INDEX ix3");
+            // Indexes created by schema update 17-18
+            Database::exec("ALTER TABLE `##site_access_rule` DROP INDEX ix4, DROP INDEX ix5, DROP INDEX ix6");
+        } catch (PDOException $ex) {
+            // Already done?
+        }
 
-		// User data may contains duplicates - these will prevent us from creating the new indexes
-		Database::exec(
-			"DELETE t1 FROM `##site_access_rule` AS t1 JOIN `##site_access_rule` AS t2 ON t1.ip_address_end = t2.ip_address_end AND t1.ip_address_start = t2.ip_address_start AND t1.user_agent_pattern = t2.user_agent_pattern AND t1.site_access_rule_id <> t2.site_access_rule_id"
-		);
+        // User data may contains duplicates - these will prevent us from creating the new indexes
+        Database::exec(
+            "DELETE t1 FROM `##site_access_rule` AS t1 JOIN `##site_access_rule` AS t2 ON t1.ip_address_end = t2.ip_address_end AND t1.ip_address_start = t2.ip_address_start AND t1.user_agent_pattern = t2.user_agent_pattern AND t1.site_access_rule_id <> t2.site_access_rule_id"
+        );
 
-		// ix1 - covering index for visitor lookup
-		// ix2 - for total counts in admin page
-		try {
-			Database::exec(
-				"ALTER TABLE `##site_access_rule`" .
-				" ADD UNIQUE INDEX `##site_access_rule_ix1` (ip_address_end, ip_address_start, user_agent_pattern, rule)," .
-				" ADD        INDEX `##site_access_rule_ix2` (rule)"
-			);
-		} catch (PDOException $ex) {
-			// Already done?
-		}
-	}
+        // ix1 - covering index for visitor lookup
+        // ix2 - for total counts in admin page
+        try {
+            Database::exec(
+                "ALTER TABLE `##site_access_rule`" .
+                " ADD UNIQUE INDEX `##site_access_rule_ix1` (ip_address_end, ip_address_start, user_agent_pattern, rule)," .
+                " ADD        INDEX `##site_access_rule_ix2` (rule)"
+            );
+        } catch (PDOException $ex) {
+            // Already done?
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,11 +21,13 @@
 /**
  * Upgrade the database schema from version 27 to version 28.
  */
-class Migration27 implements MigrationInterface {
+class Migration27 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Delete old/unused settings
 		Database::exec(
 			"DELETE FROM `##gedcom_setting` WHERE setting_name IN ('USE_GEONAMES')"

app/Schema/Migration1.php

Indentation +19 added lines, -19 removed lines

@@ -21,23 +21,23 @@
  * Upgrade the database schema from version 1 to version 2.
  */
 class Migration1 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// Create the wt_session table to store session data in the database,
-		// rather than in the filesystem.
-		Database::exec(
-			"CREATE TABLE IF NOT EXISTS `##session` (" .
-			" session_id   CHAR(32)    NOT NULL," .
-			" session_time TIMESTAMP   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP," .
-			" user_id      INTEGER     NOT NULL," .
-			" ip_address   VARCHAR(32) NOT NULL," .
-			" session_data MEDIUMBLOB  NOT NULL," .
-			" PRIMARY KEY     (session_id)," .
-			"         KEY ix1 (session_time)," .
-			"         KEY ix2 (user_id, ip_address)" .
-			") COLLATE utf8_unicode_ci ENGINE=InnoDB"
-		);
-	}
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // Create the wt_session table to store session data in the database,
+        // rather than in the filesystem.
+        Database::exec(
+            "CREATE TABLE IF NOT EXISTS `##session` (" .
+            " session_id   CHAR(32)    NOT NULL," .
+            " session_time TIMESTAMP   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP," .
+            " user_id      INTEGER     NOT NULL," .
+            " ip_address   VARCHAR(32) NOT NULL," .
+            " session_data MEDIUMBLOB  NOT NULL," .
+            " PRIMARY KEY     (session_id)," .
+            "         KEY ix1 (session_time)," .
+            "         KEY ix2 (user_id, ip_address)" .
+            ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,11 +20,13 @@
 /**
  * Upgrade the database schema from version 1 to version 2.
  */
-class Migration1 implements MigrationInterface {
+class Migration1 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Create the wt_session table to store session data in the database,
 		// rather than in the filesystem.
 		Database::exec(

app/Schema/Migration33.php

Indentation +9 added lines, -9 removed lines

@@ -21,13 +21,13 @@
  * Upgrade the database schema from version 33 to version 34.
  */
 class Migration33 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		Database::exec(
-			"INSERT IGNORE INTO `##site_access_rule` (user_agent_pattern, rule, comment) VALUES" .
-			" ('Mozilla/5.0 (Mobile; Windows Phone 8.1; % Microsoft; %', 'allow', 'Windows Phone 8.1')"
-		);
-	}
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        Database::exec(
+            "INSERT IGNORE INTO `##site_access_rule` (user_agent_pattern, rule, comment) VALUES" .
+            " ('Mozilla/5.0 (Mobile; Windows Phone 8.1; % Microsoft; %', 'allow', 'Windows Phone 8.1')"
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,11 +20,13 @@
 /**
  * Upgrade the database schema from version 33 to version 34.
  */
-class Migration33 implements MigrationInterface {
+class Migration33 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		Database::exec(
 			"INSERT IGNORE INTO `##site_access_rule` (user_agent_pattern, rule, comment) VALUES" .
 			" ('Mozilla/5.0 (Mobile; Windows Phone 8.1; % Microsoft; %', 'allow', 'Windows Phone 8.1')"

app/Schema/Migration24.php

Indentation +19 added lines, -19 removed lines

@@ -21,25 +21,25 @@
  * Upgrade the database schema from version 24 to version 25.
  */
 class Migration24 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// Tree settings become site settings
-		Database::exec(
-			"INSERT IGNORE INTO `##site_setting` (setting_name, setting_value)" .
-			" SELECT setting_name, MIN(setting_value)" . // Can't use ANY_VALUE() until MySQL5.7
-			" FROM `##gedcom_setting`" .
-			" WHERE setting_name IN ('SHOW_REGISTER_CAUTION', 'WELCOME_TEXT_CUST_HEAD') OR setting_name LIKE 'WELCOME_TEXT_AUTH_MODE%'" .
-			" GROUP BY setting_name"
-		);
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // Tree settings become site settings
+        Database::exec(
+            "INSERT IGNORE INTO `##site_setting` (setting_name, setting_value)" .
+            " SELECT setting_name, MIN(setting_value)" . // Can't use ANY_VALUE() until MySQL5.7
+            " FROM `##gedcom_setting`" .
+            " WHERE setting_name IN ('SHOW_REGISTER_CAUTION', 'WELCOME_TEXT_CUST_HEAD') OR setting_name LIKE 'WELCOME_TEXT_AUTH_MODE%'" .
+            " GROUP BY setting_name"
+        );
 
-		Database::exec(
-			"DELETE FROM `##gedcom_setting` WHERE setting_name IN ('ALLOW_EDIT_GEDCOM', 'SHOW_REGISTER_CAUTION', 'WELCOME_TEXT_CUST_HEAD') OR setting_name LIKE 'WELCOME_TEXT_AUTH_MODE%'"
-		);
+        Database::exec(
+            "DELETE FROM `##gedcom_setting` WHERE setting_name IN ('ALLOW_EDIT_GEDCOM', 'SHOW_REGISTER_CAUTION', 'WELCOME_TEXT_CUST_HEAD') OR setting_name LIKE 'WELCOME_TEXT_AUTH_MODE%'"
+        );
 
-		Database::exec(
-			"DELETE FROM `##site_setting` WHERE setting_name IN ('STORE_MESSAGES')"
-		);
-	}
+        Database::exec(
+            "DELETE FROM `##site_setting` WHERE setting_name IN ('STORE_MESSAGES')"
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,11 +20,13 @@
 /**
  * Upgrade the database schema from version 24 to version 25.
  */
-class Migration24 implements MigrationInterface {
+class Migration24 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Tree settings become site settings
 		Database::exec(
 			"INSERT IGNORE INTO `##site_setting` (setting_name, setting_value)" .

app/Schema/Migration8.php

Indentation +13 added lines, -13 removed lines

@@ -22,17 +22,17 @@
  * Upgrade the database schema from version 8 to version 9.
  */
 class Migration8 implements MigrationInterface {
-	/**
-	 * Upgrade to to the next version
-	 */
-	public function upgrade() {
-		// Add support for the persian/jalali calendar
-		try {
-			Database::exec(
-				"ALTER TABLE `##dates` CHANGE d_type d_type ENUM('@#DGREGORIAN@', '@#DJULIAN@', '@#DHEBREW@', '@#DFRENCH R@', '@#DHIJRI@', '@#DROMAN@', '@#DJALALI@')"
-			);
-		} catch (PDOException $ex) {
-			// Already been run?
-		}
-	}
+    /**
+     * Upgrade to to the next version
+     */
+    public function upgrade() {
+        // Add support for the persian/jalali calendar
+        try {
+            Database::exec(
+                "ALTER TABLE `##dates` CHANGE d_type d_type ENUM('@#DGREGORIAN@', '@#DJULIAN@', '@#DHEBREW@', '@#DFRENCH R@', '@#DHIJRI@', '@#DROMAN@', '@#DJALALI@')"
+            );
+        } catch (PDOException $ex) {
+            // Already been run?
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,11 +21,13 @@
 /**
  * Upgrade the database schema from version 8 to version 9.
  */
-class Migration8 implements MigrationInterface {
+class Migration8 implements MigrationInterface
+{
 	/**
 	 * Upgrade to to the next version
 	 */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Add support for the persian/jalali calendar
 		try {
 			Database::exec(