eventespresso / event-espresso-core

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_event_venue.dmsstage.php

Indentation -3 removed lines

@@ -25,9 +25,6 @@
 				
 			)
 		);
-
-
-
  * 
  */
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{

Spacing +17 added lines, -17 removed lines

@@ -30,20 +30,20 @@ 
 
  * 
  */
-class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $event_venue_rel){
+		foreach ($rows as $event_venue_rel) {
 			$this->_insert_new_event_to_venue_rel($event_venue_rel);
 			$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;
@@ -67,26 +67,26 @@ 
 	 * @param array $old_event_venue_rel
 	 * @return int
 	 */
-	private function _insert_new_event_to_venue_rel($old_event_venue_rel){
+	private function _insert_new_event_to_venue_rel($old_event_venue_rel) {
 		global $wpdb;
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts");
 		$new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts");
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_venue_rel['event_id']));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id']));
 			return 0;
 		}
-		if( ! $new_venue_id){
-			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$old_event_venue_rel['venue_id']));
+		if ( ! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id']));
 			return 0;
 		}
 		//first ensure there are no other relation entries for this event
 		//because although EE4 supports it, EE3 didn't really
-		$wpdb->delete( $this->_new_table, 
+		$wpdb->delete($this->_new_table, 
 				array(
 					'EVT_ID' => $new_event_id,
 				),
 				array(
-					'%d',//EVT_ID
+					'%d', //EVT_ID
 				));
 //		echo "last query". $wpdb->last_query;die;
 		$cols_n_values = array(
@@ -95,12 +95,12 @@ 
 			'EVV_primary'=>true
 		);
 		$datatypes = array(
-			'%d',//EVT_ID
-			'%d',//VNU_ID
-			'%d',//EVT_primary
+			'%d', //EVT_ID
+			'%d', //VNU_ID
+			'%d', //EVT_primary
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_events.dmsstage.php

Indentation -5 removed lines

@@ -84,8 +84,6 @@ 
   KEY `submitted` (`submitted`),
   KEY `likes` (`likes`)
 ) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8$$
-
-
  *
  * 4.1 Event model:
  * $this->_tables = array(
@@ -124,7 +122,6 @@ 
 				'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __("Accept Donations?", "event_espresso"), false, false)
 
 			));
-
  *
  * 3.1's start end table
  *
