eventespresso / event-espresso-core

core/data_migration_scripts/EE_DMS_Core_4_2_0.dms.php

Spacing +45 added lines, -45 removed lines

@@ -11,18 +11,18 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_2_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_2_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_2_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_2_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_2_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
-class EE_DMS_Core_4_2_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_2_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -37,15 +37,15 @@ 
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.2.0' && $version_string >= '4.1.0' ){
+		if ($version_string <= '4.2.0' && $version_string >= '4.1.0') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -55,14 +55,14 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -102,7 +102,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -125,7 +125,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -142,41 +142,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -192,7 +192,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -219,7 +219,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -327,8 +327,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -340,12 +340,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -356,28 +356,28 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -410,8 +410,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -485,7 +485,7 @@ 
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
-		$script_with_defaults = EE_Registry::instance()->load_dms( 'Core_4_1_0' );
+		$script_with_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 		//setting up the DEFAULT stats and countries is also essential for the data migrations to run
 		//(because many need to convert old string states to foreign keys into the states table)
 		$script_with_defaults->insert_default_states();
@@ -507,7 +507,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 }

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

core/data_migration_scripts/EE_DMS_Core_4_3_0.dms.php

Spacing +56 added lines, -56 removed lines

@@ -10,18 +10,18 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_3_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_3_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_3_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_3_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_3_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
-class EE_DMS_Core_4_3_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_3_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -37,14 +37,14 @@ 
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.3.0' && $version_string >= '4.2.0' ){
+		if ($version_string <= '4.3.0' && $version_string >= '4.2.0') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.2
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -54,14 +54,14 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -100,7 +100,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -123,7 +123,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -140,41 +140,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -190,7 +190,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -202,7 +202,7 @@ 
 					KEY GRP_ID (GRP_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
 
 		$table_name = 'esp_message_template_group';
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -217,7 +217,7 @@ 
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -226,7 +226,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -335,8 +335,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -348,12 +348,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -364,29 +364,29 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT UNSIGNED NOT NULL DEFAULT 0,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -419,8 +419,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -494,7 +494,7 @@ 
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
-		$script_with_defaults = EE_Registry::instance()->load_dms( 'Core_4_1_0' );
+		$script_with_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 		//setting up the DEFAULT stats and countries is also essential for the data migrations to run
 		//(because many need to convert old string states to foreign keys into the states table)
 		$script_with_defaults->insert_default_states();
@@ -516,7 +516,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -532,34 +532,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( $wpdb->get_var("SHOW TABLES LIKE'$ticket_table'") == $ticket_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE'$ticket_table'") == $ticket_table) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_required, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( $wpdb->get_var("SHOW TABLES LIKE'$ticket_price_table'") == $ticket_price_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE'$ticket_price_table'") == $ticket_price_table) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

core/data_migration_scripts/EE_DMS_Core_4_5_0.dms.php

Spacing +70 added lines, -70 removed lines

@@ -12,16 +12,16 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_5_0_stages/*');
 $class_to_filepath = array();
-foreach($stages as $filepath){
+foreach ($stages as $filepath) {
 	$matches = array();
-	preg_match('~4_5_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+	preg_match('~4_5_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_5_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_5_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
-class EE_DMS_Core_4_5_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_5_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -39,14 +39,14 @@ 
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.5.0' && $version_string >= '4.3.0' ){
+		if ($version_string <= '4.5.0' && $version_string >= '4.3.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -56,14 +56,14 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -102,7 +102,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_datetime';
 		$sql = "DTT_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -123,7 +123,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -140,41 +140,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -190,7 +190,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -202,7 +202,7 @@ 
 					KEY GRP_ID (GRP_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
 
 		$table_name = 'esp_message_template_group';
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -217,7 +217,7 @@ 
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -226,7 +226,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -276,8 +276,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -289,27 +289,27 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT UNSIGNED NOT NULL DEFAULT 0,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -342,8 +342,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -431,7 +431,7 @@ 
 					  PRC_wp_user BIGINT UNSIGNED NULL,
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -468,12 +468,12 @@ 
 					  TKT_parent INT(10) UNSIGNED DEFAULT '0',
 					  TKT_deleted TINYINT(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -485,7 +485,7 @@ 
 					QSG_wp_user BIGINT UNSIGNED NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 
@@ -509,7 +509,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -525,19 +525,19 @@ 
 
 		if ($wpdb->get_var("SHOW TABLES LIKE '$price_type_table'") == $price_type_table) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-			$price_types_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
 
-			if ( ! $price_types_exist ) {
+			if ( ! $price_types_exist) {
 				$user_id = EEH_Activation::get_default_creator_id();
 				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_wp_user, PRT_deleted ) VALUES
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, $user_id, 0),
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, $user_id, 0),
-							(3, '" . __('Dollar Discount', 'event_espresso') . "', 2,  0, 30, $user_id, 0),
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, $user_id,  0),
-							(5, '" . __('Dollar Surcharge', 'event_espresso') . "', 3,  0, 50, $user_id, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL );
-				$wpdb->query( $SQL );
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, $user_id, 0),
+							(2, '".__('Percent Discount', 'event_espresso')."', 2,  1, 20, $user_id, 0),
+							(3, '".__('Dollar Discount', 'event_espresso')."', 2,  0, 30, $user_id, 0),
+							(4, '".__('Percent Surcharge', 'event_espresso')."', 3,  1, 40, $user_id,  0),
+							(5, '".__('Dollar Surcharge', 'event_espresso')."', 3,  0, 50, $user_id, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
 			}
 		}
 	}
@@ -559,15 +559,15 @@ 
 
 		if ($wpdb->get_var("SHOW TABLES LIKE '$price_table'") == $price_table) {
 
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
-			$prices_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
+			$prices_exist = $wpdb->get_var($SQL);
 
-			if ( ! $prices_exist ) {
+			if ( ! $prices_exist) {
 				$user_id = EEH_Activation::get_default_creator_id();
 				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_wp_user, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, $user_id, 0, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -585,35 +585,35 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( $wpdb->get_var("SHOW TABLES LIKE'$ticket_table'") == $ticket_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE'$ticket_table'") == $ticket_table) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$user_id = EEH_Activation::get_default_creator_id();
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_required, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_wp_user, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, $user_id, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, $user_id, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( $wpdb->get_var("SHOW TABLES LIKE'$ticket_price_table'") == $ticket_price_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE'$ticket_price_table'") == $ticket_price_table) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

Indentation +1 added lines, -1 removed lines

@@ -715,7 +715,7 @@
 				}
 			}
 		}
-        }
+		}
 	/**
 	 * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;

Spacing +78 added lines, -78 removed lines

@@ -13,13 +13,13 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_8_0_stages/*');
 $class_to_filepath = array();
-foreach($stages as $filepath){
+foreach ($stages as $filepath) {
 	$matches = array();
-	preg_match('~4_8_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+	preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 
@@ -35,7 +35,7 @@ 
  * @since                4.6.0
  *
  */
