eventespresso / event-espresso-core

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_gateways.dmsstage.php

Spacing +71 added lines, -71 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * Migrates 4.1-4.5-style gateway settings (which were stores in EE_Config)
  * to 4.6-style payment methods (which have their database table)
  */
-class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage {
 
 	protected $_new_table_name;
 	protected $_extra_meta_table_name;
@@ -73,11 +73,11 @@ 
 	 */
 	protected function _migration_step($num_items_to_migrate = 50) {
 		$items_actually_migrated = 0;
-		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings,$this->count_records_migrated(),$num_items_to_migrate);
-		foreach($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings){
+		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
 
-			if( in_array( $old_gateway_slug, $this->_gateway_we_know_to_migrate ) ) {
-				if( ! $old_gateway_settings){
+			if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
+				if ( ! $old_gateway_settings) {
 					//no settings existed for this gateway anyways... weird...
 					$items_actually_migrated++;
 					continue;
@@ -86,16 +86,16 @@ 
 				$success = $this->_convert_gateway_settings(
 						$old_gateway_slug,
 						$old_gateway_settings,
-						isset( EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ] ) );
-				if( $success ) {
-					EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
+						isset(EE_Config::instance()->gateway->active_gateways[$old_gateway_slug]) );
+				if ($success) {
+					EE_Config::instance()->gateway->payment_settings[$old_gateway_slug] = 'Deprecated';
 				}
 			}
 			$items_actually_migrated++;
 		}
 
-		EE_Config::instance()->update_espresso_config(false,false);
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -108,22 +108,22 @@ 
 	 * @param boolean $active indicates the gateway is currently active
 	 * @return boolean success
 	 */
-	protected function _convert_gateway_settings($old_gateway_slug,$old_gateway_settings,$active){
-		switch($old_gateway_slug){
+	protected function _convert_gateway_settings($old_gateway_slug, $old_gateway_settings, $active) {
+		switch ($old_gateway_slug) {
 			case 'Aim':
 				$extra_meta_key_values = array(
 					'login_id'=>$old_gateway_settings['authnet_aim_login_id'],
 					'transaction_key'=>$old_gateway_settings['authnet_aim_transaction_key'],
 					'test_transactions'=>$old_gateway_settings['test_transactions']
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Bank':
 				$extra_meta_key_values = array(
 					'page_title'=>$old_gateway_settings['page_title'],
 					'payment_instructions'=>
-					sprintf( __('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'] , $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address'] ) );
-				$desc = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
+					sprintf(__('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'], $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address']) );
+				$desc = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
 				break;
 			case 'Check':
 				$extra_meta_key_values = array(
@@ -131,7 +131,7 @@ 
 					'payment_instructions'=>$old_gateway_settings['check_instructions'],
 					'address_to_send_payment'=>$old_gateway_settings['payment_address']
 				);
-				$desc = __( 'On the next page you will be given instructions on how to make a payment by check.', 'event_espresso' );
+				$desc = __('On the next page you will be given instructions on how to make a payment by check.', 'event_espresso');
 				break;
 			case 'Invoice':
 				$extra_meta_key_values = array(
@@ -139,23 +139,23 @@ 
 					'pdf_payee_email' => $old_gateway_settings['template_invoice_email'],
 					'pdf_payee_tax_number' => $old_gateway_settings['template_invoice_tax_number'],
 					'pdf_payee_address' => $old_gateway_settings['template_invoice_address'],
-					'pdf_instructions' => $old_gateway_settings[ 'template_payment_instructions' ],
-					'pdf_logo_image' => $old_gateway_settings[ 'invoice_logo_url' ],
-					'page_confirmation_text' => isset( $old_gateway_settings[ 'page_instructions' ] ) ? $old_gateway_settings[ 'page_instructions' ] : '',
-					'page_extra_info' => isset( $old_gateway_settings[ 'payment_address' ] ) ? $old_gateway_settings[ 'payment_address' ] : '',
+					'pdf_instructions' => $old_gateway_settings['template_payment_instructions'],
+					'pdf_logo_image' => $old_gateway_settings['invoice_logo_url'],
+					'page_confirmation_text' => isset($old_gateway_settings['page_instructions']) ? $old_gateway_settings['page_instructions'] : '',
+					'page_extra_info' => isset($old_gateway_settings['payment_address']) ? $old_gateway_settings['payment_address'] : '',
 					'legacy_invoice_css' => $old_gateway_settings['invoice_css']
 				);
 				//if they didnt want the invoiec gateway to show, pretend it was inactive
-				if( ! $old_gateway_settings['show'] ){
+				if ( ! $old_gateway_settings['show']) {
 					$active = FALSE;
 				}
-				$desc = __( 'On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso' );
+				$desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
 				break;
 			case 'Mijireh':
 				$extra_meta_key_values = array(
-					'access_key' => $old_gateway_settings[ 'access_key' ]
+					'access_key' => $old_gateway_settings['access_key']
 				);
-				$desc =  __( 'On the next page you will be able to enter your billing information to make the payment.', 'event_espresso' );
+				$desc = __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
 				break;
 			case 'Paypal_Pro':
 				$extra_meta_key_values = array(
@@ -164,31 +164,31 @@ 
 					'signature'=>$old_gateway_settings['signature'],
 					'credit_card_types'=>$old_gateway_settings['credit_cards'],
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Paypal_Standard':
 				$extra_meta_key_values = array(
-					'paypal_id' => $old_gateway_settings[ 'paypal_id' ],
-					'image_url' => $old_gateway_settings[ 'image_url' ],
-					'shipping_details' => isset( $old_gateway_settings[ 'no_shipping' ] ) ? $old_gateway_settings[ 'no_shipping' ] : false,
+					'paypal_id' => $old_gateway_settings['paypal_id'],
+					'image_url' => $old_gateway_settings['image_url'],
+					'shipping_details' => isset($old_gateway_settings['no_shipping']) ? $old_gateway_settings['no_shipping'] : false,
 
 				);
-				$desc = sprintf( __( 'After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso' ), '<strong>','</strong>' );
+				$desc = sprintf(__('After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso'), '<strong>', '</strong>');
 				break;
 			default:
 				//if we don't recognize the payment method, just put everything in it into extra meta. At least this way its preserved somewhere
 				$extra_meta_key_values = $old_gateway_settings;
 				$desc = '';
 		}
-		$pretty_name = isset( $old_gateway_settings[ 'display_name' ] ) ? $old_gateway_settings[ 'display_name' ] : $old_gateway_slug;
-		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
-		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
-			$scope = array( 'ADMIN' );
-		}else{
+		$pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
+		$offline_gateways = array('Bank', 'Check', 'Invoice');
+		if ($active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART', 'ADMIN');
+		}elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART');
+		}elseif ( ! $active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('ADMIN');
+		} else {
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -196,25 +196,25 @@ 
 			'PMD_name' => $pretty_name,
 			'PMD_desc' => $desc,
 			'PMD_admin_name' => $pretty_name,
-			'PMD_slug' => sanitize_key( $old_gateway_slug ),
-			'PMD_debug_mode' => isset( $old_gateway_settings[ 'use_sandbox' ] ) ? $old_gateway_settings['use_sandbox'] : FALSE,
-			'PMD_button_url' => isset( $old_gateway_settings[ 'button_url' ] ) ? $old_gateway_settings[ 'button_url' ] : NULL,
-			'PMD_scope' =>  serialize( $scope )
+			'PMD_slug' => sanitize_key($old_gateway_slug),
+			'PMD_debug_mode' => isset($old_gateway_settings['use_sandbox']) ? $old_gateway_settings['use_sandbox'] : FALSE,
+			'PMD_button_url' => isset($old_gateway_settings['button_url']) ? $old_gateway_settings['button_url'] : NULL,
+			'PMD_scope' =>  serialize($scope)
 		);
 		$db_types = array(
-			'%s',//PMD_type
-			'%s',//PMD_name
-			'%s',//PMD_desc
-			'%s',//PMD_admin_name
-			'%s',//PMD_slug
-			'%d',//PMD_debug_mode
-			'%s',//PMD_button_url
-			'%s',//PMD_scope
+			'%s', //PMD_type
+			'%s', //PMD_name
+			'%s', //PMD_desc
+			'%s', //PMD_admin_name
+			'%s', //PMD_slug
+			'%d', //PMD_debug_mode
+			'%s', //PMD_button_url
+			'%s', //PMD_scope
 		);
 		global $wpdb;
 		//first: check if it already exists
-		$id = $wpdb->get_var( $wpdb->prepare( "SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values[ 'PMD_slug' ] ) );
-		if( $id ){
+		$id = $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values['PMD_slug']));
+		if ($id) {
 			//just update that payment method instead of creating a new one
 			$success = $wpdb->update(
 					$this->_new_table_name,
@@ -224,27 +224,27 @@ 
 					),
 					$db_types,
 					array(
-						'%d',//PMD_ID
+						'%d', //PMD_ID
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,json_encode($payment_method_col_values),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, json_encode($payment_method_col_values), $wpdb->last_error));
 			}
-		}else{
+		} else {
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
 					$db_types);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else {
 				$id = $wpdb->insert_id;
 			}
 		}
 
-		if( $id ){
-			$this->_convert_extra_meta_values( $id, $extra_meta_key_values );
-			$this->get_migration_script()->set_mapping( 'EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id );
+		if ($id) {
+			$this->_convert_extra_meta_values($id, $extra_meta_key_values);
+			$this->get_migration_script()->set_mapping('EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id);
 			return true;
 		}
 		return false;
@@ -258,26 +258,26 @@ 
 	 * @param int $id
 	 * @param array $extra_meta_key_values
 	 */
-	private function _convert_extra_meta_values($id,$extra_meta_key_values){
+	private function _convert_extra_meta_values($id, $extra_meta_key_values) {
 		global $wpdb;
-		foreach( $extra_meta_key_values as $key => $value ){
+		foreach ($extra_meta_key_values as $key => $value) {
 			$exm_args = array(
 				'OBJ_ID'=>$id,
 				'EXM_type'=>'Payment_Method',
 				'EXM_key'=>$key,
-				'EXM_value'=> maybe_serialize($value )
+				'EXM_value'=> maybe_serialize($value)
 			);
 			$success = $wpdb->insert(
 					$this->_extra_meta_table_name,
 					$exm_args,
 					array(
-						'%d',//OBJ_ID
-						'%s',//EXM_type
-						'%s',//EXM_key
-						'%s',//EXM_value
+						'%d', //OBJ_ID
+						'%s', //EXM_type
+						'%s', //EXM_key
+						'%s', //EXM_value
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"),json_encode($exm_args),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), json_encode($exm_args), $wpdb->last_error));
 			}
 		}
 	}

Braces +5 added lines, -5 removed lines

@@ -184,11 +184,11 @@ 
 		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
 		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
 			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
+		} elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
 			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
+		} elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
 			$scope = array( 'ADMIN' );
-		}else{
+		} else{
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -229,7 +229,7 @@ 
 			if( ! $success ){
 				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,json_encode($payment_method_col_values),$wpdb->last_error));
 			}
-		}else{
+		} else{
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
@@ -237,7 +237,7 @@ 
 			if ( ! $success ) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else{
 				$id = $wpdb->insert_id;
 			}
 		}

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_payments.dmsstage.php

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,37 +12,37 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_payments extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_payments extends EE_Data_Migration_Script_Stage_Table {
 	protected $_payment_method_table;
-	function __construct(){
+	function __construct() {
 		global $wpdb;
-		$this->_old_table = $wpdb->prefix . 'esp_payment';
-		$this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
+		$this->_old_table = $wpdb->prefix.'esp_payment';
+		$this->_payment_method_table = $wpdb->prefix.'esp_payment_method';
 		$this->_pretty_name = __('Payment-Payment Method Relations', 'event_espresso');
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $payment_row ) {
+	protected function _migrate_old_row($payment_row) {
 		global $wpdb;
 		//get the payment method's ID
-		$PMD_ID = apply_filters( 'FHEE__EE_DMS_4_6_0_payments__migrate_old_row__PMD_ID', $this->_get_payment_method_id_by_gateway_name( $payment_row[ 'PAY_gateway' ], $payment_row[ 'PAY_method'] ) );
-		if( ! $PMD_ID ){
-			$this->add_error( sprintf( __( 'Could not find payment method with PMD_type = \'%1$s\' when migrating payment row %2$s so just assigned it an unknown payment method', 'event_espresso' ), $payment_row[ 'PAY_gateway' ], $this->_json_encode( $payment_row ) ) );
+		$PMD_ID = apply_filters('FHEE__EE_DMS_4_6_0_payments__migrate_old_row__PMD_ID', $this->_get_payment_method_id_by_gateway_name($payment_row['PAY_gateway'], $payment_row['PAY_method']));
+		if ( ! $PMD_ID) {
+			$this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating payment row %2$s so just assigned it an unknown payment method', 'event_espresso'), $payment_row['PAY_gateway'], $this->_json_encode($payment_row)));
 			$PMD_ID = 0;
 		}
 		$new_values = array(
 			'PMD_ID' => $PMD_ID,
-			'PAY_source' => ( $payment_row[ 'PAY_via_admin' ] ? 'ADMIN' : 'CART' ) );
-		$wheres = array( 'PAY_ID' => $payment_row[ 'PAY_ID' ] );
-		$new_value_datatypes = array( '%d', '%s' );
-		$where_datatypes = array( '%d' );
-		$success = $wpdb->update( $this->_old_table,
+			'PAY_source' => ($payment_row['PAY_via_admin'] ? 'ADMIN' : 'CART') );
+		$wheres = array('PAY_ID' => $payment_row['PAY_ID']);
+		$new_value_datatypes = array('%d', '%s');
+		$where_datatypes = array('%d');
+		$success = $wpdb->update($this->_old_table,
 				$new_values,
 				$wheres,
 				$new_value_datatypes,
 				$where_datatypes
 				);
-		if( ! $success ){
-			$this->add_error( sprintf( __( 'Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso' ), $this->_json_encode( $new_values ), $this->_old_table, $this->_json_encode( $wheres ) ) );
+		if ( ! $success) {
+			$this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_old_table, $this->_json_encode($wheres)));
 		}
 	}
 	/**
@@ -60,11 +60,11 @@ 
 	 * @param int $id
 	 * @return string
 	 */
-	protected function _get_payment_method_id_by_gateway_name( $gateway_name, $old_pay_method_column ){
+	protected function _get_payment_method_id_by_gateway_name($gateway_name, $old_pay_method_column) {
 		global $wpdb;
 		//convert from old known PAY_method values to their corresponding
 		//PMD_type or default PMD_name
-		switch( $old_pay_method_column ) {
+		switch ($old_pay_method_column) {
 			case 'PP':
 				$pmd_type = 'Paypal_Standard';
 				break;
@@ -92,8 +92,8 @@ 
 			default:
 				$pmd_type = $gateway_name;
 		}
-		$pmd_name = str_replace( "_", " ", $pmd_type );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s OR PMD_name = %s", $pmd_type, $pmd_name ) );
+		$pmd_name = str_replace("_", " ", $pmd_type);
+		return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM ".$wpdb->prefix."esp_payment_method WHERE PMD_type = %s OR PMD_name = %s", $pmd_type, $pmd_name));
 	}
 
 

Doc Comments -1 removed lines

@@ -49,7 +49,6 @@
 	/**
 	 *
 	 * @global type $wpdb
-	 * @param int $id
 	 * @return string
 	 */
 	protected function _get_payment_method_id_by_gateway_name( $gateway_name ){

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_question_types.dmsstage.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Question Types', 'event_espresso' );
+		$this->_pretty_name = __('Question Types', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_question_type_conversions = array(
 			'MULTIPLE' 			=> 'CHECKBOX',
@@ -35,8 +35,8 @@ 
 		//when fetching rows, because we automatically use a limit and offset
 		//rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
 		//so we need to include both the migrated rows as well as the non-migrated rows
-		$QST_types_to_count = array_merge( array_keys( $this->_question_type_conversions ), $this->_question_type_conversions );
-		$this->_extra_where_sql = "WHERE QST_type IN ('" . implode( "', '", $QST_types_to_count ) . "')" ;
+		$QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
+		$this->_extra_where_sql = "WHERE QST_type IN ('".implode("', '", $QST_types_to_count)."')";
 		parent::__construct();
 	}
 
@@ -44,21 +44,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
+	protected function _migrate_old_row($question) {
 		global $wpdb;
-		if ( $question['QST_ID'] && isset( $this->_question_type_conversions[ $question['QST_type'] ] )) {
+		if ($question['QST_ID'] && isset($this->_question_type_conversions[$question['QST_type']])) {
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ), 	// data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => $this->_question_type_conversions[$question['QST_type']]), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						json_encode( $question['QST_type'] ),
+						__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
+						json_encode($question['QST_type']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_state_system_question.dmsstage.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_6_0_state_system_question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_state_system_question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'State - System Question', 'event_espresso' );
+		$this->_pretty_name = __('State - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'state'";
 		parent::__construct();
@@ -37,21 +37,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
-		if ( $question['QST_ID'] && $question['QST_system'] == 'state' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'state') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'STATE' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'STATE'), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price.dmsstage.php

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,20 +12,20 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price extends EE_Data_Migration_Script_Stage_Table {
 
 	protected $_ticket_table;
 
 	protected $_line_item_table;
 
-	function __construct(){
+	function __construct() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$this->_pretty_name = __( 'Registration Final Price Tax Calculations', 'event_espresso' );
+		$this->_pretty_name = __('Registration Final Price Tax Calculations', 'event_espresso');
 		// define tables
-		$this->_old_table 				= $wpdb->prefix . 'esp_registration';
-		$this->_ticket_table 			= $wpdb->prefix . 'esp_ticket';
-		$this->_line_item_table 	= $wpdb->prefix . 'esp_line_item';
+		$this->_old_table = $wpdb->prefix.'esp_registration';
+		$this->_ticket_table = $wpdb->prefix.'esp_ticket';
+		$this->_line_item_table = $wpdb->prefix.'esp_line_item';
 		parent::__construct();
 	}
 
@@ -55,7 +55,7 @@ 
 		global $wpdb;
 		$SQL = "SELECT count( reg.REG_ID ) ";
 		$SQL .= $this->_get_rest_of_sql_for_query();
-		$count = $wpdb->get_var( $SQL );
+		$count = $wpdb->get_var($SQL);
 		return $count;
 	}
 
@@ -67,13 +67,13 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ) {
+	protected function _get_rows($limit) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
 		$SQL = "SELECT reg.REG_ID,  reg.REG_final_price, line.LIN_ID ";
 		$SQL .= $this->_get_rest_of_sql_for_query();
-		$SQL .= $wpdb->prepare( "LIMIT %d, %d", $start_at_record, $limit );
+		$SQL .= $wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
 
 		// produces something like:
 		/*
@@ -93,7 +93,7 @@ 
 			LIMIT 1, 50
 		 */
 
-		return $wpdb->get_results( $SQL, ARRAY_A );
+		return $wpdb->get_results($SQL, ARRAY_A);
 	}
 
 
@@ -102,38 +102,38 @@ 
 	 * @param array $row
 	 * @return void
 	 */
-	protected function _migrate_old_row( $row ) {
+	protected function _migrate_old_row($row) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		// ensure all required values are present
-		if ( ! isset( $row[ 'REG_ID' ], $row[ 'REG_final_price' ], $row[ 'LIN_ID' ] )) {
+		if ( ! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
 			$this->add_error(
 				sprintf(
-					__( 'Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso' ),
+					__('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
 					'<br />',
-					isset( $row[ 'REG_ID' ] ) ? $row[ 'REG_ID' ] : '',
-					isset( $row[ 'REG_final_price' ] ) ? $row[ 'REG_final_price' ] : '',
-					isset( $row[ 'LIN_ID' ] ) ? $row[ 'LIN_ID' ] : '',
+					isset($row['REG_ID']) ? $row['REG_ID'] : '',
+					isset($row['REG_final_price']) ? $row['REG_final_price'] : '',
+					isset($row['LIN_ID']) ? $row['LIN_ID'] : '',
 					$wpdb->last_error
 				)
 			);
 			return;
 		}
 		// get tax subtotal
-		$tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal( $row['LIN_ID'] );
-		if ( ! $tax_subtotal_line_item_ID ) {
+		$tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
+		if ( ! $tax_subtotal_line_item_ID) {
 			$this->add_error(
 				sprintf(
-					__( 'Invalid line item ID returned. Error: "%1$s"', 'event_espresso' ),
+					__('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
 					$wpdb->last_error
 				)
 			);
 			return;
 		}
 		// now get taxes
-		$taxes = $this->_get_tax_amounts( $tax_subtotal_line_item_ID );
+		$taxes = $this->_get_tax_amounts($tax_subtotal_line_item_ID);
 		// apply taxes to registration final price
-		$this->_apply_taxes( $row[ 'REG_ID' ], $row[ 'REG_final_price' ], $taxes );
+		$this->_apply_taxes($row['REG_ID'], $row['REG_final_price'], $taxes);
 
 	}
 
@@ -145,14 +145,14 @@ 
 	 * @param int $LIN_ID
 	 * @return int
 	 */
-	protected function _get_line_item_ID_for_tax_subtotal( $LIN_ID ) {
+	protected function _get_line_item_ID_for_tax_subtotal($LIN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT LIN_ID ";
 		$SQL .= "FROM {$this->_line_item_table} ";
 		$SQL .= "WHERE LIN_parent = %d ";
 		$SQL .= "AND LIN_code = 'taxes'";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $LIN_ID ) );
+		return $wpdb->get_var($wpdb->prepare($SQL, $LIN_ID));
 	}
 
 
@@ -163,13 +163,13 @@ 
 	 * @param int $LIN_ID
 	 * @return array
 	 */
-	protected function _get_tax_amounts( $LIN_ID ) {
+	protected function _get_tax_amounts($LIN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT LIN_percent ";
 		$SQL .= "FROM {$this->_line_item_table} ";
 		$SQL .= "WHERE LIN_parent = %d";
-		return $wpdb->get_results( $wpdb->prepare( $SQL, $LIN_ID ), OBJECT_K );
+		return $wpdb->get_results($wpdb->prepare($SQL, $LIN_ID), OBJECT_K);
 	}
 
 
@@ -182,14 +182,14 @@ 
 	 * @param array $taxes
 	 * @return void
 	 */
-	protected function _apply_taxes( $REG_ID = 0, $final_price = 0.00, $taxes = array() ) {
-		if ( is_array( $taxes ) && ! empty( $taxes ) ) {
+	protected function _apply_taxes($REG_ID = 0, $final_price = 0.00, $taxes = array()) {
+		if (is_array($taxes) && ! empty($taxes)) {
 			$total_taxes = 0;
-			foreach ( $taxes as $tax ) {
-				$total_taxes += $final_price * ( $tax->LIN_percent / 100 );
+			foreach ($taxes as $tax) {
+				$total_taxes += $final_price * ($tax->LIN_percent / 100);
 			}
 			$final_price += $total_taxes;
-			$this->_update_registration_final_price( $REG_ID, $final_price );
+			$this->_update_registration_final_price($REG_ID, $final_price);
 		}
 	}
 
@@ -202,20 +202,20 @@ 
 	 * @param float $REG_final_price
 	 * @return void
 	 */
-	protected function _update_registration_final_price( $REG_ID = 0, $REG_final_price = 0.00 ) {
+	protected function _update_registration_final_price($REG_ID = 0, $REG_final_price = 0.00) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$success = $wpdb->update(
 			$this->_old_table,
-			array( 'REG_final_price' => $REG_final_price ),  // data
-			array( 'REG_ID' => $REG_ID ),  // where
-			array( '%f' ),   // data format
-			array( '%d' )  // where format
+			array('REG_final_price' => $REG_final_price), // data
+			array('REG_ID' => $REG_ID), // where
+			array('%f'), // data format
+			array('%d')  // where format
 		);
-		if ( $success === false ) {
+		if ($success === false) {
 			$this->add_error(
 				sprintf(
-					__( 'Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
+					__('Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso'),
 					$REG_ID,
 					$wpdb->last_error
 				)

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Registration_Payments.dmsstage.php

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,7 +12,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table {
 
 	protected $_payment_table;
 
@@ -20,15 +20,15 @@ 
 
 	protected $_registration_payment_table;
 
-	function __construct(){
+	function __construct() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$this->_pretty_name = __( 'Registration Payment Record Generation', 'event_espresso' );
+		$this->_pretty_name = __('Registration Payment Record Generation', 'event_espresso');
 		// define tables
-		$this->_old_table 									= $wpdb->prefix . 'esp_transaction';
-		$this->_payment_table 						= $wpdb->prefix . 'esp_payment';
-		$this->_registration_table 					= $wpdb->prefix . 'esp_registration';
-		$this->_registration_payment_table 	= $wpdb->prefix . 'esp_registration_payment';
+		$this->_old_table = $wpdb->prefix.'esp_transaction';
+		$this->_payment_table = $wpdb->prefix.'esp_payment';
+		$this->_registration_table = $wpdb->prefix.'esp_registration';
+		$this->_registration_payment_table = $wpdb->prefix.'esp_registration_payment';
 		// build SQL WHERE clauses
 		$this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
 		parent::__construct();
@@ -40,14 +40,14 @@ 
 	 * @param array $transaction
 	 * @return void
 	 */
-	protected function _migrate_old_row( $transaction ) {
+	protected function _migrate_old_row($transaction) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$TXN_ID = absint( $transaction[ 'TXN_ID' ] );
-		if ( ! $TXN_ID ) {
+		$TXN_ID = absint($transaction['TXN_ID']);
+		if ( ! $TXN_ID) {
 			$this->add_error(
 				sprintf(
-					__( 'Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso' ),
+					__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
 					$TXN_ID,
 					$wpdb->last_error
 				)
@@ -55,19 +55,19 @@ 
 			return;
 		}
 		// get all payments for the TXN
-		$payments = $this->_get_payments( $TXN_ID );
-		if ( empty( $payments ) ) {
+		$payments = $this->_get_payments($TXN_ID);
+		if (empty($payments)) {
 			return;
 		}
 		// then the registrants
-		$registrations = $this->_get_registrations( $TXN_ID );
-		if ( empty( $registrations ) ) {
+		$registrations = $this->_get_registrations($TXN_ID);
+		if (empty($registrations)) {
 			return;
 		}
 		// now loop thru each payment and apply it to each of the registrations
-		foreach ( $payments as $PAY_ID => $payment ) {
-			if ( $payment->STS_ID === 'PAP' && $payment->PAY_amount > 0 ) {
-				$this->_process_registration_payments( $payment, $registrations );
+		foreach ($payments as $PAY_ID => $payment) {
+			if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
+				$this->_process_registration_payments($payment, $registrations);
 			}
 		}
 	}
@@ -80,11 +80,11 @@ 
 	 * @param int $TXN_ID
 	 * @return array
 	 */
-	protected function _get_registrations( $TXN_ID ) {
+	protected function _get_registrations($TXN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
-		return $wpdb->get_results( $wpdb->prepare( $SQL, $TXN_ID ), OBJECT_K );
+		return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
 	}
 
 
@@ -95,10 +95,10 @@ 
 	 * @param int $TXN_ID
 	 * @return array
 	 */
-	protected function _get_payments( $TXN_ID ) {
+	protected function _get_payments($TXN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID ), OBJECT_K );
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
 	}
 
 
@@ -109,10 +109,10 @@ 
 	 * @param int $REG_ID
 	 * @return array
 	 */
-	protected function _get_possibly_updated_REG_paid( $REG_ID ) {
+	protected function _get_possibly_updated_REG_paid($REG_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
 	}
 
 
@@ -127,40 +127,40 @@ 
 	 * @param array $registrations
 	 * @return bool
 	 */
-	protected function _process_registration_payments( $payment, $registrations = array() ){
+	protected function _process_registration_payments($payment, $registrations = array()) {
 		// how much is available to apply to registrations?
 		$available_payment_amount = $payment->PAY_amount;
-		foreach ( $registrations as $REG_ID => $registration ) {
+		foreach ($registrations as $REG_ID => $registration) {
 			// nothing left, then we are done here?
-			if ( ! $available_payment_amount > 0 ) {
+			if ( ! $available_payment_amount > 0) {
 				break;
 			}
 			// ensure REG_final_price has a valid value, and skip if it turns out to be zero
-			$registration->REG_final_price = ! empty( $registration->REG_final_price ) ? (float)$registration->REG_final_price : 0.00;
-			if ( ! $registration->REG_final_price > 0 ) {
+			$registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
+			if ( ! $registration->REG_final_price > 0) {
 				continue;
 			}
 			// because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
-			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid( $REG_ID );
-			if ( is_float( $possibly_updated_REG_paid ) ) {
+			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
+			if (is_float($possibly_updated_REG_paid)) {
 				$registration->REG_paid = $possibly_updated_REG_paid;
 			}
 			// and ensure REG_paid has a valid value
-			$registration->REG_paid = ! empty( $registration->REG_paid ) ? (float)$registration->REG_paid : 0.00;
+			$registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
 			// calculate amount owing, and skip if it turns out to be zero
 			$owing = $registration->REG_final_price - $registration->REG_paid;
-			if ( ! $owing > 0 ) {
+			if ( ! $owing > 0) {
 				continue;
 			}
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount = $available_payment_amount - $payment_amount;
 			// add relation between registration and payment and set amount
-			if ( $this->_insert_registration_payment( $registration->REG_ID, $payment->PAY_ID, $payment_amount )) {
+			if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
 				//calculate and set new REG_paid
 				$registration->REG_paid = $registration->REG_paid + $payment_amount;
-				$this->_update_registration_paid( $registration->REG_ID, $registration->REG_paid );
+				$this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
 			}
 		}
 	}
@@ -175,18 +175,18 @@ 
 	 * @param float $PAY_amount
 	 * @return bool
 	 */
-	protected function _insert_registration_payment( $REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00 ){
+	protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$success = $wpdb->insert(
 			$this->_registration_payment_table,
-			array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
-			array( '%f' )   // data format
+			array('REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount,), // data
+			array('%f')   // data format
 		);
-		if ( $success === false ) {
+		if ($success === false) {
 			$this->add_error(
 				sprintf(
-					__( 'Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
 					$REG_ID,
 					$wpdb->last_error
 				)
@@ -205,20 +205,20 @@ 
 	 * @param float $REG_paid
 	 * @return bool
 	 */
-	protected function _update_registration_paid( $REG_ID = 0, $REG_paid = 0.00 ) {
+	protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$success = $wpdb->update(
 			$this->_registration_table,
-			array( 'REG_paid' => $REG_paid ),  // data
-			array( 'REG_ID' => $REG_ID ),  // where
-			array( '%f' ),   // data format
-			array( '%d' )  // where format
+			array('REG_paid' => $REG_paid), // data
+			array('REG_ID' => $REG_ID), // where
+			array('%f'), // data format
+			array('%d')  // where format
 		);
-		if ( $success === false ) {
+		if ($success === false) {
 			$this->add_error(
 				sprintf(
-					__( 'Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
 					$REG_ID,
 					$wpdb->last_error
 				)

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 * just checks the field isn't blank
 	 *
 	 * @param $normalized_value
-	 * @return bool
+	 * @return boolean|null
 	 * @throws \EE_Validation_Error
 	 */
 	function validate($normalized_value) {

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_pretax_totals.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  *
  * Migrates line items that used to have LIN_code="tickets" to "pre-tax-total"
  */
-class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage {
 
 	protected $_line_item_table_name;
 
@@ -53,10 +53,10 @@ 
 		global $wpdb;
 		$rows_updated = $wpdb->update(
 				$this->_line_item_table_name,
-				array( 'LIN_code' => 'pre-tax-subtotal' ),
-				array( 'LIN_code' => 'tickets' ),
-				array( '%s' ),
-				array( '%s' ) );
+				array('LIN_code' => 'pre-tax-subtotal'),
+				array('LIN_code' => 'tickets'),
+				array('%s'),
+				array('%s') );
 		$this->set_completed();
 		return 1;
 	}

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 +80 added lines, -80 removed lines

@@ -16,13 +16,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);
 
 
@@ -38,7 +38,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
@@ -46,14 +46,14 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.8.0.P (for promotions)", "event_espresso");
 		$this->_priority = 10;
 		$this->_migration_stages = array(
 			new EE_DMS_4_8_0_pretax_totals(),
 			new EE_DMS_4_8_0_event_subtotals(),
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -68,14 +68,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if ( version_compare( $version_string, '4.8.0', '<=' ) && version_compare( $version_string, '4.7.0', '>=' ) ) {
+		if (version_compare($version_string, '4.8.0', '<=') && version_compare($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;
 		}
@@ -96,19 +96,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,
@@ -148,7 +148,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,
@@ -158,7 +158,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';
@@ -188,7 +188,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 = "
@@ -207,41 +207,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,
@@ -254,8 +254,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 '',
@@ -274,7 +274,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,
@@ -313,7 +313,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,
@@ -322,7 +322,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';
@@ -395,8 +395,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) NOT NULL DEFAULT "",
@@ -410,22 +410,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,
@@ -435,7 +435,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');
 
 
 
@@ -481,8 +481,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,
@@ -577,7 +577,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,
@@ -615,10 +615,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,
@@ -631,7 +631,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');
@@ -667,7 +667,7 @@ 
 		return $script_4_7_defaults->schema_changes_after_migration();
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -681,19 +681,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( 'ME', '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('ME', '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";
@@ -712,14 +712,14 @@ 
 							"CNT_is_EU" => '%d',
 							"CNT_active" => '%d',
 						);
-		if ( $this->_get_table_analysis()->tableExists( $country_table ) ) {
-			foreach( $newer_countries as $country ) {
-				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1" ;
+		if ($this->_get_table_analysis()->tableExists($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
 							);
 				}
@@ -737,7 +737,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";
@@ -749,14 +749,14 @@ 
 							"CUR_dec_plc" => '%d',
 							"CUR_active" => '%d',
 						);
-		if ( $this->_get_table_analysis()->tableExists( $currency_table ) ) {
-			foreach( $newer_currencies as $currency ) {
-				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1" ;
+		if ($this->_get_table_analysis()->tableExists($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
 							);
 				}
@@ -768,9 +768,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
@@ -778,7 +778,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_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 +117 added lines, -117 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 use EventEspresso\core\services\database\TableManager;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -124,14 +124,14 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
-		$this->_migration_stages = (array) 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 ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
+		$this->_migration_stages = (array) 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);
 			}
 		}
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -140,7 +140,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
 	}
 
@@ -155,9 +155,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;
@@ -173,9 +173,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);
 		}
@@ -192,15 +192,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];
 			}
 		}
@@ -215,8 +215,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;
 	}
 
@@ -229,9 +229,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;
 	}
 
@@ -243,12 +243,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);
 	}
 
 
@@ -265,10 +265,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;
 	}
@@ -280,10 +280,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;
@@ -297,24 +297,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);
@@ -322,7 +322,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());
 				}
@@ -330,24 +330,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));
 		}
@@ -361,12 +361,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);
 	}
 
 
@@ -378,27 +378,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;
 			}
@@ -425,9 +425,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  );
 	}
 
@@ -441,9 +441,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  );
 	}
 
@@ -454,8 +454,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _old_table_exists( $table_name ) {
-		return $this->_get_table_analysis()->tableExists( $table_name );
+	protected function _old_table_exists($table_name) {
+		return $this->_get_table_analysis()->tableExists($table_name);
 	}
 
 
@@ -465,8 +465,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);
 	}
 
 
@@ -485,9 +485,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 );
 	}
 
@@ -502,13 +502,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));
 	}
 
 	/**
@@ -518,7 +518,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;
 	}
 
@@ -529,17 +529,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;
 			}
 		}
@@ -552,12 +552,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;
 		}
 	}
@@ -569,15 +569,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()))));
 			}
 		}
 	}
@@ -588,13 +588,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;
 	}
@@ -605,8 +605,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);
 	}
 
 
@@ -618,8 +618,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;
 	}
@@ -631,7 +631,7 @@ 
 	 * can be displayed to the user
 	 * @return string
 	 */
-	public function get_feedback_message(){
+	public function get_feedback_message() {
 		return $this->_feedback_message;
 	}
 
@@ -643,16 +643,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);
 			}
 		}
@@ -667,19 +667,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);
 			}
 		}
@@ -695,9 +695,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;
 			}
 		}
@@ -713,8 +713,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));
 	}
 
 
@@ -726,10 +726,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'];
 	}
 
 
@@ -743,7 +743,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;
 	}
 
@@ -756,18 +756,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();
 			}
 		}