@@ -137,8 +134,6 @@ 
   PRIMARY KEY (`id`),
   KEY `event_id` (`event_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8$$
-
-
  *
  * and 4.1 Datetime model's tables and fields:
  * $this->_tables = array(

Braces +3 added lines, -3 removed lines

@@ -444,7 +444,7 @@ 
 			//we don't bother recording the conversion from old events to venues as that
 			//will complicate finding the conversion from old venues to new events
 			return $new_id;
-		}else{
+		} else{
 			return 0;
 		}
 	}
@@ -541,7 +541,7 @@ 
 		if( ! $old_event['state']){
 			$old_org_options = get_option('events_organization_settings');
 			$state_name = stripslashes($old_org_options['organization_state']);
-		}else{
+		} else{
 			$state_name = $old_event['state'];
 		}
 		if ( ! $state_name ){
@@ -551,7 +551,7 @@ 
 		try{
 			$state = $this->get_migration_script()->get_or_create_state($state_name,$country_iso);
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->add_error($e->getMessage());
 			$state_id = 0;
 		}

Doc Comments +3 added lines, -3 removed lines

@@ -419,7 +419,7 @@ 
 
 	/**
 	 * @param $old_event
-	 * @param $new_cpt_id
+	 * @param integer $new_cpt_id
 	 * @return int
 	 */
 	private function _insert_event_meta( $old_event, $new_cpt_id){
@@ -676,8 +676,8 @@ 
 
 
 	/**
-	 * @param $new_event_id
-	 * @param $new_venue_id
+	 * @param integer $new_event_id
+	 * @param integer $new_venue_id
 	 * @return int
 	 */
 	private function _insert_new_venue_to_event( $new_event_id, $new_venue_id){

Spacing +206 added lines, -206 removed lines

@@ -158,7 +158,7 @@ 
 				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ),
 			));
  */
-class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_old_start_end_table;
 	private $_new_table;
@@ -205,43 +205,43 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items_to_migrate = 50) {
+	protected function _migration_step($num_items_to_migrate = 50) {
 		global $wpdb;
 		//because the migration of each event can be a LOT more work, make each step smaller
-		$num_items_to_migrate = max(1,$num_items_to_migrate/5);
-		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$this->count_records_migrated(),$num_items_to_migrate),ARRAY_A);
+		$num_items_to_migrate = max(1, $num_items_to_migrate / 5);
+		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $this->count_records_migrated(), $num_items_to_migrate), ARRAY_A);
 		$items_migrated_this_step = 0;
 
-		foreach($events as $event_row){
+		foreach ($events as $event_row) {
 			$guid = null;
 			//insert new 4.1 Attendee object using $wpdb
 			$post_id = $this->_insert_cpt($event_row);
-			if($post_id){
+			if ($post_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_table, $post_id);
 				$meta_id = $this->_insert_event_meta($event_row, $post_id);
-				if($meta_id){
+				if ($meta_id) {
 					$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_meta_table, $meta_id);
 				}
-				$this->_convert_start_end_times($event_row,$post_id);
+				$this->_convert_start_end_times($event_row, $post_id);
 				$event_meta = maybe_unserialize($event_row['event_meta']);
 				$guid = isset($event_meta['event_thumbnail_url']) ? $event_meta['event_thumbnail_url'] : null;
-				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$post_id,$this);
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $post_id, $this);
 
 				//maybe create a venue from info on the event?
 				$new_venue_id = $this->_maybe_create_venue($event_row);
-				if($new_venue_id){
-					$this->_insert_new_venue_to_event($post_id,$new_venue_id);
+				if ($new_venue_id) {
+					$this->_insert_new_venue_to_event($post_id, $new_venue_id);
 				}
 				$this->_add_post_metas($event_row, $post_id);
 			}
 			$items_migrated_this_step++;
-			if($guid){
+			if ($guid) {
 				//if we had to check for an image attachment
 				//then let's call it a day (avoid timing out, because this took a long time)
 				break;
 			}
 		}
-		if($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
 			$this->set_status(EE_Data_Migration_Manager::status_completed);
 		}
 		return $items_migrated_this_step;
@@ -253,28 +253,28 @@ 
 	 * @param int $post_id
 	 * @return void
 	 */
-	private function _add_post_metas($old_event,$post_id){
+	private function _add_post_metas($old_event, $post_id) {
 		$event_meta = maybe_unserialize($old_event['event_meta']);
-		if( ! $event_meta || ! is_array( $event_meta ) ){
+		if ( ! $event_meta || ! is_array($event_meta)) {
 			return;
 		}
-		unset($event_meta['date_submitted']);//factored into CPT
-		unset($event_meta['additional_attendee_reg_info']);//factored into event meta table
-		unset($event_meta['default_payment_status']);//dido
-		unset($event_meta['event_thumbnail_url']);//used to find post featured image
-		foreach($event_meta as $meta_key => $meta_value){
-			if ($meta_key){//if the meta key is just an empty string, ignore it
-				$success = add_post_meta($post_id,$meta_key,$meta_value,true);
-				if( ! $success ){
-					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"),$post_id,$meta_key,$meta_value,implode(",",$old_event)));
+		unset($event_meta['date_submitted']); //factored into CPT
+		unset($event_meta['additional_attendee_reg_info']); //factored into event meta table
+		unset($event_meta['default_payment_status']); //dido
+		unset($event_meta['event_thumbnail_url']); //used to find post featured image
+		foreach ($event_meta as $meta_key => $meta_value) {
+			if ($meta_key) {//if the meta key is just an empty string, ignore it
+				$success = add_post_meta($post_id, $meta_key, $meta_value, true);
+				if ( ! $success) {
+					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event)));
 				}
 			}
 		}
-		if($old_event['alt_email']){
-			add_post_meta($post_id,'alt_email',$old_event['alt_email']);
+		if ($old_event['alt_email']) {
+			add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
 		}
-		if($old_event['recurrence_id']){
-			add_post_meta($post_id,'recurrence_id',$old_event['recurrence_id']);
+		if ($old_event['recurrence_id']) {
+			add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
 		}
 	}
 
@@ -289,10 +289,10 @@ 
 	 * @param string $new_post_status a post status
 	 * @return string
 	 */
-	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish'){
+	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish') {
 		$count = 0;
 		$original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
-		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0 );
+		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
 	}
 
 	/**
@@ -301,11 +301,11 @@ 
 	 * @param string $slug
 	 * @return boolean
 	 */
-	private function _other_post_exists_with_that_slug($slug){
+	private function _other_post_exists_with_that_slug($slug) {
 		global $wpdb;
-		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE post_name = %s",$slug);
+		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE post_name = %s", $slug);
 		$count = $wpdb->get_var($query);
-		return (boolean)intval($count);
+		return (boolean) intval($count);
 	}
 
 
@@ -314,7 +314,7 @@ 
 	 * @param $old_event
 	 * @return int
 	 */
-	private function _insert_cpt( $old_event ){
+	private function _insert_cpt($old_event) {
 		global $wpdb;
 		//convert 3.1 event status to 4.1 CPT status
 		//for reference, 3.1 event stati available for setting are:
@@ -333,66 +333,66 @@ 
 //		and 3 custom ones: cancelled,postponed,sold_out
 		$status_conversions = array(
 			'R'=>'draft',
-			'X'=>'draft',//4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+			'X'=>'draft', //4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
 			'P'=>'pending',
-			'IA'=>'draft',//draft and in the past
+			'IA'=>'draft', //draft and in the past
 //IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-			'O'=>'publish',//@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+			'O'=>'publish', //@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
 			'A'=>'publish',
-			'S'=>'draft',//@todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+			'S'=>'draft', //@todo: is it ok to just mark secondary/waitlist events as DRAFTS?
 			'D'=>'trash',
 		);
 		$post_status = $status_conversions[$old_event['event_status']];
 		//check if we've sold out
-		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])){
+		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
 			$post_status = 'sold_out';
 		}
 //		FYI postponed and cancelled don't exist in 3.1
 		$cols_n_values = array(
-			'post_title'=>stripslashes($old_event['event_name']),//EVT_name
-			'post_content'=>stripslashes($old_event['event_desc']),//EVT_desc
-			'post_name'=>$this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status ),//EVT_slug
-			'post_date'=>$old_event['submitted'],//EVT_created NOT
+			'post_title'=>stripslashes($old_event['event_name']), //EVT_name
+			'post_content'=>stripslashes($old_event['event_desc']), //EVT_desc
+			'post_name'=>$this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status), //EVT_slug
+			'post_date'=>$old_event['submitted'], //EVT_created NOT
 			'post_date_gmt'=>get_gmt_from_date($old_event['submitted']),
-			'post_excerpt'=>'',//EVT_short_desc
-			'post_modified'=>$old_event['submitted'],//EVT_modified
+			'post_excerpt'=>'', //EVT_short_desc
+			'post_modified'=>$old_event['submitted'], //EVT_modified
 			'post_modified_gmt'=>get_gmt_from_date($old_event['submitted']),
-			'post_author'=>$old_event['wp_user'],//EVT_wp_user
-			'post_parent'=>0,//parent maybe get this from some REM field?
-			'menu_order'=>0,//EVT_order
-			'post_type'=>'espresso_events',//post_type
-			'post_status'=>$post_status,//status
+			'post_author'=>$old_event['wp_user'], //EVT_wp_user
+			'post_parent'=>0, //parent maybe get this from some REM field?
+			'menu_order'=>0, //EVT_order
+			'post_type'=>'espresso_events', //post_type
+			'post_status'=>$post_status, //status
 		);
 		$cols_n_values_with_no_invalid_text = array();
-		foreach( $cols_n_values as $col => $value ) {
-			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column( $this->_new_table, $col, $value );
-			if( ! is_wp_error( $value_sans_invalid_chars ) ) {
-				$cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+		foreach ($cols_n_values as $col => $value) {
+			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
+			if ( ! is_wp_error($value_sans_invalid_chars)) {
+				$cols_n_values_with_no_invalid_text[$col] = $value_sans_invalid_chars;
 			} else {
 				//otherwise leave it as-is. It will blow everything up and stop the migration
-				$cols_n_values_with_no_invalid_text[ $col ] = $value;
+				$cols_n_values_with_no_invalid_text[$col] = $value;
 			}
 		}
 		$cols_n_values = $cols_n_values_with_no_invalid_text;
 		$datatypes = array(
-			'%s',//EVT_name
-			'%s',//EVT_desc
-			'%s',//EVT_slug
-			'%s',//EVT_created
+			'%s', //EVT_name
+			'%s', //EVT_desc
+			'%s', //EVT_slug
+			'%s', //EVT_created
 			'%s',
-			'%s',//EVT_short_desc
-			'%s',//EVT_modified
+			'%s', //EVT_short_desc
+			'%s', //EVT_modified
 			'%s',
-			'%s',//EVT_wp_user
-			'%d',//post_parent
-			'%d',//EVT_order
-			'%s',//post_type
-			'%s',//status
+			'%s', //EVT_wp_user
+			'%d', //post_parent
+			'%d', //EVT_order
+			'%s', //post_type
+			'%s', //status
 		);
 		$success = $wpdb->insert($this->_new_table,
 				$cols_n_values,
 				$datatypes);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -405,9 +405,9 @@ 
 	 * @param int $event_id
 	 * @return int
 	 */
-	public static function count_registrations($event_id){
+	public static function count_registrations($event_id) {
 		global $wpdb;
-		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d",$event_id));
+		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id));
 		return intval($count);
 	}
 
@@ -418,7 +418,7 @@ 
 	 * @param $new_cpt_id
 	 * @return int
 	 */
-	private function _insert_event_meta( $old_event, $new_cpt_id){
+	private function _insert_event_meta($old_event, $new_cpt_id) {
 		global $wpdb;
 		$event_meta = maybe_unserialize($old_event['event_meta']);
 //		for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
@@ -429,10 +429,10 @@ 
 //);
 		$default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval']));
 		$cols_n_values = array(
-			'EVT_ID'=>$new_cpt_id,//EVT_ID_fk
+			'EVT_ID'=>$new_cpt_id, //EVT_ID_fk
 			'EVT_display_desc'=> 'Y' == $old_event['display_desc'],
-			'EVT_display_ticket_selector'=> 'Y'== $old_event['display_reg_form'],
-			'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this,$old_event,current_time('mysql'),$old_event['timezone_string']),//don't use the old 'visible_on', as it wasn't ever used
+			'EVT_display_ticket_selector'=> 'Y' == $old_event['display_reg_form'],
+			'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']), //don't use the old 'visible_on', as it wasn't ever used
 			'EVT_additional_limit'=> $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'],
 			'EVT_default_registration_status' => $default_reg_status,
 			'EVT_member_only'=>$old_event['member_only'],
@@ -444,23 +444,23 @@ 
 
 		);
 		$datatypes = array(
-			'%s',//EVT_ID
-			'%d',//EVT_display_desc
-			'%d',//EVT_display_ticket_selector
-			'%s',//EVT_visible_on
-			'%d',//EVT_additional_limit
-			'%s',//EVT_default_registration_status
-			'%d',//EVT_member_only
-			'%s',//EVT_phone
-			'%d',//EVT_allow_overflow
-			'%s',//EVT_timezone_string
-			'%s',//EVT_external_URL
-			'%d',//EVT_donations
+			'%s', //EVT_ID
+			'%d', //EVT_display_desc
+			'%d', //EVT_display_ticket_selector
+			'%s', //EVT_visible_on
+			'%d', //EVT_additional_limit
+			'%s', //EVT_default_registration_status
+			'%d', //EVT_member_only
+			'%s', //EVT_phone
+			'%d', //EVT_allow_overflow
+			'%s', //EVT_timezone_string
+			'%s', //EVT_external_URL
+			'%d', //EVT_donations
 		);
 		$success = $wpdb->insert($this->_new_meta_table,
 				$cols_n_values,
 				$datatypes);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -473,8 +473,8 @@ 
 	 * @param $old_event
 	 * @return int
 	 */
-	private function _maybe_create_venue( $old_event){
-		if(		$old_event['address'] ||
+	private function _maybe_create_venue($old_event) {
+		if ($old_event['address'] ||
 				$old_event['address2'] ||
 				$old_event['city'] ||
 				$old_event['state'] ||
@@ -485,21 +485,21 @@ 
 				$old_event['venue_phone'] ||
 				$old_event['virtual_url'] ||
 				$old_event['virtual_phone']
-				){
-			$old_id = $this->_duplicate_venue_exists( $old_event );
-			if( $old_id ){
+				) {
+			$old_id = $this->_duplicate_venue_exists($old_event);
+			if ($old_id) {
 				return $old_id;
 			}
 			$new_id = $this->_insert_venue_into_posts($old_event);
-			if( $new_id ){
+			if ($new_id) {
 				$this->_insert_venue_into_meta_table($new_id, $old_event);
-				$guid = isset($old_event['venue_image']) ? $old_event['venue_image']  : null;
-				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id,$this);
+				$guid = isset($old_event['venue_image']) ? $old_event['venue_image'] : null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
 			}
 			//we don't bother recording the conversion from old events to venues as that
 			//will complicate finding the conversion from old venues to new events
 			return $new_id;
-		}else{
+		} else {
 			return 0;
 		}
 	}
@@ -510,29 +510,29 @@ 
 	 * @param array $old_event
 	 * @return int duplicate venue id
 	 */
-	private function _duplicate_venue_exists($old_event){
+	private function _duplicate_venue_exists($old_event) {
 		global $wpdb;
 		$conditions = array(
-			'VNU_address' => $old_event [ 'address' ],
-			'VNU_address2' => $old_event[ 'address2' ],
-			'VNU_city' => $old_event[ 'city' ],
-			'VNU_zip' => $old_event[ 'zip' ],
-			'post_title'=> $this->_get_venue_title_for_event( $old_event ),
-			'VNU_phone'=>$old_event['venue_phone'],//VNU_phone
-			'VNU_url'=>$old_event['venue_url'],//VNU_url
-			'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone
-			'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url
+			'VNU_address' => $old_event ['address'],
+			'VNU_address2' => $old_event['address2'],
+			'VNU_city' => $old_event['city'],
+			'VNU_zip' => $old_event['zip'],
+			'post_title'=> $this->_get_venue_title_for_event($old_event),
+			'VNU_phone'=>$old_event['venue_phone'], //VNU_phone
+			'VNU_url'=>$old_event['venue_url'], //VNU_url
+			'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone
+			'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url
 		);
 		$sql_conditions = array();
-		foreach($conditions as $column => $value){
-			$sql_conditions [] = $wpdb->prepare("$column = %s", $value );
+		foreach ($conditions as $column => $value) {
+			$sql_conditions [] = $wpdb->prepare("$column = %s", $value);
 		}
 		$query = "SELECT VNU_ID
 					FROM
 		{$wpdb->posts} as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
-			WHERE " . implode( " AND ",$sql_conditions ) . " LIMIT 1";
-		$id = $wpdb->get_var( $query );
+			WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1";
+		$id = $wpdb->get_var($query);
 		return $id;
 	}
 
@@ -541,8 +541,8 @@ 
 	 * @param array $event_data_array keys are events_details columns and values are their values
 	 * @return string
 	 */
-	protected function _get_venue_title_for_event( $event_data_array ) {
-		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes( sprintf( __( 'Venue of %s', 'event_espresso' ), $event_data_array['event_name']));
+	protected function _get_venue_title_for_event($event_data_array) {
+		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes(sprintf(__('Venue of %s', 'event_espresso'), $event_data_array['event_name']));
 	}
 
 	/**
@@ -551,40 +551,40 @@ 
 	 * @param array $old_event keys are cols, values are col values
 	 * @return int
 	 */
-	private function _insert_venue_into_posts($old_event){
+	private function _insert_venue_into_posts($old_event) {
 		global $wpdb;
 		$insertion_array = array(
-					'post_title'=> $this->_get_venue_title_for_event( $old_event ),//VNU_name
-					'post_content'=>'',//VNU_desc
-					'post_name'=> $this->_find_unique_slug( $old_event['venue_title'], sanitize_title( 'venue-of-' . $old_event['event_name'] ) ),//VNU_identifier
-					'post_date'=>current_time('mysql'),//VNU_created
+					'post_title'=> $this->_get_venue_title_for_event($old_event), //VNU_name
+					'post_content'=>'', //VNU_desc
+					'post_name'=> $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-'.$old_event['event_name'])), //VNU_identifier
+					'post_date'=>current_time('mysql'), //VNU_created
 					'post_date_gmt'=>get_gmt_from_date(current_time('mysql')),
-					'post_excerpt'=>'',//VNU_short_desc arbitrary only 50 characters
-					'post_modified'=>current_time('mysql'),//VNU_modified
+					'post_excerpt'=>'', //VNU_short_desc arbitrary only 50 characters
+					'post_modified'=>current_time('mysql'), //VNU_modified
 					'post_modified_gmt'=>get_gmt_from_date(current_time('mysql')),
-					'post_author'=>$old_event['wp_user'],//VNU_wp_user
-					'post_parent'=>0,//parent
-					'menu_order'=>0,//VNU_order
+					'post_author'=>$old_event['wp_user'], //VNU_wp_user
+					'post_parent'=>0, //parent
+					'menu_order'=>0, //VNU_order
 					'post_type'=>'espresso_venues'//post_type
 				);
 		$datatypes_array = array(
-					'%s',//VNU_name
-					'%s',//VNU_desc
-					'%s',//VNU_identifier
-					'%s',//VNU_created
+					'%s', //VNU_name
+					'%s', //VNU_desc
+					'%s', //VNU_identifier
+					'%s', //VNU_created
 					'%s',
-					'%s',//VNU_short_desc
-					'%s',//VNU_modified
+					'%s', //VNU_short_desc
+					'%s', //VNU_modified
 					'%s',
-					'%d',//VNU_wp_user
-					'%d',//parent
-					'%d',//VNU_order
-					'%s',//post_type
+					'%d', //VNU_wp_user
+					'%d', //parent
+					'%d', //VNU_order
+					'%s', //post_type
 				);
 		$success = $wpdb->insert($wpdb->posts,
 				$insertion_array,
 				$datatypes_array);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error(
 				$this->get_migration_script()->_create_error_message_for_db_insertion(
 					$this->_old_table,
@@ -605,64 +605,64 @@ 
 	 * @param array $old_event
 	 * @return int
 	 */
-	private function _insert_venue_into_meta_table($cpt_id,$old_event){
+	private function _insert_venue_into_meta_table($cpt_id, $old_event) {
 		global $wpdb;
 
 		//assume the country is the same as the organization's old settings
 		$country_iso = $this->get_migration_script()->get_default_country_iso();
 		//find the state from the venue, or the organization, or just guess california
-		if( ! $old_event['state']){
+		if ( ! $old_event['state']) {
 			$old_org_options = get_option('events_organization_settings');
 			$state_name = stripslashes($old_org_options['organization_state']);
-		}else{
+		} else {
 			$state_name = $old_event['state'];
 		}
-		if ( ! $state_name ){
+		if ( ! $state_name) {
 			$state_name = 'CA';
 		}
 		//get a state ID with the same name, if possible
-		try{
-			$state = $this->get_migration_script()->get_or_create_state($state_name,$country_iso);
+		try {
+			$state = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->add_error($e->getMessage());
 			$state_id = 0;
 		}
 		//now insert into meta table
 		$insertion_array = array(
-			'VNU_ID'=>$cpt_id,//VNU_ID_fk
-			'VNU_address'=>stripslashes($old_event['address']),//VNU_address
-			'VNU_address2'=>stripslashes($old_event['address2']),//VNU_address2
-			'VNU_city'=>stripslashes($old_event['city']),//VNU_city
-			'STA_ID'=>$state_id,//STA_ID
-			'CNT_ISO'=>$country_iso,//CNT_ISO
-			'VNU_zip'=>$old_event['zip'],//VNU_zip
-			'VNU_phone'=>$old_event['venue_phone'],//VNU_phone
-			'VNU_capacity'=>-1,//VNU_capacity
-			'VNU_url'=>$old_event['venue_url'],//VNU_url
-			'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone
-			'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url
-			'VNU_google_map_link'=>'',//VNU_google_map_link
+			'VNU_ID'=>$cpt_id, //VNU_ID_fk
+			'VNU_address'=>stripslashes($old_event['address']), //VNU_address
+			'VNU_address2'=>stripslashes($old_event['address2']), //VNU_address2
+			'VNU_city'=>stripslashes($old_event['city']), //VNU_city
+			'STA_ID'=>$state_id, //STA_ID
+			'CNT_ISO'=>$country_iso, //CNT_ISO
+			'VNU_zip'=>$old_event['zip'], //VNU_zip
+			'VNU_phone'=>$old_event['venue_phone'], //VNU_phone
+			'VNU_capacity'=>-1, //VNU_capacity
+			'VNU_url'=>$old_event['venue_url'], //VNU_url
+			'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone
+			'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url
+			'VNU_google_map_link'=>'', //VNU_google_map_link
 			'VNU_enable_for_gmap'=>true	//VNU_enable_for_gmap
 		);
 		$datatypes = array(
-			'%d',//VNU_ID_fk
-			'%s',//VNU_address
-			'%s',//VNU_address2
-			'%s',//VNU_city
-			'%d',//STA_ID
-			'%s',//CNT_ISO
-			'%s',//VNU_zip
-			'%s',//VNU_phone
-			'%d',//VNU_capacity
-			'%s',//VNU_url
-			'%s',//VNU_virtual_phone
-			'%s',//VNU_virtual_url
-			'%s',//VNU_google_map_link
-			'%d',//VNU_enable_for_gmap
+			'%d', //VNU_ID_fk
+			'%s', //VNU_address
+			'%s', //VNU_address2
+			'%s', //VNU_city
+			'%d', //STA_ID
+			'%s', //CNT_ISO
+			'%s', //VNU_zip
+			'%s', //VNU_phone
+			'%d', //VNU_capacity
+			'%s', //VNU_url
+			'%s', //VNU_virtual_phone
+			'%s', //VNU_virtual_url
+			'%s', //VNU_google_map_link
+			'%d', //VNU_enable_for_gmap
 		);
-		$success = $wpdb->insert($wpdb->prefix."esp_venue_meta",$insertion_array,$datatypes);
-		if( ! $success ){
+		$success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes));
 			return 0;
 		}
@@ -676,14 +676,14 @@ 
 	 * @param $new_venue_id
 	 * @return int
 	 */
-	private function _insert_new_venue_to_event( $new_event_id, $new_venue_id){
+	private function _insert_new_venue_to_event($new_event_id, $new_venue_id) {
 		global $wpdb;
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$new_event_id));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id));
 			return 0;
 		}
-		if( ! $new_venue_id){
-			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$new_venue_id));
+		if ( ! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id));
 			return 0;
 		}
 		$cols_n_values = array(
@@ -692,12 +692,12 @@ 
 			'EVV_primary'=>true
 		);
 		$datatypes = array(
-			'%d',//EVT_ID
-			'%d',//VNU_ID
-			'%d',//EVT_primary
+			'%d', //EVT_ID
+			'%d', //VNU_ID
+			'%d', //EVT_primary
 		);
-		$success = $wpdb->insert($wpdb->prefix."esp_event_venue",$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error(
 				$this->get_migration_script()->_create_error_message_for_db_insertion(
 					$this->_old_table,
@@ -719,11 +719,11 @@ 
 	 * @param int $new_cpt_id new post ID
 	 * @return void (if there are errors though, adds them to the stage's error list
 	 */
-	private function _convert_start_end_times($old_event,$new_cpt_id){
+	private function _convert_start_end_times($old_event, $new_cpt_id) {
 		$start_end_times = $this->_get_old_start_end_times($old_event['id']);
-		foreach($start_end_times as $start_end_time){
-			$datetime_id = $this->_insert_new_datetime($start_end_time,$old_event,$new_cpt_id);
-			if($datetime_id){
+		foreach ($start_end_times as $start_end_time) {
+			$datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
+			if ($datetime_id) {
 				$this->get_migration_script()->set_mapping($this->_old_start_end_table, $start_end_time['id'], $this->_new_datetime_table, $datetime_id);
 			}
 		}
@@ -734,9 +734,9 @@ 
 	 * @param int $old_event_id
 	 * @return array
 	 */
-	private function _get_old_start_end_times($old_event_id){
+	private function _get_old_start_end_times($old_event_id) {
 		global $wpdb;
-		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d",$old_event_id),ARRAY_A);
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id), ARRAY_A);
 	}
 	/**
 	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
@@ -745,40 +745,40 @@ 
 	 * @param int $new_cpt_id
 	 * @return int ID of new datetime
 	 */
-	private function _insert_new_datetime($start_end_time_row,$old_event_row,$new_cpt_id){
+	private function _insert_new_datetime($start_end_time_row, $old_event_row, $new_cpt_id) {
 		global $wpdb;
 		$start_date = $old_event_row['start_date'];
 		$start_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
 		$end_date = $old_event_row['end_date'];
 		$end_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
 		$existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
-		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$start_date $start_time:00",$old_event_row['timezone_string']);
-		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$end_date $end_time:00",$old_event_row['timezone_string']);
+		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']);
+		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']);
 		$cols_n_values = array(
-			'EVT_ID'=>$new_cpt_id,//EVT_ID
-			'DTT_EVT_start'=>$start_datetime_utc,//DTT_EVT_start
-			'DTT_EVT_end'=> $end_datetime_utc,//DTT_EVT_end
-			'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],//DTT_reg_limit
-			'DTT_sold'=>0,//note: we will increment this as registrations are added during the migration
+			'EVT_ID'=>$new_cpt_id, //EVT_ID
+			'DTT_EVT_start'=>$start_datetime_utc, //DTT_EVT_start
+			'DTT_EVT_end'=> $end_datetime_utc, //DTT_EVT_end
+			'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'], //DTT_reg_limit
+			'DTT_sold'=>0, //note: we will increment this as registrations are added during the migration
 //			'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-			'DTT_order'=> $existing_datetimes,//DTT_order, just give it the same order as the count of how many datetimes already exist
+			'DTT_order'=> $existing_datetimes, //DTT_order, just give it the same order as the count of how many datetimes already exist
 			'DTT_parent'=>0,
 			'DTT_deleted'=>false
 		);
 		$datatypes = array(
-			'%d',//EVT_Id
-			'%s',//DTT_EVT_start
-			'%s',//DTT_EVT_end
-			'%d',//DTT_reg_limit
-			'%d',//DTT_sold
+			'%d', //EVT_Id
+			'%s', //DTT_EVT_start
+			'%s', //DTT_EVT_end
+			'%d', //DTT_reg_limit
+			'%d', //DTT_sold
 //			'%d',//DTT_is_primary
-			'%d',//DTT_order
-			'%d',//DTT_parent
-			'%d',//DTT_deleted
+			'%d', //DTT_order
+			'%d', //DTT_parent
+			'%d', //DTT_deleted
 		);
-		$success = $wpdb->insert($this->_new_datetime_table,$cols_n_values,$datatypes);
-		if ( ! $success){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row,$start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		return $wpdb->insert_id;
@@ -791,9 +791,9 @@ 
 	 * @param int $cpt_event_id
 	 * @return int
 	 */
-	private function _count_other_datetimes_exist_for_new_event($cpt_event_id){
+	private function _count_other_datetimes_exist_for_new_event($cpt_event_id) {
 		global $wpdb;
-		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",$cpt_event_id));
+		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d", $cpt_event_id));
 		return intval($count);
 	}
 

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_line_items.dmsstage.php

Spacing +38 added lines, -38 removed lines

@@ -36,7 +36,7 @@ 
 			)
 		);
  */
-class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_line_table;
 	private $_new_transaction_table;
 	private $_new_reg_table;
@@ -52,21 +52,21 @@ 
 	
 	protected function _migrate_old_row($old_row) {
 		//insert line items if its a primary id
-		if(intval($old_row['is_primary'])){
+		if (intval($old_row['is_primary'])) {
 			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
-			if ( ! $txn_id ){
-				$this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"),$old_row['id'],$this->_json_encode($old_row)));
+			if ( ! $txn_id) {
+				$this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
 				return;
 			}
 			$txn = $this->_get_txn($txn_id);
-			$new_line_items = $this->_insert_new_line_items($txn,$old_row);
-			$this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_line_table,$new_line_items);
+			$new_line_items = $this->_insert_new_line_items($txn, $old_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_line_table, $new_line_items);
 		}
 	}
 	
-	private function _get_txn($txn_id){
+	private function _get_txn($txn_id) {
 		global $wpdb;
-		$txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d",$txn_id),ARRAY_A);
+		$txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d", $txn_id), ARRAY_A);
 		return $txn;
 	}
 	
@@ -77,9 +77,9 @@ 
 	 * @param array $transaction
 	 * @return array new line item ids
 	 */
-	private function _insert_new_line_items($transaction,$old_attendee){
+	private function _insert_new_line_items($transaction, $old_attendee) {
 		global $wpdb;
-		$regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d",$transaction['TXN_ID']),ARRAY_A);
+		$regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d", $transaction['TXN_ID']), ARRAY_A);
 		$new_line_item_ids = array();
 		//create a totla line item
 		$total_line_item_id = $this->_insert_new_line_item(array(
@@ -90,11 +90,11 @@ 
 			'LIN_type'=>'total',
 			'OBJ_ID'=>$transaction['TXN_ID'],
 			'OBJ_type'=>'Transaction'
-		),$old_attendee);
+		), $old_attendee);
 		$new_line_item_ids[] = $total_line_item_id;
 		//create a subtotal line item
 		$reg_total = 0;
-		foreach($regs_on_this_transaction as $new_reg){
+		foreach ($regs_on_this_transaction as $new_reg) {
 			$reg_total += floatval($new_reg['REG_final_price']);
 		}
 		$subtotal_line_item_id = $this->_insert_new_line_item(array(
@@ -104,26 +104,26 @@ 
 			'LIN_total'=>$reg_total,
 			'LIN_parent'=>$total_line_item_id,
 			'LIN_type'=>'sub-total',
-		),$old_attendee);
+		), $old_attendee);
 		$new_line_item_ids[] = $subtotal_line_item_id;
 		//group REGs by TKT_ID
 		$regs_by_tkt = array();
-		foreach($regs_on_this_transaction as $new_reg){
+		foreach ($regs_on_this_transaction as $new_reg) {
 			$regs_by_tkt[$new_reg['TKT_ID']][] = $new_reg;
 		}
 		
 		//create individual line items
 		
-		foreach($regs_by_tkt as $ticket_id => $regs){
+		foreach ($regs_by_tkt as $ticket_id => $regs) {
 			$count = count($regs);
 			$line_total = 0;
-			foreach($regs as $new_reg){
+			foreach ($regs as $new_reg) {
 				$line_total += $new_reg['REG_final_price'];
 			}
 			$a_reg = reset($regs);
 			$new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
 			$reg_line_item_id = $this->_insert_new_line_item(array(
-				'LIN_code'=> md5( 'Ticket' . $ticket_id . time() ),
+				'LIN_code'=> md5('Ticket'.$ticket_id.time()),
 				'TXN_ID'=>$transaction['TXN_ID'],
 				'LIN_name'=>$new_ticket['TKT_name'],
 				'LIN_unit_price'=>$a_reg['REG_final_price'],
@@ -133,7 +133,7 @@ 
 				'LIN_parent'=>$subtotal_line_item_id,
 				'OBJ_ID'=>$ticket_id,
 				'OBJ_type'=>'Ticket'
-			),$old_attendee);
+			), $old_attendee);
 			$new_line_item_ids[] = $reg_line_item_id;
 		}
 		
@@ -147,13 +147,13 @@ 
 	 * @param type $new_ticket_id
 	 * @return array
 	 */
-	private function _get_new_ticket_row($new_ticket_id){
+	private function _get_new_ticket_row($new_ticket_id) {
 		global $wpdb;
-		$ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d",$new_ticket_id),ARRAY_A);
+		$ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d", $new_ticket_id), ARRAY_A);
 		return $ticket_row;
 	}
 	
-	private function _insert_new_line_item($cols_n_values,$old_attendee){
+	private function _insert_new_line_item($cols_n_values, $old_attendee) {
 		global $wpdb;
 		$default_cols_n_values = array(
 			'LIN_code'=>'',
@@ -171,25 +171,25 @@ 
 			'OBJ_ID'=>null,
 			'OBJ_type'=>null
 		);
-		$cols_n_values = array_merge($default_cols_n_values,$cols_n_values);
+		$cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
 			$datatypes = array(
-				'%s',//LIN_code
-				'%d',//TXN_ID
-				'%s',//LIN_name
-				'%s',//LIN_desc
-				'%f',//LIN_unit_price
-				'%f',//LIN_percent
-				'%d',//LIN_is_taxable
-				'%d',//LIN_order
-				'%f',//LIN_total
-				'%d',//LIN_quantity
-				'%d',//LIN_parent
-				'%s',//LIN_type
-				'%d',//OBJ_ID
-				'%s',//OBJ_type
+				'%s', //LIN_code
+				'%d', //TXN_ID
+				'%s', //LIN_name
+				'%s', //LIN_desc
+				'%f', //LIN_unit_price
+				'%f', //LIN_percent
+				'%d', //LIN_is_taxable
+				'%d', //LIN_order
+				'%f', //LIN_total
+				'%d', //LIN_quantity
+				'%d', //LIN_parent
+				'%s', //LIN_type
+				'%d', //OBJ_ID
+				'%s', //OBJ_type
 			);
-			$success = $wpdb->insert($this->_new_line_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_line_table, $cols_n_values, $datatypes);
+			if ( ! $success) {
 				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
 				return 0;
 			}

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_question_groups.dmsstage.php

Spacing +25 added lines, -25 removed lines

@@ -38,7 +38,7 @@ 
 		);
  * 
  */
-class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
 	/**
@@ -49,19 +49,19 @@ 
 	 * @var boolean
 	 */
 	private $_already_got_system_question_group_1 = false;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $question_group){
+		foreach ($rows as $question_group) {
 			$new_id = $this->_insert_new_question_group($question_group);
 
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
 			$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;
@@ -85,24 +85,24 @@ 
 	 * @param array $old_question_group
 	 * @return int
 	 */
-	private function _insert_new_question_group($old_question_group){
+	private function _insert_new_question_group($old_question_group) {
 		global $wpdb;
 		//try to guess what the QST_system int should be... finding the Personal info system
 		//question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
 		//could be easily removed.
-		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
+		if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
 			$guess_at_system_number = 1;
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
+		}elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== FALSE) {
 			$guess_at_system_number = 2;
-		}else{
+		} else {
 			$guess_at_system_number = 0;
 		}
 		//if the question group wasn't made by the normal admin, 
 		//we'd like to keep track of who made it
-		if(intval($old_question_group['wp_user'])!=1){
-			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
+		if (intval($old_question_group['wp_user']) != 1) {
+			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
-		}else{
+		} else {
 			$identifier = $old_question_group['group_identifier'];
 		}
 		$cols_n_values = array(
@@ -116,17 +116,17 @@ 
 			'QSG_deleted'=>false
 		);
 		$datatypes = array(
-			'%s',//QSG_name
-			'%s',//QSG_identifier
-			'%s',//QSG_desc
-			'%d',//QSG_order
-			'%d',//QSG_show_group_name
-			'%d',//QSG_show_group_desc
-			'%d',//QSG_system
-			'%d',//QSG_deleted
+			'%s', //QSG_name
+			'%s', //QSG_identifier
+			'%s', //QSG_desc
+			'%d', //QSG_order
+			'%d', //QSG_show_group_name
+			'%d', //QSG_show_group_desc
+			'%d', //QSG_system
+			'%d', //QSG_deleted
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -138,12 +138,12 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _already_got_system_question_group_1(){
-		if( ! $this->_already_got_system_question_group_1 ){
+	private function _already_got_system_question_group_1() {
+		if ( ! $this->_already_got_system_question_group_1) {
 			//check the db
 			global $wpdb;
 			$exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
-			if(intval($exists)>0){
+			if (intval($exists) > 0) {
 				$this->_already_got_system_question_group_1 = true;
 			}
 		}		

Braces +3 added lines, -3 removed lines

@@ -92,9 +92,9 @@ 
 		//could be easily removed.
 		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
 			$guess_at_system_number = 1;
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
+		} elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
 			$guess_at_system_number = 2;
-		}else{
+		} else{
 			$guess_at_system_number = 0;
 		}
 		//if the question group wasn't made by the normal admin, 
@@ -102,7 +102,7 @@ 
 		if(intval($old_question_group['wp_user'])!=1){
 			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
-		}else{
+		} else{
 			$identifier = $old_question_group['group_identifier'];
 		}
 		$cols_n_values = array(

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_datetime_fields.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
  * The name is set to just be a string representation of the start date (in UTC time for now), and the description is just left blank
 */
 
-class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table {
 	function __construct() {
 		global $wpdb;
 		$this->_pretty_name = __("Datetime Fields", "event_espresso");
@@ -25,14 +25,14 @@ 
 				array(
 					'DTT_ID'=>$old_row['DTT_ID']),
 				array(
-					'%s',//DTT_name,
-					'%s',//DTT_description
+					'%s', //DTT_name,
+					'%s', //DTT_description
 					),
 				array(
-					'%d',//DTT_ID
+					'%d', //DTT_ID
 					));
-		if( FALSE === $updated ){
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'),$old_row['QST_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'), $old_row['QST_ID']));
 		}
 		//nothing to map really
 	}	

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_question_group_questions.dmsstage.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  * Populates the QGQ_order (introduced in this version, 4.2.0) from the QST_order
 */
 
-class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table {
 	private $_qgq_table;
 	function __construct() {
 		global $wpdb;
@@ -20,12 +20,12 @@ 
 		$updated = $wpdb->update($this->_qgq_table,
 				array('QGQ_order'=>$old_row['QST_order']),
 				array('QST_ID'=>$old_row['QST_ID']),
-				array('%d',//QGQ_order
+				array('%d', //QGQ_order
 					),
-				array('%d',//QST_ID
+				array('%d', //QST_ID
 					));
-		if( FALSE === $updated ){
-			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'),$old_row['QST_order'],$old_row['QST_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'), $old_row['QST_order'], $old_row['QST_ID']));
 		}
 		//nothing to map really
 	}	

core/data_migration_scripts/4_3_0_stages/EE_DMS_4_3_0_event_message_templates.dmsstage.php

Indentation +15 added lines, -15 removed lines

@@ -41,19 +41,19 @@ 
  		//foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
  		global $wpdb;
  		if ( $old_row['EVT_ID'] > 0 ) {
-                                    //let's get the EVT for this id so we can update the custom name on the old row.
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
+									//let's get the EVT for this id so we can update the custom name on the old row.
+									$event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
 
-                                    //update name
-                                    $updated = $wpdb->update(
-                                        $this->_old_table,
-                                        array(
-                                            'MTP_name' =>$event_name
-                                            ),
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
-                                        array( '%s' ),
-                                        array( '%d' )
-                                        );
+									//update name
+									$updated = $wpdb->update(
+										$this->_old_table,
+										array(
+											'MTP_name' =>$event_name
+											),
+										array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
+										array( '%s' ),
+										array( '%d' )
+										);
 
  			$inserted = $wpdb->insert(
  				$this->_emt_table,
@@ -64,9 +64,9 @@ 
  				array( '%d', '%d' )
  				);
 
-                                    if ( FALSE === $updated ) {
-                                        $this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
-                                    }
+									if ( FALSE === $updated ) {
+										$this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
+									}
 
  			if ( FALSE === $inserted ) {
  				$this->add_error( sprintf( __("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID'] ) );

Spacing +11 added lines, -11 removed lines

@@ -37,12 +37,12 @@ 
 
 
 
- 	protected function _migrate_old_row( $old_row ) {
+ 	protected function _migrate_old_row($old_row) {
  		//foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
  		global $wpdb;
- 		if ( $old_row['EVT_ID'] > 0 ) {
+ 		if ($old_row['EVT_ID'] > 0) {
                                     //let's get the EVT for this id so we can update the custom name on the old row.
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
+                                    $event_name = 'Custom Template for '.$wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
 
                                     //update name
                                     $updated = $wpdb->update(
@@ -50,9 +50,9 @@ 
                                         array(
                                             'MTP_name' =>$event_name
                                             ),
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
-                                        array( '%s' ),
-                                        array( '%d' )
+                                        array('GRP_ID' => (int) $old_row['GRP_ID']),
+                                        array('%s'),
+                                        array('%d')
                                         );
 
  			$inserted = $wpdb->insert(
@@ -61,15 +61,15 @@ 
  					'EVT_ID' => (int) $old_row['EVT_ID'],
  					'GRP_ID' => (int) $old_row['GRP_ID'],
  					),
- 				array( '%d', '%d' )
+ 				array('%d', '%d')
  				);
 
-                                    if ( FALSE === $updated ) {
-                                        $this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
+                                    if (FALSE === $updated) {
+                                        $this->add_error(sprintf(__("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name));
                                     }
 
- 			if ( FALSE === $inserted ) {
- 				$this->add_error( sprintf( __("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID'] ) );
+ 			if (FALSE === $inserted) {
+ 				$this->add_error(sprintf(__("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID']));
  			}
  		}
  	}

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage 	migrations
  * @since 			4.3
  */
- if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+ if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+ 	exit('No direct script access allowed');
+ }
 
 
 /**

core/data_migration_scripts/4_3_0_stages/EE_DMS_4_3_0_question_option_order.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('QSO_order'=>$old_row['QSO_ID']),
 				array('QSO_ID'=>$old_row['QSO_ID']),
-				array('%d',//QSO_order
+				array('%d', //QSO_order
 					),
-				array('%d',//QSO_ID
+				array('%d', //QSO_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSO_order = %d where QSO_ID = %d", 'event_espresso'),$old_row['QSO_ID'],$old_row['QSO_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSO_order = %d where QSO_ID = %d", 'event_espresso'), $old_row['QSO_ID'], $old_row['QSO_ID']));
 		}
 	}
 }
\ No newline at end of file

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_invoice_settings.dmsstage.php

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
 		if( ! $invoice_settings ){
 			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
+		} else{
 			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
 			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
 			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];

Indentation +27 added lines, -27 removed lines

@@ -51,15 +51,15 @@ 
 
 
 
-    /**
-     *    _migration_step
-     *
-     * @access protected
-     * @param int $num_items
-     * @throws EE_Error
-     * @return int number of items ACTUALLY migrated
-     * @throws InvalidDataTypeException
-     */
+	/**
+	 *    _migration_step
+	 *
+	 * @access protected
+	 * @param int $num_items
+	 * @throws EE_Error
+	 * @return int number of items ACTUALLY migrated
+	 * @throws InvalidDataTypeException
+	 */
 	protected function _migration_step( $num_items = 1 ){
 		// if this isn't set then something is really wrong
 		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
@@ -86,29 +86,29 @@ 
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
 			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
-                new PersistentAdminNotice(
-                    'invoice_css_not_updated',
-                    sprintf(
-                        esc_html__(
-                            'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
-                            'event_espresso'
-                        ),
-                        $invoice_settings['invoice_css']
-                    )
-                );
+				new PersistentAdminNotice(
+					'invoice_css_not_updated',
+					sprintf(
+						esc_html__(
+							'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
+							'event_espresso'
+						),
+						$invoice_settings['invoice_css']
+					)
+				);
 			}
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
 			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
 			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
 			if( $overridden_invoice_body || $overridden_receipt_body ) {
-                new PersistentAdminNotice(
-                    'invoice_overriding_templates',
-                    esc_html__(
-                        'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
-                        'event_espresso'
-                    ),
-                    true
-                );
+				new PersistentAdminNotice(
+					'invoice_overriding_templates',
+					esc_html__(
+						'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
+						'event_espresso'
+					),
+					true
+				);
 			}
 
 		}

Spacing +22 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Gateway Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -60,32 +60,32 @@ 
      * @return int number of items ACTUALLY migrated
      * @throws InvalidDataTypeException
      */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 		// if this isn't set then something is really wrong
-		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
-		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
-		if( ! $invoice_settings ){
-			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
-			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
-			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
-			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
-			$invoice_settings[ 'template_invoice_email' ] = '';
-			$invoice_settings[ 'template_invoice_tax_number' ] = '';
-			unset( $invoice_settings[ 'pdf_instructions' ] );
-			unset( $invoice_settings[ 'payable_to' ] );
-			unset( $invoice_settings[ 'payment_address' ] );
-			EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] = $invoice_settings;
-			EE_Config::instance()->update_espresso_config(false,false);
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : NULL;
+		if ( ! $invoice_settings) {
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email'] = '';
+			$invoice_settings['template_invoice_tax_number'] = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
 			//@todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
 			//(why is it tough to change? because we want to update the receipt and invoice message template, but
 			//message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
-			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
+			if ( ! in_array($invoice_settings['invoice_css'], array('', 'simple.css'))) {
                 new PersistentAdminNotice(
                     'invoice_css_not_updated',
                     sprintf(
@@ -98,9 +98,9 @@ 
                 );
 			}
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-			if( $overridden_invoice_body || $overridden_receipt_body ) {
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+			$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
                 new PersistentAdminNotice(
                     'invoice_overriding_templates',
                     esc_html__(