-class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_8_0
@@ -62,14 +62,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
+		if ($version_string <= '4.8.0' && $version_string >= '4.7.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -90,19 +90,19 @@ 
 	 * @return bool
 	 */
 	public function schema_changes_before_migration() {
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$now_in_mysql = current_time( 'mysql', true );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
 
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
@@ -142,7 +142,7 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
@@ -152,7 +152,7 @@ 
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -182,7 +182,7 @@ 
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
 
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_meta';
 		$sql = "
@@ -201,41 +201,41 @@ 
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID),
 			KEY EVT_ID (EVT_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY QSG_ID (QSG_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_extra_join';
 		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -248,8 +248,8 @@ 
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
 		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -268,7 +268,7 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -307,7 +307,7 @@ 
 					MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@@ -316,7 +316,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -389,8 +389,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) DEFAULT NULL,
@@ -404,22 +404,22 @@ 
 					QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID),
 					KEY QST_order (QST_order)';
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSG_ID_order (QSG_ID,QGQ_order)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
@@ -429,7 +429,7 @@ 
 					PRIMARY KEY  (QSO_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSO_order (QSO_order)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -475,8 +475,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -571,7 +571,7 @@ 
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID),
 					  KEY PRT_ID (PRT_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
@@ -609,10 +609,10 @@ 
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID),
 					  KEY TKT_start_date (TKT_start_date)";
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -625,7 +625,7 @@ 
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 					KEY QSG_order (QSG_order)';
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -661,7 +661,7 @@ 
 		return $script_4_7_defaults->schema_changes_after_migration();
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 	
@@ -675,19 +675,19 @@ 
 		//CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
 		//('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 		$newer_countries = array(
-			array( 'AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0 ),
-			array( 'BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
-			array( 'CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0 ),
-			array( 'GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0 ),
-			array( 'IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2,  '+44', 0, 0  ),
-			array( 'JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0 ),
-			array( 'MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
-			array( 'MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1,  2, '+382', 0, 0 ),
-			array( 'RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0 ),
-			array( 'SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0 ),
-			array( 'SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0 ),
-			array( 'XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0 ),
-			array( 'YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0 ),
+			array('AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0),
+			array('BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0),
+			array('GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0),
+			array('IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0),
+			array('RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0),
+			array('SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0),
+			array('SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0),
+			array('XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0),
+			array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
 		);
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
@@ -706,14 +706,14 @@ 
 							"CNT_is_EU" => '%d',
 							"CNT_active" => '%d',
 						);
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $country_table . "'") == $country_table ) {
-			foreach( $newer_countries as $country ) {
-				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1" ;
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$country_table."'") == $country_table) {
+			foreach ($newer_countries as $country) {
+				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
 				$countries = $wpdb->get_var($SQL);
-				if ( ! $countries ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $country_table,
-							array_combine( array_keys( $country_format), $country ),
+					$wpdb->insert($country_table,
+							array_combine(array_keys($country_format), $country),
 							$country_format
 							);
 				}
@@ -731,7 +731,7 @@ 
 		// CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
 		//( 'EUR',  'Euro',  'Euros',  '€',  2,1),
 		$newer_currencies = array(
-			array( 'RSD', 'Dinar', 'Dinars', '', 3, 1 ),
+			array('RSD', 'Dinar', 'Dinars', '', 3, 1),
 		);
 		global $wpdb;
 		$currency_table = $wpdb->prefix."esp_currency";
@@ -743,14 +743,14 @@ 
 							"CUR_dec_plc" => '%d',
 							"CUR_active" => '%d',
 						);
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $currency_table . "'") == $currency_table ) {
-			foreach( $newer_currencies as $currency ) {
-				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1" ;
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$currency_table."'") == $currency_table) {
+			foreach ($newer_currencies as $currency) {
+				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
 				$countries = $wpdb->get_var($SQL);
-				if ( ! $countries ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $currency_table,
-							array_combine( array_keys( $currency_format), $currency ),
+					$wpdb->insert($currency_table,
+							array_combine(array_keys($currency_format), $currency),
 							$currency_format
 							);
 				}
@@ -762,9 +762,9 @@ 
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
 	 * we should be able to stop doing this in 4.9
 	 */
-	public function fix_non_default_taxes(){
+	public function fix_non_default_taxes() {
 		global $wpdb;
-		$query = $wpdb->prepare( "UPDATE
+		$query = $wpdb->prepare("UPDATE
 				{$wpdb->prefix}esp_price p INNER JOIN
 				{$wpdb->prefix}esp_price_type pt ON p.PRT_ID = pt.PRT_ID
 			SET
@@ -772,7 +772,7 @@ 
 			WHERE
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
-					", EEM_Price_Type::base_type_tax );
-		$wpdb->query( $query );
+					", EEM_Price_Type::base_type_tax);
+		$wpdb->query($query);
 	}
 }

core/data_migration_scripts/EE_DMS_Unknown_1_0_0.core.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  */
 /**
  */
-class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * Returns whether or not this data migration script can operate on the given version of the database.

core/data_migration_scripts/EE_Data_Migration_Script_Base.core.php

Braces +11 added lines, -11 removed lines

@@ -306,7 +306,7 @@ 
 					$records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated);
 					$num_records_actually_migrated += $records_migrated_during_stage;
 					$records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage;
-				}catch(Exception $e){
+				} catch(Exception $e){
 					//yes if we catch an exception here, we consider that migration stage borked.
 					$stage->set_status(EE_Data_Migration_Manager::status_fatal_error);
 					$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
@@ -332,14 +332,14 @@ 
 			//this migration script apparently has NO stages... which is super weird, but whatever
 			$this->set_completed();
 			$this->_maybe_do_schema_changes(false);
-		}else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
+		} else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
 			//apparently we're done, because we couldn't migrate the number we intended to
 			$this->set_completed();
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 			//do schema changes for after the migration now
 			//first double-check we haven't already done this
 			$this->_maybe_do_schema_changes(false);
-		}else{
+		} else{
 			//update feedback message, keeping in mind that we show them with the most recent at the top
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 		}
@@ -378,12 +378,12 @@ 
 				ob_start();
 				if($before){
 					$this->schema_changes_before_migration();
-				}else{
+				} else{
 					$this->schema_changes_after_migration();
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
 				throw $e;
 			}
@@ -511,13 +511,13 @@ 
 		if( $table_is_new ) {
 			if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation  || $this->_currently_migrating() ){
 				return true;
-			}else{
+			} else{
 				return false;
 			}
-		}else{
+		} else{
 			if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){
 				return true;
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -534,7 +534,7 @@ 
 		EE_Registry::instance()->load_helper('Activation');
 		try{
 			EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables);
-		}catch( EE_Error $e ) {
+		} catch( EE_Error $e ) {
 			$message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString();
 			$this->add_error( $message  );
 			$this->_feedback_message .= $message;
@@ -551,11 +551,11 @@ 
 	private function _get_req_type_for_plugin_corresponding_to_this_dms(){
 		if($this->slug() == 'Core'){
 			return EE_System::instance()->detect_req_type();
-		}else{//it must be for an addon
+		} else{//it must be for an addon
 			$addon_name = $this->slug();
 			if( EE_Registry::instance()->get_addon_by_name($addon_name)){
 				return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type();
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ;
 			}
 		}

Spacing +114 added lines, -114 removed lines

@@ -117,9 +117,9 @@ 
 	 * All children of this must call parent::__construct() at the end of their constructor or suffer the consequences!
 	 */
 	public function __construct() {
-		$this->_migration_stages = apply_filters('FHEE__'.get_class($this).'__construct__migration_stages',$this->_migration_stages);
-		foreach($this->_migration_stages as $migration_stage){
-			if ( $migration_stage instanceof EE_Data_Migration_Script_Stage ) {
+		$this->_migration_stages = apply_filters('FHEE__'.get_class($this).'__construct__migration_stages', $this->_migration_stages);
+		foreach ($this->_migration_stages as $migration_stage) {
+			if ($migration_stage instanceof EE_Data_Migration_Script_Stage) {
 				$migration_stage->_construct_finalize($this);
 			}
 		}
@@ -132,7 +132,7 @@ 
 	 * Place to add hooks and filters for tweaking the migrations page, in order
 	 * to customize it
 	 */
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 		//by default none are added because we normally like the default look of the migration page
 	}
 
@@ -147,9 +147,9 @@ 
 	 * @param int|string $new_pk eg posts.ID
 	 * @return void
 	 */
-	public function set_mapping($old_table,$old_pk,$new_table,$new_pk){
+	public function set_mapping($old_table, $old_pk, $new_table, $new_pk) {
 		//make sure it has the needed keys
-		if( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])){
+		if ( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])) {
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
 		$this->_mappings[$old_table][$new_table][$old_pk] = $new_pk;
@@ -165,9 +165,9 @@ 
 	 * @param string $new_table with wpdb prefix (wp_). Eg: wp_posts
 	 * @return mixed the primary key on the new table
 	 */
-	public function get_mapping_new_pk($old_table,$old_pk,$new_table){
-		if( ! isset($this->_mappings[$old_table]) ||
-			! isset($this->_mappings[$old_table][$new_table])){
+	public function get_mapping_new_pk($old_table, $old_pk, $new_table) {
+		if ( ! isset($this->_mappings[$old_table]) ||
+			! isset($this->_mappings[$old_table][$new_table])) {
 			//try fetching the option
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
@@ -184,15 +184,15 @@ 
 	 * @param mixed $new_pk
 	 * @return mixed
 	 */
-	public function get_mapping_old_pk($old_table,$new_table,$new_pk){
-		if( ! isset($this->_mappings[$old_table]) ||
-			! isset($this->_mappings[$old_table][$new_table])){
+	public function get_mapping_old_pk($old_table, $new_table, $new_pk) {
+		if ( ! isset($this->_mappings[$old_table]) ||
+			! isset($this->_mappings[$old_table][$new_table])) {
 			//try fetching the option
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
-		if(isset($this->_mappings[$old_table][$new_table])){
+		if (isset($this->_mappings[$old_table][$new_table])) {
 			$new_pk_to_old_pk = array_flip($this->_mappings[$old_table][$new_table]);
-			if(isset($new_pk_to_old_pk[$new_pk])){
+			if (isset($new_pk_to_old_pk[$new_pk])) {
 				return $new_pk_to_old_pk[$new_pk];
 			}
 		}
@@ -207,8 +207,8 @@ 
 	 * @param string $new_table_name
 	 * @return array
 	 */
-	protected function _get_mapping_option($old_table_name,$new_table_name){
-		$option =  get_option($this->_get_mapping_option_name($old_table_name, $new_table_name),array());
+	protected function _get_mapping_option($old_table_name, $new_table_name) {
+		$option = get_option($this->_get_mapping_option_name($old_table_name, $new_table_name), array());
 		return $option;
 	}
 
@@ -221,9 +221,9 @@ 
 	 * @param array $mapping_array
 	 * @return boolean success of updating option
 	 */
-	protected function _set_mapping_option($old_table_name,$new_table_name,$mapping_array){
+	protected function _set_mapping_option($old_table_name, $new_table_name, $mapping_array) {
 //		echo "set mapping for $old_table_name $new_table_name".count($mapping_array)."<br>";
-		$success =  update_option($this->_get_mapping_option_name($old_table_name, $new_table_name),$mapping_array);
+		$success = update_option($this->_get_mapping_option_name($old_table_name, $new_table_name), $mapping_array);
 		return $success;
 	}
 
@@ -235,12 +235,12 @@ 
 	 * @param string $new_table_name
 	 * @return string
 	 */
-	protected function _get_mapping_option_name($old_table_name,$new_table_name){
+	protected function _get_mapping_option_name($old_table_name, $new_table_name) {
 		global $wpdb;
-		$old_table_name_sans_wp = str_replace($wpdb->prefix,"",$old_table_name);
-		$new_table_name_sans_wp = str_replace($wpdb->prefix,"",$new_table_name);
+		$old_table_name_sans_wp = str_replace($wpdb->prefix, "", $old_table_name);
+		$new_table_name_sans_wp = str_replace($wpdb->prefix, "", $new_table_name);
 		$migrates_to = EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this));
-		return substr( EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix . $migrates_to [ 'slug' ] . '_' . $migrates_to[ 'version' ] . '_' . $old_table_name_sans_wp . '_' . $new_table_name_sans_wp, 0, 64 );
+		return substr(EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix.$migrates_to ['slug'].'_'.$migrates_to['version'].'_'.$old_table_name_sans_wp.'_'.$new_table_name_sans_wp, 0, 64);
 	}
 
 
@@ -257,10 +257,10 @@ 
 	 * 99% until the function "migration_step" returns EE_Data_Migration_Script_Base::status_complete.
 	 * @return int
 	 */
-	protected function _count_records_to_migrate(){
+	protected function _count_records_to_migrate() {
 		$count = 0;
-		foreach($this->stages() as $stage){
-			$count+= $stage->count_records_to_migrate();
+		foreach ($this->stages() as $stage) {
+			$count += $stage->count_records_to_migrate();
 		}
 		return $count;
 	}
@@ -272,10 +272,10 @@ 
 	 * by just setting a transient and updating it after each migration_step
 	 * @return int
 	 */
-	public function count_records_migrated(){
+	public function count_records_migrated() {
 		$count = 0;
-		foreach($this->stages() as $stage){
-			$count+= $stage->count_records_migrated();
+		foreach ($this->stages() as $stage) {
+			$count += $stage->count_records_migrated();
 		}
 		$this->_records_migrated = $count;
 		return $count;
@@ -289,24 +289,24 @@ 
 	 * @throws EE_Error
 	 * @throws Exception
 	 */
-	public function migration_step($num_records_to_migrate_limit){
+	public function migration_step($num_records_to_migrate_limit) {
 		//reset the feedback message
 		$this->_feedback_message = '';
 		//if we haven't yet done the 1st schema changes, do them now. buffer any output
 		$this->_maybe_do_schema_changes(true);
 
-		$num_records_actually_migrated =0;
+		$num_records_actually_migrated = 0;
 		$records_migrated_per_stage = array();
 		//setup the 'stage' variable, which should hold the last run stage of the migration  (or none at all if nothing runs)
 		$stage = null;
 		//get the next stage that isn't complete
-		foreach($this->stages() as $stage){
-			if( $stage->get_status() == EE_Data_Migration_Manager::status_continue){
-				try{
+		foreach ($this->stages() as $stage) {
+			if ($stage->get_status() == EE_Data_Migration_Manager::status_continue) {
+				try {
 					$records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated);
 					$num_records_actually_migrated += $records_migrated_during_stage;
 					$records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage;
-				}catch(Exception $e){
+				} catch (Exception $e) {
 					//yes if we catch an exception here, we consider that migration stage borked.
 					$stage->set_status(EE_Data_Migration_Manager::status_fatal_error);
 					$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
@@ -314,7 +314,7 @@ 
 					throw $e;
 				}
 				//check that the migration stage didn't mark itself as having a fatal error
-				if($stage->is_broken()){
+				if ($stage->is_broken()) {
 					$this->set_broken();
 					throw new EE_Error($stage->get_last_error());
 				}
@@ -322,24 +322,24 @@ 
 			//once we've migrated all the number we intended to (possibly from different stages), stop migrating
 			//or if we had a fatal error
 			//or if the current script stopped early- its not done, but it's done all it thinks we should do on this step
-			if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()){
+			if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()) {
 				break;
 			}
 		}
 		//check if we're all done this data migration...
 		//which is indicated by being done early AND the last stage claims to be done
-		if($stage == NULL){
+		if ($stage == NULL) {
 			//this migration script apparently has NO stages... which is super weird, but whatever
 			$this->set_completed();
 			$this->_maybe_do_schema_changes(false);
-		}else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
+		} else if ($num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()) {
 			//apparently we're done, because we couldn't migrate the number we intended to
 			$this->set_completed();
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 			//do schema changes for after the migration now
 			//first double-check we haven't already done this
 			$this->_maybe_do_schema_changes(false);
-		}else{
+		} else {
 			//update feedback message, keeping in mind that we show them with the most recent at the top
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 		}
@@ -353,12 +353,12 @@ 
 	 * @param array $records_migrated_per_stage KEYS are pretty names for each stage; values are the count of records migrated from that stage
 	 * @return void
 	 */
-	private function _update_feedback_message($records_migrated_per_stage){
+	private function _update_feedback_message($records_migrated_per_stage) {
 		$feedback_message_array = array();
-		foreach($records_migrated_per_stage as $migration_stage_name => $num_records_migrated){
-			$feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"),$num_records_migrated,$migration_stage_name) ;
+		foreach ($records_migrated_per_stage as $migration_stage_name => $num_records_migrated) {
+			$feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"), $num_records_migrated, $migration_stage_name);
 		}
-		$this->_feedback_message .= implode("<br>",$feedback_message_array);
+		$this->_feedback_message .= implode("<br>", $feedback_message_array);
 	}
 
 
@@ -370,27 +370,27 @@ 
 	 * @throws Exception
 	 * @return void
 	 */
-	private function _maybe_do_schema_changes($before = true){
+	private function _maybe_do_schema_changes($before = true) {
 		//so this property will be either _schema_changes_after_migration_ran or _schema_changes_before_migration_ran
-		$property_name = '_schema_changes_'. ($before ? 'before' : 'after').'_migration_ran';
-		if ( ! $this->{$property_name} ){
-			try{
+		$property_name = '_schema_changes_'.($before ? 'before' : 'after').'_migration_ran';
+		if ( ! $this->{$property_name} ) {
+			try {
 				ob_start();
-				if($before){
+				if ($before) {
 					$this->schema_changes_before_migration();
-				}else{
+				} else {
 					$this->schema_changes_after_migration();
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}catch(Exception $e){
+			} catch (Exception $e) {
 				$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
 				throw $e;
 			}
 			//record that we've done these schema changes
 			$this->{$property_name} = true;
 			//if there were any warnings etc, record them as non-fatal errors
-			if( $output ){
+			if ($output) {
 				//there were some warnings
 				$this->_errors[] = $output;
 			}
@@ -417,9 +417,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_is_new_in_this_version($table_name,$table_definition_sql,$engine_string='ENGINE=InnoDB '){
+	protected function _table_is_new_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=InnoDB ') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_is_new_in_this_version_' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  true ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(true));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_is_new_in_this_version_' . $table_name  );
 	}
 
@@ -433,9 +433,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_is_changed_in_this_version($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
+	protected function _table_is_changed_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_is_changed_in_this_version' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_is_changed_in_this_version' . $table_name  );
 	}
 
@@ -446,8 +446,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _old_table_exists( $table_name ) {
-		return EEH_Activation::table_exists( $table_name );
+	protected function _old_table_exists($table_name) {
+		return EEH_Activation::table_exists($table_name);
 	}
 
 
@@ -457,8 +457,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _delete_table_if_empty( $table_name ) {
-		return EEH_Activation::delete_db_table_if_empty( $table_name );
+	protected function _delete_table_if_empty($table_name) {
+		return EEH_Activation::delete_db_table_if_empty($table_name);
 	}
 
 
@@ -477,9 +477,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_should_exist_previously($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
+	protected function _table_should_exist_previously($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_should_exist_previously' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name );
 	}
 
@@ -494,13 +494,13 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_has_not_changed_since_previous( $table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
-		if( $this->_currently_migrating() ) {
+	protected function _table_has_not_changed_since_previous($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
+		if ($this->_currently_migrating()) {
 			//if we're doing a migration, and this table apparently already exists, then we don't need do anything right?
 //			EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name );
 			return;
 		}
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 	}
 
 	/**
@@ -510,7 +510,7 @@ 
 	protected function _currently_migrating() {
 		//we want to know if we are currently performing a migration. We could just believe what was set on the _migrating property, but let's double-check (ie the script should apply and we should be in MM)
 		return $this->_migrating &&
-					$this->can_migrate_from_version( EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set() ) &&
+					$this->can_migrate_from_version(EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set()) &&
 					EE_Maintenance_Mode::instance()->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance;
 	}
 
@@ -521,17 +521,17 @@ 
 	 * @param boolean $table_is_new
 	 * @return boolean
 	 */
-	protected function _pre_existing_table_should_be_dropped( $table_is_new ) {
-		if( $table_is_new ) {
-			if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation  || $this->_currently_migrating() ){
+	protected function _pre_existing_table_should_be_dropped($table_is_new) {
+		if ($table_is_new) {
+			if ($this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation || $this->_currently_migrating()) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
-		}else{
-			if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){
+		} else {
+			if (in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(), array(EE_System::req_type_new_activation))) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -544,12 +544,12 @@ 
 	 * @param string $engine_string
 	 * @param boolean $drop_pre_existing_tables
 	 */
-	private function _create_table_and_catch_errors( $table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE ){
-		try{
-			EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables);
-		}catch( EE_Error $e ) {
-			$message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString();
-			$this->add_error( $message  );
+	private function _create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE) {
+		try {
+			EEH_Activation::create_table($table_name, $table_definition_sql, $engine_string, $drop_pre_existing_tables);
+		} catch (EE_Error $e) {
+			$message = $e->getMessage().'<br>Stack Trace:'.$e->getTraceAsString();
+			$this->add_error($message);
 			$this->_feedback_message .= $message;
 		}
 	}
@@ -561,15 +561,15 @@ 
 	 * @return int one of EE_System::_req_type_* constants
 	 * @throws EE_Error
 	 */
-	private function _get_req_type_for_plugin_corresponding_to_this_dms(){
-		if($this->slug() == 'Core'){
+	private function _get_req_type_for_plugin_corresponding_to_this_dms() {
+		if ($this->slug() == 'Core') {
 			return EE_System::instance()->detect_req_type();
-		}else{//it must be for an addon
+		} else {//it must be for an addon
 			$addon_name = $this->slug();
-			if( EE_Registry::instance()->get_addon_by_name($addon_name)){
+			if (EE_Registry::instance()->get_addon_by_name($addon_name)) {
 				return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type();
-			}else{
-				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ;
+			} else {
+				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"), $this->slug(), $addon_name, implode(",", array_keys(EE_Registry::instance()->get_addons_by_name()))));
 			}
 		}
 	}
@@ -580,13 +580,13 @@ 
 	 * returns an array of strings describing errors by all the script's stages
 	 * @return array
 	 */
-	public function get_errors(){
+	public function get_errors() {
 		$all_errors = $this->_errors;
-		if( ! is_array($all_errors)){
+		if ( ! is_array($all_errors)) {
 			$all_errors = array();
 		}
-		foreach($this->stages() as $stage){
-			$all_errors = array_merge($stage->get_errors(),$all_errors);
+		foreach ($this->stages() as $stage) {
+			$all_errors = array_merge($stage->get_errors(), $all_errors);
 		}
 		return $all_errors;
 	}
@@ -597,8 +597,8 @@ 
 	 * Indicates whether or not this migration script should continue
 	 * @return boolean
 	 */
-	public function can_continue(){
-		return in_array($this->get_status(),  EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script);
+	public function can_continue() {
+		return in_array($this->get_status(), EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script);
 	}
 
 
@@ -610,8 +610,8 @@ 
 	 * get ordered by the indexes
 	 * @return EE_Data_Migration_Script_Stage[]
 	 */
-	protected function stages(){
-		$stages = apply_filters( 'FHEE__'.get_class($this).'__stages',$this->_migration_stages );
+	protected function stages() {
+		$stages = apply_filters('FHEE__'.get_class($this).'__stages', $this->_migration_stages);
 		ksort($stages);
 		return $stages;
 	}
@@ -623,7 +623,7 @@ 
 	 * can be displayed to the user
 	 * @return string
 	 */
-	public function get_feedback_message(){
+	public function get_feedback_message() {
 		return $this->_feedback_message;
 	}
 
@@ -635,16 +635,16 @@ 
 	 * possible that this class is defined when it goes to sleep, but NOT available when it
 	 * awakes (eg, this class is part of an addon that is deactivated at some point).
 	 */
-	public function properties_as_array(){
+	public function properties_as_array() {
 		$properties = parent::properties_as_array();
 		$properties['_migration_stages'] = array();
-		foreach($this->_migration_stages as $migration_stage_priority => $migration_stage_class){
+		foreach ($this->_migration_stages as $migration_stage_priority => $migration_stage_class) {
 			$properties['_migration_stages'][$migration_stage_priority] = $migration_stage_class->properties_as_array();
 		}
 		unset($properties['_mappings']);
 
-		foreach($this->_mappings as $old_table_name => $mapping_to_new_table){
-			foreach($mapping_to_new_table as $new_table_name => $mapping){
+		foreach ($this->_mappings as $old_table_name => $mapping_to_new_table) {
+			foreach ($mapping_to_new_table as $new_table_name => $mapping) {
 				$this->_set_mapping_option($old_table_name, $new_table_name, $mapping);
 			}
 		}
@@ -659,19 +659,19 @@ 
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
 	 * @return void
 	 */
-	public function instantiate_from_array_of_properties($array_of_properties){
+	public function instantiate_from_array_of_properties($array_of_properties) {
 		$stages_properties_arrays = $array_of_properties['_migration_stages'];
 		unset($array_of_properties['_migration_stages']);
 		unset($array_of_properties['class']);
-		foreach($array_of_properties as $property_name => $property_value){
+		foreach ($array_of_properties as $property_name => $property_value) {
 			$this->{$property_name} = $property_value;
 		}
 		//_migration_stages are already instantiated, but have only default data
-		foreach($this->_migration_stages as $stage){
-			$stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage),$stages_properties_arrays);
+		foreach ($this->_migration_stages as $stage) {
+			$stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage), $stages_properties_arrays);
 			//SO, if we found the stage data that was saved, use it. Otherwise, I guess the stage is new? (maybe added by
 			//an addon? Unlikely... not sure why it wouldn't exist, but if it doesn't just treat it like it was never started yet)
-			if($stage_data){
+			if ($stage_data) {
 				$stage->instantiate_from_array_of_properties($stage_data);
 			}
 		}
@@ -687,9 +687,9 @@ 
 	 * @param array $migration_stage_data_arrays
 	 * @return null
 	 */
-	private function _find_migration_stage_data_with_classname($classname,$migration_stage_data_arrays){
-		foreach($migration_stage_data_arrays as $migration_stage_data_array){
-			if(isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname){
+	private function _find_migration_stage_data_with_classname($classname, $migration_stage_data_arrays) {
+		foreach ($migration_stage_data_arrays as $migration_stage_data_array) {
+			if (isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname) {
 				return $migration_stage_data_array;
 			}
 		}
@@ -705,8 +705,8 @@ 
 	 * @return array where the first key is the plugin's slug, the 2nd is the version of that plugin
 	 * that will be updated to. Eg array('Core','4.1.0')
 	 */
-	public final function migrates_to_version(){
-		return EE_Data_Migration_Manager::instance()->script_migrates_to_version( get_class( $this ) );
+	public final function migrates_to_version() {
+		return EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this));
 	}
 
 
@@ -718,10 +718,10 @@ 
 	 * Or 'Core' for core (non-addon).
 	 * @return string
 	 */
-	public function slug(){
+	public function slug() {
 		$migrates_to_version_info = $this->migrates_to_version();
 		//the slug is the first part of the array
-		return $migrates_to_version_info[ 'slug' ];
+		return $migrates_to_version_info['slug'];
 	}
 
 
@@ -735,7 +735,7 @@ 
 	 * the database up so it can run), then you can set "A" to priority 3 or something.
 	 * @return int
 	 */
-	public function priority(){
+	public function priority() {
 		return $this->_priority;
 	}
 
@@ -748,18 +748,18 @@ 
 	 * @param boolean $migrating
 	 * @return void
 	 */
-	public function set_migrating( $migrating = TRUE ){
+	public function set_migrating($migrating = TRUE) {
 		$this->_migrating = $migrating;
 	}
 
 	/**
 	 * Marks that we think this migration class can continue to migrate
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		parent::reattempt();
 		//also, we want to reattempt any stages that were marked as borked
-		foreach( $this->stages() as $stage ) {
-			if( $stage->is_broken() ) {
+		foreach ($this->stages() as $stage) {
+			if ($stage->is_broken()) {
 				$stage->reattempt();
 			}
 		}

core/data_migration_scripts/EE_Data_Migration_Script_Stage.core.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
  * _migration_step() (ie, it its a count of rows in the old attendees table in _count_records_to_migrate(), it should also be OLD attendee rows migrated
  * on each call to _migration_step().
  */
-abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base{
+abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base {
 	/**
 	 * The migration script this is a stage of
 	 * @var EE_Data_Migration_Script_Base
@@ -47,7 +47,7 @@ 
 	 * called by EE_Data_Migration_Script_Base's __construct() method so children don't have to
 	 * @param EE_Data_Migration_Script_Base $migration_script
 	 */
-	public function _construct_finalize($migration_script){
+	public function _construct_finalize($migration_script) {
 		$this->_migration_script = $migration_script;
 	}
 
@@ -58,13 +58,13 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int
 	 */
-	public function migration_step($num_items_to_migrate=50){
+	public function migration_step($num_items_to_migrate = 50) {
 		//before we run the migration step, we want ot take note of warnings that get outputted
 		ob_start();
 		$items_migrated = $this->_migration_step($num_items_to_migrate);
 		$output = ob_get_contents();
 		ob_end_clean();
-		if( $output ){
+		if ($output) {
 			$this->add_error($output);
 		}
 		$this->_records_migrated += $items_migrated;
@@ -82,7 +82,7 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int number of items ACTUALLY migrated
 	 */
-	abstract protected function _migration_step($num_items_to_migrate=50);
+	abstract protected function _migration_step($num_items_to_migrate = 50);
 
 	/**
 	 * Counts the records that have been migrated so far
@@ -96,7 +96,7 @@ 
 	 * returns an array of strings describing errors
 	 * @return array
 	 */
-	public function get_errors(){
+	public function get_errors() {
 		return $this->_errors;
 	}
 
@@ -106,9 +106,9 @@ 
 	 * to have been made from the properties_as_array() function.
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
 	 */
-	public function instantiate_from_array_of_properties($array_of_properties){
+	public function instantiate_from_array_of_properties($array_of_properties) {
 		unset($array_of_properties['class']);
-		foreach($array_of_properties as $property_name => $property_value){
+		foreach ($array_of_properties as $property_name => $property_value) {
 			$this->$property_name = $property_value;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	 * Gets the script this is a stage of
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	protected function get_migration_script(){
+	protected function get_migration_script() {
 		return $this->_migration_script;
 	}
 }

core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
 	protected $_old_table;
 
 /**
-	 * Set in the constructor to add this sql to both the counting query in
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
-	 * Eg "where column_name like '%some_value%'"
-	 * @var string
-	 */
+ * Set in the constructor to add this sql to both the counting query in
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
+ * Eg "where column_name like '%some_value%'"
+ * @var string
+ */
 	protected $_extra_where_sql;
 
 

Spacing +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@ 
 	 * @param int $num_items
 	 * @return int number of items ACTUALLY migrated
 	 */
-	function _migration_step($num_items=50){
-		$rows = $this->_get_rows( $num_items );
+	function _migration_step($num_items = 50) {
+		$rows = $this->_get_rows($num_items);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ){
+	protected function _get_rows($limit) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
-		return $wpdb->get_results($query,ARRAY_A);
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+		return $wpdb->get_results($query, ARRAY_A);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 */
 	function _count_records_to_migrate() {
 		global $wpdb;
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
-		$count = $wpdb->get_var( $query );
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
+		$count = $wpdb->get_var($query);
 		return $count;
 	}
 

core/db_classes/EE_Answer.class.php

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -31,9 +31,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -55,8 +55,8 @@ 
 	 * @access        public
 	 * @param int $QST_ID
 	 */
-	public function set_question( $QST_ID = 0 ) {
-		$this->set( 'QST_ID', $QST_ID );
+	public function set_question($QST_ID = 0) {
+		$this->set('QST_ID', $QST_ID);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param int $REG_ID
 	 */
-	public function set_registration( $REG_ID = 0 ) {
-		$this->set( 'REG_ID', $REG_ID );
+	public function set_registration($REG_ID = 0) {
+		$this->set('REG_ID', $REG_ID);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param mixed $ANS_value
 	 */
-	public function set_value( $ANS_value = '' ) {
-		$this->set( 'ANS_value', $ANS_value );
+	public function set_value($ANS_value = '') {
+		$this->set('ANS_value', $ANS_value);
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return        int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @return        int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return        string
 	 */
 	public function value() {
-		return $this->get( 'ANS_value' );
+		return $this->get('ANS_value');
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @param null $schema
 	 * @return string
 	 */
-	public function pretty_value( $schema = NULL ) {
-		return $this->get_pretty( 'ANS_value', $schema );
+	public function pretty_value($schema = NULL) {
+		return $this->get_pretty('ANS_value', $schema);
 	}
 
 
@@ -136,8 +136,8 @@ 
 	 * Echoes out a pretty value (even for multi-choice options)
 	 * @param string $schema
 	 */
-	public function e_value( $schema = NULL ) {
-		$this->e( 'ANS_value', $schema );
+	public function e_value($schema = NULL) {
+		$this->e('ANS_value', $schema);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 }
 

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 *    Set Answer value
 	 *
 	 * @access        public
-	 * @param mixed $ANS_value
+	 * @param string $ANS_value
 	 */
 	public function set_value( $ANS_value = '' ) {
 		$this->set( 'ANS_value', $ANS_value );