eventespresso / event-espresso-core

core/data_migration_scripts/EE_Data_Migration_Class_Base.core.php

Spacing +4 added lines, -4 removed lines

@@ -185,7 +185,7 @@ 
      */
     public function add_error($error, $force = false)
     {
-        if (! defined('EE_DMS_ERROR_LIMIT')) {
+        if ( ! defined('EE_DMS_ERROR_LIMIT')) {
             $limit = 50;
         } else {
             $limit = EE_DMS_ERROR_LIMIT;
@@ -201,7 +201,7 @@ 
                 $this->_errors[] = "Limit reached; removed first half of errors to save space";
                 $this->_errors[] = $error;
             } else {
-                $this->_errors[ $limit ] = 'More, but limit reached...';
+                $this->_errors[$limit] = 'More, but limit reached...';
             }
         } else {
             $this->_errors[] = $error;
@@ -345,7 +345,7 @@ 
         $new_columns_and_values_for_string = array();
         $count = 0;
         foreach ($new_row_as_array as $column => $value) {
-            $new_columns_and_values_for_string[] = " $column => $value (" . $data_types[ $count++ ] . ")";
+            $new_columns_and_values_for_string[] = " $column => $value (".$data_types[$count++].")";
         }
         return sprintf(
             esc_html__(
@@ -376,7 +376,7 @@ 
         foreach ($array_of_data as $name => $value) {
             $unserialized_data = @unserialize($value);
             if ($unserialized_data === false) {
-                $fields_to_include[ $name ] = $value;
+                $fields_to_include[$name] = $value;
             }
         }
         return wp_json_encode($fields_to_include);

Indentation +404 added lines, -404 removed lines

@@ -16,408 +16,408 @@
  */
 abstract class EE_Data_Migration_Class_Base
 {
-    /**
-     * @var $records_to_migrate int count of all that have been migrated
-     */
-    protected $_records_to_migrate = 0;
-
-    /**
-     *
-     * @var $records_migrated int
-     */
-    protected $_records_migrated = 0;
-
-    /**
-     * Whether this migration script is done or not. This COULD be deduced by
-     * _records_to_migrate and _records_migrated, but that might nto be accurate
-     *
-     * @var string one of EE_Data_migration_Manager::status_* constants
-     */
-    protected $_status = null;
-
-    /**
-     * internationalized name of this class. Convention is to NOT restate that
-     * this class if a migration script or a migration script stage
-     *
-     * @var string (i18ned)
-     */
-    protected $_pretty_name = null;
-
-    /**
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * @var \EventEspresso\core\services\database\TableManager $table_manager
-     */
-    protected $_table_manager;
-
-    /**
-     * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * Just initializes the status of the migration
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_table_manager = $table_manager;
-        $this->_table_analysis = $table_analysis;
-        $this->set_status(EE_Data_Migration_Manager::status_continue);
-    }
-
-
-    /**
-     * Just gets the pretty name for this migration script or stage
-     *
-     * @throws EE_Error
-     * @return string
-     */
-    public function pretty_name()
-    {
-        if ($this->_pretty_name === null) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        "Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor",
-                        "event_espresso"
-                    ),
-                    get_class($this)
-                )
-            );
-        }
-        return $this->_pretty_name;
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public function count_records_to_migrate()
-    {
-        if ($this->_records_to_migrate == null) {
-            $this->_records_to_migrate = $this->_count_records_to_migrate();
-        }
-        return $this->_records_to_migrate;
-    }
-
-    /**
-     * Counts records already migrated. This should only be implemented by EE_Data_Migration_Script_base and
-     * EE_Data_migration_Script_Stage
-     *
-     * @return int
-     */
-    abstract public function count_records_migrated();
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @return int
-     */
-    abstract protected function _count_records_to_migrate();
-
-    /**
-     * Returns a string indicating the migration script's status.
-     *
-     * @return string one of EE_Data_Migration_Manager::status_* constants
-     * @throws EE_Error
-     */
-    public function get_status()
-    {
-        if ($this->_status === null) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        "Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.",
-                        "event_espresso"
-                    ),
-                    get_class($this)
-                )
-            );
-        }
-        return $this->_status;
-    }
-
-    /**
-     *
-     * @param string $status
-     * @return void
-     */
-    protected function set_status($status)
-    {
-        $this->_status = $status;
-    }
-
-    /**
-     * @return array of strings
-     */
-    abstract public function get_errors();
-
-    /**
-     * Returns the last error that occurred. If none occurred, returns null
-     *
-     * @return string
-     */
-    public function get_last_error()
-    {
-        $errors = $this->get_errors();
-        if ($errors) {
-            return end($errors);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Adds an error to the array of errors on this class.
-     *
-     * @param string  $error a string describing the error that will be useful for debugging. Consider including all
-     *                       the data that led to the error, and a stack trace etc.
-     * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are
-     *                       already at their limit, we will purposefully forget the first half
-     */
-    public function add_error($error, $force = false)
-    {
-        if (! defined('EE_DMS_ERROR_LIMIT')) {
-            $limit = 50;
-        } else {
-            $limit = EE_DMS_ERROR_LIMIT;
-        }
-        // make sure errors is an array, see ticket #8261
-        if (is_string($this->_errors)) {
-            $this->_errors = array($this->_errors);
-        }
-        if (count($this->_errors) >= $limit) {
-            if ($force) {
-                // get rid of the first half of the errors and any above the limit
-                $this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
-                $this->_errors[] = "Limit reached; removed first half of errors to save space";
-                $this->_errors[] = $error;
-            } else {
-                $this->_errors[ $limit ] = 'More, but limit reached...';
-            }
-        } else {
-            $this->_errors[] = $error;
-        }
-    }
-
-    /**
-     * Indicates there was a fatal error and the migration cannot possibly continue
-     *
-     * @return boolean
-     */
-    public function is_broken()
-    {
-        return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
-    }
-
-    /**
-     * @deprecated since 4.6.12
-     */
-    public function is_borked()
-    {
-        EE_Error::doing_it_wrong(
-            'is_borked',
-            esc_html__(
-                'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
-                'event_espresso'
-            ),
-            '4.6.12'
-        );
-        return $this->is_broken();
-    }
-
-    /**
-     * Sets the status to as having a fatal error
-     */
-    public function set_broken()
-    {
-        $this->_status = EE_Data_Migration_Manager::status_fatal_error;
-    }
-
-    /**
-     *
-     * @deprecated since 4.6.12
-     */
-    public function set_borked()
-    {
-        EE_Error::doing_it_wrong(
-            'is_borked',
-            esc_html__(
-                'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
-                'event_espresso'
-            ),
-            '4.6.12'
-        );
-        return $this->set_broken();
-    }
-
-    /**
-     * Checks if this thing believes it is completed
-     *
-     * @return boolean
-     */
-    public function is_completed()
-    {
-        return $this->get_status() == EE_Data_Migration_Manager::status_completed;
-    }
-
-    /**
-     * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
-     *
-     * @return boolean
-     */
-    public function has_more_to_do()
-    {
-        return $this->get_status() == EE_Data_Migration_Manager::status_continue;
-    }
-
-    /**
-     * Marks that we believe this migration thing is completed
-     */
-    public function set_completed()
-    {
-        $this->_status = EE_Data_Migration_Manager::status_completed;
-    }
-
-    /**
-     * Marks that we think this migration class can continue to migrate
-     */
-    public function reattempt()
-    {
-        $this->_status = EE_Data_Migration_Manager::status_continue;
-        $this->add_error(esc_html__('Reattempt migration', 'event_espresso'), true);
-    }
-
-    /**
-     * A lot like "__sleep()" magic method in purpose, this is meant for persisting this class'
-     * properties to the DB. However, we don't want to use __sleep() because its quite
-     * 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()
-    {
-        $properties = get_object_vars($this);
-        $properties['class'] = get_class($this);
-        unset($properties['_migration_script']);
-        unset($properties['_table_manager']);
-        unset($properties['_table_analysis']);
-        return $properties;
-    }
-
-    /**
-     * Sets all of the properties of this script stage to match what's in the array, which is assumed
-     * to have been made from the properties_as_array() function.
-     *
-     * @param array $array_of_properties like what's produced from properties_as_array() method
-     */
-    abstract public function instantiate_from_array_of_properties($array_of_properties);
-
-    /**
-     * Convenience method for showing a database insertion error
-     *
-     * @param string $old_table
-     * @param array  $old_row_as_array
-     * @param string $new_table
-     * @param array  $new_row_as_array columns=>values like used in wpdb->insert
-     * @param array  $data_types       numerically indexed
-     * @return string
-     */
-    protected function _create_error_message_for_db_insertion(
-        $old_table,
-        $old_row_as_array,
-        $new_table,
-        $new_row_as_array,
-        $data_types
-    ) {
-        global $wpdb;
-        $old_columns_and_values_for_string = array();
-        foreach ($old_row_as_array as $column => $value) {
-            $old_columns_and_values_for_string[] = "$column => $value";
-        }
-        $new_columns_and_values_for_string = array();
-        $count = 0;
-        foreach ($new_row_as_array as $column => $value) {
-            $new_columns_and_values_for_string[] = " $column => $value (" . $data_types[ $count++ ] . ")";
-        }
-        return sprintf(
-            esc_html__(
-                'Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4$s.',
-                'event_espresso'
-            ),
-            implode(", ", $new_columns_and_values_for_string),
-            $new_table,
-            implode(", ", $old_columns_and_values_for_string),
-            $old_table,
-            '<br/>',
-            $wpdb->last_error
-        );
-    }
-
-
-    /**
-     * Same as json_encode, just avoids putting
-     * serialized arrays into the http build query, as that would
-     *
-     * @param array $array_of_data
-     * @return string
-     */
-    protected function _json_encode($array_of_data)
-    {
-        // we'd rather NOT serialize the transaction details
-        $fields_to_include = array();
-        foreach ($array_of_data as $name => $value) {
-            $unserialized_data = @unserialize($value);
-            if ($unserialized_data === false) {
-                $fields_to_include[ $name ] = $value;
-            }
-        }
-        return wp_json_encode($fields_to_include);
-    }
-
-    /**
-     * Gets the table manager (or throws an exception if it cannot be retrieved)
-     *
-     * @return TableManager
-     * @throws EE_Error
-     */
-    protected function _get_table_manager()
-    {
-        if ($this->_table_manager instanceof TableManager) {
-            return $this->_table_manager;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__('Table manager on migration class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__('Table analysis class on migration class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
+	/**
+	 * @var $records_to_migrate int count of all that have been migrated
+	 */
+	protected $_records_to_migrate = 0;
+
+	/**
+	 *
+	 * @var $records_migrated int
+	 */
+	protected $_records_migrated = 0;
+
+	/**
+	 * Whether this migration script is done or not. This COULD be deduced by
+	 * _records_to_migrate and _records_migrated, but that might nto be accurate
+	 *
+	 * @var string one of EE_Data_migration_Manager::status_* constants
+	 */
+	protected $_status = null;
+
+	/**
+	 * internationalized name of this class. Convention is to NOT restate that
+	 * this class if a migration script or a migration script stage
+	 *
+	 * @var string (i18ned)
+	 */
+	protected $_pretty_name = null;
+
+	/**
+	 * @var array
+	 */
+	protected $_errors = array();
+
+	/**
+	 * @var \EventEspresso\core\services\database\TableManager $table_manager
+	 */
+	protected $_table_manager;
+
+	/**
+	 * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_table_manager = $table_manager;
+		$this->_table_analysis = $table_analysis;
+		$this->set_status(EE_Data_Migration_Manager::status_continue);
+	}
+
+
+	/**
+	 * Just gets the pretty name for this migration script or stage
+	 *
+	 * @throws EE_Error
+	 * @return string
+	 */
+	public function pretty_name()
+	{
+		if ($this->_pretty_name === null) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						"Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor",
+						"event_espresso"
+					),
+					get_class($this)
+				)
+			);
+		}
+		return $this->_pretty_name;
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public function count_records_to_migrate()
+	{
+		if ($this->_records_to_migrate == null) {
+			$this->_records_to_migrate = $this->_count_records_to_migrate();
+		}
+		return $this->_records_to_migrate;
+	}
+
+	/**
+	 * Counts records already migrated. This should only be implemented by EE_Data_Migration_Script_base and
+	 * EE_Data_migration_Script_Stage
+	 *
+	 * @return int
+	 */
+	abstract public function count_records_migrated();
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @return int
+	 */
+	abstract protected function _count_records_to_migrate();
+
+	/**
+	 * Returns a string indicating the migration script's status.
+	 *
+	 * @return string one of EE_Data_Migration_Manager::status_* constants
+	 * @throws EE_Error
+	 */
+	public function get_status()
+	{
+		if ($this->_status === null) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						"Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.",
+						"event_espresso"
+					),
+					get_class($this)
+				)
+			);
+		}
+		return $this->_status;
+	}
+
+	/**
+	 *
+	 * @param string $status
+	 * @return void
+	 */
+	protected function set_status($status)
+	{
+		$this->_status = $status;
+	}
+
+	/**
+	 * @return array of strings
+	 */
+	abstract public function get_errors();
+
+	/**
+	 * Returns the last error that occurred. If none occurred, returns null
+	 *
+	 * @return string
+	 */
+	public function get_last_error()
+	{
+		$errors = $this->get_errors();
+		if ($errors) {
+			return end($errors);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Adds an error to the array of errors on this class.
+	 *
+	 * @param string  $error a string describing the error that will be useful for debugging. Consider including all
+	 *                       the data that led to the error, and a stack trace etc.
+	 * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are
+	 *                       already at their limit, we will purposefully forget the first half
+	 */
+	public function add_error($error, $force = false)
+	{
+		if (! defined('EE_DMS_ERROR_LIMIT')) {
+			$limit = 50;
+		} else {
+			$limit = EE_DMS_ERROR_LIMIT;
+		}
+		// make sure errors is an array, see ticket #8261
+		if (is_string($this->_errors)) {
+			$this->_errors = array($this->_errors);
+		}
+		if (count($this->_errors) >= $limit) {
+			if ($force) {
+				// get rid of the first half of the errors and any above the limit
+				$this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
+				$this->_errors[] = "Limit reached; removed first half of errors to save space";
+				$this->_errors[] = $error;
+			} else {
+				$this->_errors[ $limit ] = 'More, but limit reached...';
+			}
+		} else {
+			$this->_errors[] = $error;
+		}
+	}
+
+	/**
+	 * Indicates there was a fatal error and the migration cannot possibly continue
+	 *
+	 * @return boolean
+	 */
+	public function is_broken()
+	{
+		return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
+	}
+
+	/**
+	 * @deprecated since 4.6.12
+	 */
+	public function is_borked()
+	{
+		EE_Error::doing_it_wrong(
+			'is_borked',
+			esc_html__(
+				'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
+				'event_espresso'
+			),
+			'4.6.12'
+		);
+		return $this->is_broken();
+	}
+
+	/**
+	 * Sets the status to as having a fatal error
+	 */
+	public function set_broken()
+	{
+		$this->_status = EE_Data_Migration_Manager::status_fatal_error;
+	}
+
+	/**
+	 *
+	 * @deprecated since 4.6.12
+	 */
+	public function set_borked()
+	{
+		EE_Error::doing_it_wrong(
+			'is_borked',
+			esc_html__(
+				'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
+				'event_espresso'
+			),
+			'4.6.12'
+		);
+		return $this->set_broken();
+	}
+
+	/**
+	 * Checks if this thing believes it is completed
+	 *
+	 * @return boolean
+	 */
+	public function is_completed()
+	{
+		return $this->get_status() == EE_Data_Migration_Manager::status_completed;
+	}
+
+	/**
+	 * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
+	 *
+	 * @return boolean
+	 */
+	public function has_more_to_do()
+	{
+		return $this->get_status() == EE_Data_Migration_Manager::status_continue;
+	}
+
+	/**
+	 * Marks that we believe this migration thing is completed
+	 */
+	public function set_completed()
+	{
+		$this->_status = EE_Data_Migration_Manager::status_completed;
+	}
+
+	/**
+	 * Marks that we think this migration class can continue to migrate
+	 */
+	public function reattempt()
+	{
+		$this->_status = EE_Data_Migration_Manager::status_continue;
+		$this->add_error(esc_html__('Reattempt migration', 'event_espresso'), true);
+	}
+
+	/**
+	 * A lot like "__sleep()" magic method in purpose, this is meant for persisting this class'
+	 * properties to the DB. However, we don't want to use __sleep() because its quite
+	 * 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()
+	{
+		$properties = get_object_vars($this);
+		$properties['class'] = get_class($this);
+		unset($properties['_migration_script']);
+		unset($properties['_table_manager']);
+		unset($properties['_table_analysis']);
+		return $properties;
+	}
+
+	/**
+	 * Sets all of the properties of this script stage to match what's in the array, which is assumed
+	 * to have been made from the properties_as_array() function.
+	 *
+	 * @param array $array_of_properties like what's produced from properties_as_array() method
+	 */
+	abstract public function instantiate_from_array_of_properties($array_of_properties);
+
+	/**
+	 * Convenience method for showing a database insertion error
+	 *
+	 * @param string $old_table
+	 * @param array  $old_row_as_array
+	 * @param string $new_table
+	 * @param array  $new_row_as_array columns=>values like used in wpdb->insert
+	 * @param array  $data_types       numerically indexed
+	 * @return string
+	 */
+	protected function _create_error_message_for_db_insertion(
+		$old_table,
+		$old_row_as_array,
+		$new_table,
+		$new_row_as_array,
+		$data_types
+	) {
+		global $wpdb;
+		$old_columns_and_values_for_string = array();
+		foreach ($old_row_as_array as $column => $value) {
+			$old_columns_and_values_for_string[] = "$column => $value";
+		}
+		$new_columns_and_values_for_string = array();
+		$count = 0;
+		foreach ($new_row_as_array as $column => $value) {
+			$new_columns_and_values_for_string[] = " $column => $value (" . $data_types[ $count++ ] . ")";
+		}
+		return sprintf(
+			esc_html__(
+				'Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4$s.',
+				'event_espresso'
+			),
+			implode(", ", $new_columns_and_values_for_string),
+			$new_table,
+			implode(", ", $old_columns_and_values_for_string),
+			$old_table,
+			'<br/>',
+			$wpdb->last_error
+		);
+	}
+
+
+	/**
+	 * Same as json_encode, just avoids putting
+	 * serialized arrays into the http build query, as that would
+	 *
+	 * @param array $array_of_data
+	 * @return string
+	 */
+	protected function _json_encode($array_of_data)
+	{
+		// we'd rather NOT serialize the transaction details
+		$fields_to_include = array();
+		foreach ($array_of_data as $name => $value) {
+			$unserialized_data = @unserialize($value);
+			if ($unserialized_data === false) {
+				$fields_to_include[ $name ] = $value;
+			}
+		}
+		return wp_json_encode($fields_to_include);
+	}
+
+	/**
+	 * Gets the table manager (or throws an exception if it cannot be retrieved)
+	 *
+	 * @return TableManager
+	 * @throws EE_Error
+	 */
+	protected function _get_table_manager()
+	{
+		if ($this->_table_manager instanceof TableManager) {
+			return $this->_table_manager;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					esc_html__('Table manager on migration class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					esc_html__('Table analysis class on migration class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
 }

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

Spacing +7 added lines, -7 removed lines

@@ -24,8 +24,8 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__('Event Message Templates', 'event_espresso');
-        $this->_old_table = $wpdb->prefix . "esp_message_template_group";
-        $this->_emt_table = $wpdb->prefix . "esp_event_message_template";
+        $this->_old_table = $wpdb->prefix."esp_message_template_group";
+        $this->_emt_table = $wpdb->prefix."esp_event_message_template";
         parent::__construct();
     }
 
@@ -37,7 +37,7 @@ 
         global $wpdb;
         if ($old_row['EVT_ID'] > 0) {
                                     // let's get the EVT for this id so we can update the custom name on the old row.
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
+                                    $event_name = 'Custom Template for '.$wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
 
                                     // update name
                                     $updated = $wpdb->update(
@@ -45,9 +45,9 @@ 
                                         array(
                                             'MTP_name' => $event_name
                                             ),
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
-                                        array( '%s' ),
-                                        array( '%d' )
+                                        array('GRP_ID' => (int) $old_row['GRP_ID']),
+                                        array('%s'),
+                                        array('%d')
                                     );
 
             $inserted = $wpdb->insert(
@@ -56,7 +56,7 @@ 
                     'EVT_ID' => (int) $old_row['EVT_ID'],
                     'GRP_ID' => (int) $old_row['GRP_ID'],
                     ),
-                array( '%d', '%d' )
+                array('%d', '%d')
             );
 
             if (false === $updated) {

Indentation +46 added lines, -46 removed lines

@@ -12,59 +12,59 @@
  */
 class EE_DMS_4_3_0_event_message_templates extends EE_Data_Migration_Script_Stage_Table
 {
-    /**
-     * This property will hold the table name for event_message_templates
-     * @var string
-     */
-    private $_emt_table;
+	/**
+	 * This property will hold the table name for event_message_templates
+	 * @var string
+	 */
+	private $_emt_table;
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Event Message Templates', 'event_espresso');
-        $this->_old_table = $wpdb->prefix . "esp_message_template_group";
-        $this->_emt_table = $wpdb->prefix . "esp_event_message_template";
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Event Message Templates', 'event_espresso');
+		$this->_old_table = $wpdb->prefix . "esp_message_template_group";
+		$this->_emt_table = $wpdb->prefix . "esp_event_message_template";
+		parent::__construct();
+	}
 
 
 
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
-        global $wpdb;
-        if ($old_row['EVT_ID'] > 0) {
-                                    // let's get the EVT for this id so we can update the custom name on the old row.
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
+		global $wpdb;
+		if ($old_row['EVT_ID'] > 0) {
+									// let's get the EVT for this id so we can update the custom name on the old row.
+									$event_name = 'Custom Template for ' . $wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
 
-                                    // update name
-                                    $updated = $wpdb->update(
-                                        $this->_old_table,
-                                        array(
-                                            'MTP_name' => $event_name
-                                            ),
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
-                                        array( '%s' ),
-                                        array( '%d' )
-                                    );
+									// update name
+									$updated = $wpdb->update(
+										$this->_old_table,
+										array(
+											'MTP_name' => $event_name
+											),
+										array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
+										array( '%s' ),
+										array( '%d' )
+									);
 
-            $inserted = $wpdb->insert(
-                $this->_emt_table,
-                array(
-                    'EVT_ID' => (int) $old_row['EVT_ID'],
-                    'GRP_ID' => (int) $old_row['GRP_ID'],
-                    ),
-                array( '%d', '%d' )
-            );
+			$inserted = $wpdb->insert(
+				$this->_emt_table,
+				array(
+					'EVT_ID' => (int) $old_row['EVT_ID'],
+					'GRP_ID' => (int) $old_row['GRP_ID'],
+					),
+				array( '%d', '%d' )
+			);
 
-            if (false === $updated) {
-                $this->add_error(sprintf(esc_html__("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name));
-            }
+			if (false === $updated) {
+				$this->add_error(sprintf(esc_html__("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name));
+			}
 
-            if (false === $inserted) {
-                $this->add_error(sprintf(esc_html__("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID']));
-            }
-        }
-    }
+			if (false === $inserted) {
+				$this->add_error(sprintf(esc_html__("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID']));
+			}
+		}
+	}
 }

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

Indentation +35 added lines, -35 removed lines

@@ -7,39 +7,39 @@
 
 class EE_DMS_4_3_0_question_option_order extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Question Options", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "esp_question_option";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach question_group_question entry with this QST_ID, we want to set its
-        // QSG_order equal to this question's QST_order
-        global $wpdb;
-        $updated = $wpdb->update(
-            $this->_old_table,
-            array('QSO_order' => $old_row['QSO_ID']),
-            array('QSO_ID' => $old_row['QSO_ID']),
-            array('%d',// QSO_order
-                    ),
-            array('%d',// QSO_ID
-                    )
-        );
-        if (false === $updated) {
-            $this->add_error(
-                sprintf(
-                    esc_html__(
-                        "Error in updating table %s setting QSO_order = %d where QSO_ID = %d",
-                        'event_espresso'
-                    ),
-                    $this->_old_table,
-                    $old_row['QSO_ID'],
-                    $old_row['QSO_ID']
-                )
-            );
-        }
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Question Options", "event_espresso");
+		$this->_old_table = $wpdb->prefix . "esp_question_option";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach question_group_question entry with this QST_ID, we want to set its
+		// QSG_order equal to this question's QST_order
+		global $wpdb;
+		$updated = $wpdb->update(
+			$this->_old_table,
+			array('QSO_order' => $old_row['QSO_ID']),
+			array('QSO_ID' => $old_row['QSO_ID']),
+			array('%d',// QSO_order
+					),
+			array('%d',// QSO_ID
+					)
+		);
+		if (false === $updated) {
+			$this->add_error(
+				sprintf(
+					esc_html__(
+						"Error in updating table %s setting QSO_order = %d where QSO_ID = %d",
+						'event_espresso'
+					),
+					$this->_old_table,
+					$old_row['QSO_ID'],
+					$old_row['QSO_ID']
+				)
+			);
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__("Question Options", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "esp_question_option";
+        $this->_old_table = $wpdb->prefix."esp_question_option";
         parent::__construct();
     }
     protected function _migrate_old_row($old_row)
@@ -23,9 +23,9 @@ 
             $this->_old_table,
             array('QSO_order' => $old_row['QSO_ID']),
             array('QSO_ID' => $old_row['QSO_ID']),
-            array('%d',// QSO_order
+            array('%d', // QSO_order
                     ),
-            array('%d',// QSO_ID
+            array('%d', // QSO_ID
                     )
         );
         if (false === $updated) {

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

Indentation +73 added lines, -73 removed lines

@@ -11,77 +11,77 @@
  */
 class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_line_item';
-        $this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
-        $this->_pretty_name = esc_html__('Event Sub-total line items', 'event_espresso');
-        parent::__construct();
-    }
-    protected function _migrate_old_row($line_item_row)
-    {
-        global $wpdb;
-        // what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-        $event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
-        $new_line_item_data = array(
-                    'LIN_code' => 'event-' . $event_id,
-                    'TXN_ID' => $line_item_row['TXN_ID'],
-                    'LIN_name' => esc_html__('Event', 'event_espresso'),
-                    'LIN_desc' => $line_item_row['LIN_desc'],
-                    'LIN_unit_price' => $line_item_row['LIN_unit_price'],
-                    'LIN_percent' => $line_item_row['LIN_percent'],
-                    'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
-                    'LIN_order' => $line_item_row['LIN_order'],
-                    'LIN_total' => $line_item_row['LIN_total'],
-                    'LIN_quantity' => $line_item_row['LIN_quantity'],
-                    'LIN_parent' => $line_item_row['LIN_ID'],
-                    'LIN_type' => 'sub-total',
-                    'OBJ_type' => 'Event',
-                    'OBJ_ID' => $event_id,
-                );
-        $new_line_item_datatypes = array(
-                    '%s',// LIN_code
-                    '%d',// TXN_ID
-                    '%s',// LIN_name
-                    '%s',// LIN_desc
-                    '%f',// LIN_unit_price
-                    '%f',// LIN_percent
-                    '%d',// LIN_is_taxable
-                    '%d',// LIN_order
-                    '%f',// LIN_total
-                    '%d',// LIN_quantity
-                    '%d',// LIN_parent
-                    '%s',// LIN_type
-                    '%s',// OBJ_type
-                    '%d',// OBJ_ID
-                );
-        // insert the new event subtotal line item, pointing to this line item
-        $success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
-        if (! $success) {
-            $this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
-        }
-        $new_line_item_id = $wpdb->insert_id;
-        $this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
-        $query = $wpdb->prepare(
-            "UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
-            $new_line_item_id,
-            $line_item_row['LIN_ID'],
-            $new_line_item_id
-        );
-        $success = $wpdb->query($query);
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
-                    $new_line_item_id,
-                    $line_item_row['LIN_ID'],
-                    $wpdb->last_error,
-                    $query,
-                    $success
-                )
-            );
-        }
-        return 1;
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . 'esp_line_item';
+		$this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
+		$this->_pretty_name = esc_html__('Event Sub-total line items', 'event_espresso');
+		parent::__construct();
+	}
+	protected function _migrate_old_row($line_item_row)
+	{
+		global $wpdb;
+		// what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
+		$event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
+		$new_line_item_data = array(
+					'LIN_code' => 'event-' . $event_id,
+					'TXN_ID' => $line_item_row['TXN_ID'],
+					'LIN_name' => esc_html__('Event', 'event_espresso'),
+					'LIN_desc' => $line_item_row['LIN_desc'],
+					'LIN_unit_price' => $line_item_row['LIN_unit_price'],
+					'LIN_percent' => $line_item_row['LIN_percent'],
+					'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
+					'LIN_order' => $line_item_row['LIN_order'],
+					'LIN_total' => $line_item_row['LIN_total'],
+					'LIN_quantity' => $line_item_row['LIN_quantity'],
+					'LIN_parent' => $line_item_row['LIN_ID'],
+					'LIN_type' => 'sub-total',
+					'OBJ_type' => 'Event',
+					'OBJ_ID' => $event_id,
+				);
+		$new_line_item_datatypes = array(
+					'%s',// LIN_code
+					'%d',// TXN_ID
+					'%s',// LIN_name
+					'%s',// LIN_desc
+					'%f',// LIN_unit_price
+					'%f',// LIN_percent
+					'%d',// LIN_is_taxable
+					'%d',// LIN_order
+					'%f',// LIN_total
+					'%d',// LIN_quantity
+					'%d',// LIN_parent
+					'%s',// LIN_type
+					'%s',// OBJ_type
+					'%d',// OBJ_ID
+				);
+		// insert the new event subtotal line item, pointing to this line item
+		$success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
+		if (! $success) {
+			$this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
+		}
+		$new_line_item_id = $wpdb->insert_id;
+		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
+		$query = $wpdb->prepare(
+			"UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
+			$new_line_item_id,
+			$line_item_row['LIN_ID'],
+			$new_line_item_id
+		);
+		$success = $wpdb->query($query);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
+					$new_line_item_id,
+					$line_item_row['LIN_ID'],
+					$wpdb->last_error,
+					$query,
+					$success
+				)
+			);
+		}
+		return 1;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_line_item';
+        $this->_old_table = $wpdb->prefix.'esp_line_item';
         $this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
         $this->_pretty_name = esc_html__('Event Sub-total line items', 'event_espresso');
         parent::__construct();
@@ -23,9 +23,9 @@ 
     {
         global $wpdb;
         // what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-        $event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
+        $event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM '.$wpdb->prefix.'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
         $new_line_item_data = array(
-                    'LIN_code' => 'event-' . $event_id,
+                    'LIN_code' => 'event-'.$event_id,
                     'TXN_ID' => $line_item_row['TXN_ID'],
                     'LIN_name' => esc_html__('Event', 'event_espresso'),
                     'LIN_desc' => $line_item_row['LIN_desc'],
@@ -41,24 +41,24 @@ 
                     'OBJ_ID' => $event_id,
                 );
         $new_line_item_datatypes = array(
-                    '%s',// LIN_code
-                    '%d',// TXN_ID
-                    '%s',// LIN_name
-                    '%s',// LIN_desc
-                    '%f',// LIN_unit_price
-                    '%f',// LIN_percent
-                    '%d',// LIN_is_taxable
-                    '%d',// LIN_order
-                    '%f',// LIN_total
-                    '%d',// LIN_quantity
-                    '%d',// LIN_parent
-                    '%s',// LIN_type
-                    '%s',// OBJ_type
-                    '%d',// OBJ_ID
+                    '%s', // LIN_code
+                    '%d', // TXN_ID
+                    '%s', // LIN_name
+                    '%s', // LIN_desc
+                    '%f', // LIN_unit_price
+                    '%f', // LIN_percent
+                    '%d', // LIN_is_taxable
+                    '%d', // LIN_order
+                    '%f', // LIN_total
+                    '%d', // LIN_quantity
+                    '%d', // LIN_parent
+                    '%s', // LIN_type
+                    '%s', // OBJ_type
+                    '%d', // OBJ_ID
                 );
         // insert the new event subtotal line item, pointing to this line item
         $success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
         }
         $new_line_item_id = $wpdb->insert_id;

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

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_line_item_table_name = $wpdb->prefix . "esp_line_item";
+        $this->_line_item_table_name = $wpdb->prefix."esp_line_item";
         $this->_pretty_name = esc_html__('Pre-tax total line items', 'event_espresso');
         parent::__construct();
     }
@@ -54,10 +54,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;

Indentation +41 added lines, -41 removed lines

@@ -12,53 +12,53 @@
  */
 class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage
 {
-    protected $_line_item_table_name;
+	protected $_line_item_table_name;
 
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_line_item_table_name = $wpdb->prefix . "esp_line_item";
-        $this->_pretty_name = esc_html__('Pre-tax total line items', 'event_espresso');
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_line_item_table_name = $wpdb->prefix . "esp_line_item";
+		$this->_pretty_name = esc_html__('Pre-tax total line items', 'event_espresso');
+		parent::__construct();
+	}
 
 
 
-    /**
-     * Counts the records to migrate; the public version may cache it
-     * @return int
-     */
-    protected function _count_records_to_migrate()
-    {
-        return 1;
-    }
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 * @return int
+	 */
+	protected function _count_records_to_migrate()
+	{
+		return 1;
+	}
 
 
 
-    /**
-     * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property accordingly.
-     * Note: it should not alter the count of items migrated. That is done in the public function that calls this.
-     * IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the last migration step, otherwise it
-     * should always return $num_items_to_migrate. (Eg, if we're migrating attendees rows from the database, and $num_items_to_migrate is set to 50,
-     * then we SHOULD actually migrate 50 rows,but at very least we MUST report/return 50 items migrated)
-     * @param int $num_items_to_migrate
-     * @return int number of items ACTUALLY migrated
-     */
-    protected function _migration_step($num_items_to_migrate = 50)
-    {
-        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' )
-        );
-        $this->set_completed();
-        return 1;
-    }
+	/**
+	 * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property accordingly.
+	 * Note: it should not alter the count of items migrated. That is done in the public function that calls this.
+	 * IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the last migration step, otherwise it
+	 * should always return $num_items_to_migrate. (Eg, if we're migrating attendees rows from the database, and $num_items_to_migrate is set to 50,
+	 * then we SHOULD actually migrate 50 rows,but at very least we MUST report/return 50 items migrated)
+	 * @param int $num_items_to_migrate
+	 * @return int number of items ACTUALLY migrated
+	 */
+	protected function _migration_step($num_items_to_migrate = 50)
+	{
+		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' )
+		);
+		$this->set_completed();
+		return 1;
+	}
 }

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

Indentation +104 added lines, -106 removed lines

@@ -16,15 +16,13 @@ 
             'EQG_primary'=>new EE_Boolean_Field('EQG_primary', esc_html__('Flag indicating question is only for primary attendees','event_espresso'), false, false)
         )
     );
-
-
  *
  */
 class EE_DMS_4_1_0_event_question_group extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_table;
-    public function _migrate_old_row($old_row)
-    {
+	private $_new_table;
+	public function _migrate_old_row($old_row)
+	{
 //      $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
 //          if ( ! $txn_id ){
 //              $this->add_error(sprintf(esc_html__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"),$old_row['id'],$this->_json_encode($old_row)));
@@ -34,8 +32,8 @@ 
 //          $new_line_items = $this->_insert_new_line_items($txn,$old_row);
 //          $this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_line_table,$new_line_items);
 
-            $this->_insert_new_event_question_groups($old_row);
-    }
+			$this->_insert_new_event_question_groups($old_row);
+	}
 //  function _migration_step($num_items=50){
 //      global $wpdb;
 //      $start_at_record = $this->count_records_migrated();
@@ -55,109 +53,109 @@ 
 //      $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
 //      return $count;
 //  }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_detail";
-        $this->_extra_where_sql = 'WHERE event_status!="D"';
-        $this->_new_table = $wpdb->prefix . "esp_event_question_group";
-        $this->_pretty_name = esc_html__("Question Groups in each Event", "event_espresso");
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_detail";
+		$this->_extra_where_sql = 'WHERE event_status!="D"';
+		$this->_new_table = $wpdb->prefix . "esp_event_question_group";
+		$this->_pretty_name = esc_html__("Question Groups in each Event", "event_espresso");
+		parent::__construct();
+	}
 
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_event
-     * @return void
-     */
-    private function _insert_new_event_question_groups($old_event)
-    {
-        $new_event_question_group_ids = array();
-        $question_groups_for_primary = maybe_unserialize($old_event['question_groups']);
-        if (is_array($question_groups_for_primary)) {
-            foreach ($question_groups_for_primary as $old_question_group_id) {
-                $new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, true);
-                if ($new_id) {
-                    $new_event_question_group_ids[] = $new_id;
-                }
-            }
-        }
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (isset($event_meta['add_attendee_question_groups'])) {
-            if (is_array($event_meta['add_attendee_question_groups'])) {
-                foreach ($event_meta['add_attendee_question_groups'] as $old_question_group_id) {
-                    $new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, false);
-                    if ($new_id) {
-                        $new_event_question_group_ids[] = $new_id;
-                    }
-                }
-            }
-        }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_event
+	 * @return void
+	 */
+	private function _insert_new_event_question_groups($old_event)
+	{
+		$new_event_question_group_ids = array();
+		$question_groups_for_primary = maybe_unserialize($old_event['question_groups']);
+		if (is_array($question_groups_for_primary)) {
+			foreach ($question_groups_for_primary as $old_question_group_id) {
+				$new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, true);
+				if ($new_id) {
+					$new_event_question_group_ids[] = $new_id;
+				}
+			}
+		}
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		if (isset($event_meta['add_attendee_question_groups'])) {
+			if (is_array($event_meta['add_attendee_question_groups'])) {
+				foreach ($event_meta['add_attendee_question_groups'] as $old_question_group_id) {
+					$new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, false);
+					if ($new_id) {
+						$new_event_question_group_ids[] = $new_id;
+					}
+				}
+			}
+		}
 
 
-        $this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
-    }
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
+	}
 
-    private function _insert_event_question_group($old_event, $old_question_group_id, $primary)
-    {
-        global $wpdb;
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_qst_group",
-            intval($old_question_group_id),
-            $wpdb->prefix . "esp_question_group"
-        );
+	private function _insert_event_question_group($old_event, $old_question_group_id, $primary)
+	{
+		global $wpdb;
+		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_qst_group",
+			intval($old_question_group_id),
+			$wpdb->prefix . "esp_question_group"
+		);
 
-        if (! $new_question_group_id) {
-            $this->add_error(
-                sprintf(
-                    // translators: %s question ID, %s event ID
-                    esc_html__("Could not find 4.1 question ID for 3.1 question id #%s on event $%s", "event_espresso"),
-                    $old_question_group_id,
-                    $old_event['id']
-                )
-            );
-            return 0;
-        }
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_detail",
-            intval($old_event['id']),
-            $wpdb->posts
-        );
-        if (! $new_question_group_id) {
-            $this->add_error(
-                sprintf(
-                    // translators: %s event ID
-                    esc_html__("Could not find 4.1 event 3.1 event id #%s", "event_espresso"),
-                    $old_event['id']
-                )
-            );
-            return 0;
-        }
-        $cols_n_values = array(
-            'EVT_ID' => $new_event_id,
-            'QSG_ID' => $new_question_group_id,
-            'EQG_primary' => $primary
-        );
+		if (! $new_question_group_id) {
+			$this->add_error(
+				sprintf(
+					// translators: %s question ID, %s event ID
+					esc_html__("Could not find 4.1 question ID for 3.1 question id #%s on event $%s", "event_espresso"),
+					$old_question_group_id,
+					$old_event['id']
+				)
+			);
+			return 0;
+		}
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_detail",
+			intval($old_event['id']),
+			$wpdb->posts
+		);
+		if (! $new_question_group_id) {
+			$this->add_error(
+				sprintf(
+					// translators: %s event ID
+					esc_html__("Could not find 4.1 event 3.1 event id #%s", "event_espresso"),
+					$old_event['id']
+				)
+			);
+			return 0;
+		}
+		$cols_n_values = array(
+			'EVT_ID' => $new_event_id,
+			'QSG_ID' => $new_question_group_id,
+			'EQG_primary' => $primary
+		);
 
-        $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// QSG_ID
-            '%d',// EQG_primary
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $datatypes
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+		$datatypes = array(
+			'%d',// EVT_ID
+			'%d',// QSG_ID
+			'%d',// EQG_primary
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_table,
+					$cols_n_values,
+					$datatypes
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -58,9 +58,9 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_detail";
+        $this->_old_table = $wpdb->prefix."events_detail";
         $this->_extra_where_sql = 'WHERE event_status!="D"';
-        $this->_new_table = $wpdb->prefix . "esp_event_question_group";
+        $this->_new_table = $wpdb->prefix."esp_event_question_group";
         $this->_pretty_name = esc_html__("Question Groups in each Event", "event_espresso");
         parent::__construct();
     }
@@ -103,12 +103,12 @@ 
     {
         global $wpdb;
         $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_qst_group",
+            $wpdb->prefix."events_qst_group",
             intval($old_question_group_id),
-            $wpdb->prefix . "esp_question_group"
+            $wpdb->prefix."esp_question_group"
         );
 
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(
                 sprintf(
                     // translators: %s question ID, %s event ID
@@ -120,11 +120,11 @@ 
             return 0;
         }
         $new_event_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_detail",
+            $wpdb->prefix."events_detail",
             intval($old_event['id']),
             $wpdb->posts
         );
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(
                 sprintf(
                     // translators: %s event ID
@@ -141,12 +141,12 @@ 
         );
 
         $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// QSG_ID
-            '%d',// EQG_primary
+            '%d', // EVT_ID
+            '%d', // QSG_ID
+            '%d', // EQG_primary
         );
         $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,

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

Indentation +106 added lines, -108 removed lines

@@ -12,8 +12,6 @@ 
   KEY `group_id` (`group_id`),
   KEY `question_id` (`question_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8$$
-
-
  * 4.1 question group question model's tables and fields:
  $this->_tables = array(
             'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')
@@ -29,114 +27,114 @@ 
  */
 class EE_DMS_4_1_0_question_group_question extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    public function _migration_step($num_items = 50)
-    {
+	private $_old_table;
+	private $_new_table;
+	public function _migration_step($num_items = 50)
+	{
 
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_group_question) {
-            $this->_insert_new_question_group_question($question_group_question);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_qst_group_rel";
-        $this->_new_table = $wpdb->prefix . "esp_question_group_question";
-        $this->_pretty_name = esc_html__("Question Group to Question Relations", "event_espresso");
-        parent::__construct();
-    }
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_group_question) {
+			$this->_insert_new_question_group_question($question_group_question);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_qst_group_rel";
+		$this->_new_table = $wpdb->prefix . "esp_question_group_question";
+		$this->_pretty_name = esc_html__("Question Group to Question Relations", "event_espresso");
+		parent::__construct();
+	}
 
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_question_group_question
-     * @return int
-     */
-    private function _insert_new_question_group_question($old_question_group_question)
-    {
-        global $wpdb;
-        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_question", $old_question_group_question['question_id'], $wpdb->prefix . "esp_question");
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix . "esp_question_group");
-        if (! $new_question_id) {
-            $this->add_error(sprintf(esc_html__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
-            return 0;
-        }
-        if (! $new_question_group_id) {
-            $this->add_error(sprintf(esc_html__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
-            return 0;
-        }
-        // if it's a system question, it needs to be in the right system group. otherwise no dice!
-        if (
-            ($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
-                ||
-                ! $this->_is_system_question_for_question_group($new_question_id)
-        ) {
-            $cols_n_values = array(
-                'QSG_ID' => $new_question_group_id,
-                'QST_ID' => $new_question_id
-            );
-            $datatypes = array(
-                '%d',// QSG_ID
-                '%d',// QST_ID
-            );
-            $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-            if (! $success) {
-                $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
-                return 0;
-            }
-            return $wpdb->insert_id;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_question_group_question
+	 * @return int
+	 */
+	private function _insert_new_question_group_question($old_question_group_question)
+	{
+		global $wpdb;
+		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_question", $old_question_group_question['question_id'], $wpdb->prefix . "esp_question");
+		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix . "esp_question_group");
+		if (! $new_question_id) {
+			$this->add_error(sprintf(esc_html__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
+			return 0;
+		}
+		if (! $new_question_group_id) {
+			$this->add_error(sprintf(esc_html__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
+			return 0;
+		}
+		// if it's a system question, it needs to be in the right system group. otherwise no dice!
+		if (
+			($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
+				||
+				! $this->_is_system_question_for_question_group($new_question_id)
+		) {
+			$cols_n_values = array(
+				'QSG_ID' => $new_question_group_id,
+				'QST_ID' => $new_question_id
+			);
+			$datatypes = array(
+				'%d',// QSG_ID
+				'%d',// QST_ID
+			);
+			$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+			if (! $success) {
+				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
+				return 0;
+			}
+			return $wpdb->insert_id;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * If this question is a system question, returns the QSG_system number that
-     * indicates the question group its permitted in.
-     * @global type $wpdb
-     * @param type $new_question_id
-     * @return int
-     */
-    private function _is_system_question_for_question_group($new_question_id)
-    {
-        global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d", $new_question_id));
-        if (in_array($system_id, array('fname','lname','email'))) {
-            return 1;
-        } elseif ($system_id != '' && $system_id) {
-            return 2;
-        } else {
-            return 0;
-        }
-    }
+	/**
+	 * If this question is a system question, returns the QSG_system number that
+	 * indicates the question group its permitted in.
+	 * @global type $wpdb
+	 * @param type $new_question_id
+	 * @return int
+	 */
+	private function _is_system_question_for_question_group($new_question_id)
+	{
+		global $wpdb;
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d", $new_question_id));
+		if (in_array($system_id, array('fname','lname','email'))) {
+			return 1;
+		} elseif ($system_id != '' && $system_id) {
+			return 2;
+		} else {
+			return 0;
+		}
+	}
 
-    /**
-     * Returns the questino group's QSG_system value (1 meaning personal info, 2
-     * being address info, and 0 being neither)
-     * @global type $wpdb
-     * @param type $new_question_group_id
-     * @return boolean
-     */
-    private function _is_system_question_group($new_question_group_id)
-    {
-        global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
-        return intval($system_id);
-    }
+	/**
+	 * Returns the questino group's QSG_system value (1 meaning personal info, 2
+	 * being address info, and 0 being neither)
+	 * @global type $wpdb
+	 * @param type $new_question_group_id
+	 * @return boolean
+	 */
+	private function _is_system_question_group($new_question_group_id)
+	{
+		global $wpdb;
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
+		return intval($system_id);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -50,14 +50,14 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
         return $count;
     }
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_qst_group_rel";
-        $this->_new_table = $wpdb->prefix . "esp_question_group_question";
+        $this->_old_table = $wpdb->prefix."events_qst_group_rel";
+        $this->_new_table = $wpdb->prefix."esp_question_group_question";
         $this->_pretty_name = esc_html__("Question Group to Question Relations", "event_espresso");
         parent::__construct();
     }
@@ -71,19 +71,19 @@ 
     private function _insert_new_question_group_question($old_question_group_question)
     {
         global $wpdb;
-        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_question", $old_question_group_question['question_id'], $wpdb->prefix . "esp_question");
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix . "esp_question_group");
-        if (! $new_question_id) {
+        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_question", $old_question_group_question['question_id'], $wpdb->prefix."esp_question");
+        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix."esp_question_group");
+        if ( ! $new_question_id) {
             $this->add_error(sprintf(esc_html__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
             return 0;
         }
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(sprintf(esc_html__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
             return 0;
         }
         // if it's a system question, it needs to be in the right system group. otherwise no dice!
         if (
-            ($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
+            ($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id))
                 ||
                 ! $this->_is_system_question_for_question_group($new_question_id)
         ) {
@@ -92,11 +92,11 @@ 
                 'QST_ID' => $new_question_id
             );
             $datatypes = array(
-                '%d',// QSG_ID
-                '%d',// QST_ID
+                '%d', // QSG_ID
+                '%d', // QST_ID
             );
             $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
                 return 0;
             }
@@ -116,8 +116,8 @@ 
     private function _is_system_question_for_question_group($new_question_id)
     {
         global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d", $new_question_id));
-        if (in_array($system_id, array('fname','lname','email'))) {
+        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d", $new_question_id));
+        if (in_array($system_id, array('fname', 'lname', 'email'))) {
             return 1;
         } elseif ($system_id != '' && $system_id) {
             return 2;
@@ -136,7 +136,7 @@ 
     private function _is_system_question_group($new_question_group_id)
     {
         global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
+        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
         return intval($system_id);
     }
 }

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

Spacing +21 added lines, -21 removed lines

@@ -24,20 +24,20 @@ 
         // convert settings
         $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
         // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items); // $this->_gateways_we_know_how_to_migrate;
         foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
             $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if (isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 // determine the old option's name
                 $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
+                if ( ! $old_gateway_settings) {
                     // no settings existed for this gateway anyways... weird...
                     $items_actually_migrated++;
                     continue;
                 }
                 // now prepare the settings to make sure they're in the 4.1 format
                 $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+                $new_gateway_config_obj->payment_settings[$new_gateway_slug] = $new_gateway_settings;
                 // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
                 // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
                 delete_option($old_gateway_wp_option_name);
@@ -45,13 +45,13 @@ 
                 global $wpdb;
                 // yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
                 // only be saving users 50 milliseconds the one time this runs...
-                $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->options . " SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
+                $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
             }
 
             $items_actually_migrated++;
         }
         // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+        if ($items_actually_migrated < $num_items && ! $this->_converted_active_gateways) {
             $this->_convert_active_gateways();
             $this->_converted_active_gateways = true;
             $items_actually_migrated++;
@@ -69,7 +69,7 @@ 
         $step_of_setting_active_gateways = 1;
         $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
     //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+        return $count_of_gateways_to_convert + $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
     }
     public function __construct()
     {
@@ -119,7 +119,7 @@ 
     private function _get_old_gateway_option($new_gateway_slug)
     {
         $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
+        $settings = get_option($option_name, null);
     //  if( ! $settings){
     //      $this->add_error(sprintf(esc_html__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
     //  }
@@ -134,36 +134,36 @@ 
     private function _get_old_gateway_option_name($new_gateway_slug)
     {
         $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+        $old_gateway_slug = $new_gateway_slugs_to_new[$new_gateway_slug];
         $normal_option_prefix = 'event_espresso_';
         $normal_option_postfix = '_settings';
         switch ($new_gateway_slug) {
             case 'Bank':
-                $option_name = $normal_option_prefix . 'bank_deposit' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
                 break;
             case 'Aim':
-                $option_name = $normal_option_prefix . 'authnet_aim' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
                 break;
             case 'Check':
-                $option_name = $normal_option_prefix . 'check_payment' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
                 break;
             case 'Ideal':
-                $option_name = $normal_option_prefix . 'ideal_mollie' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
                 break;
             case 'Invoice':
-                $option_name = $normal_option_prefix . 'invoice_payment' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
                 break;
             case 'Purchase_Order':
-                $option_name = $normal_option_prefix . 'purchase_order_payment' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
                 break;
             case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite' . $normal_option_postfix;
+                $option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
                 break;
             case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite' . $normal_option_postfix;
+                $option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
                 break;
             default:
-                $option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix . $old_gateway_slug . $normal_option_postfix);
+                $option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
         }
         return $option_name;
     }
@@ -174,14 +174,14 @@ 
         $old_active_gateways = get_option('event_espresso_active_gateways');
         $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
         foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if ( ! isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 $this->add_error(sprintf(esc_html__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
                 continue;
             }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[$old_gateway_slug];
 
             // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
+            $new_active_gateways[$new_gateway_slug] = false;
         }
         EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
     }

Indentation +191 added lines, -191 removed lines

@@ -13,68 +13,68 @@ 
  */
 class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage
 {
-    private $_converted_active_gateways = false;
+	private $_converted_active_gateways = false;
 
-    public function _migration_step($num_items = 50)
-    {
-        // loads existing EE_CONfig from DB, if it exists
-        $new_gateway_config_obj = EE_Config::instance()->gateway;
-        $items_actually_migrated = 0;
-        // convert settings
-        $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
-        // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
-        foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
-            $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                // determine the old option's name
-                $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
-                    // no settings existed for this gateway anyways... weird...
-                    $items_actually_migrated++;
-                    continue;
-                }
-                // now prepare the settings to make sure they're in the 4.1 format
-                $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
-                // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
-                // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
-                delete_option($old_gateway_wp_option_name);
-            } else {// it must be one of the ones we mostly leave alone
-                global $wpdb;
-                // yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
-                // only be saving users 50 milliseconds the one time this runs...
-                $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->options . " SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
-            }
+	public function _migration_step($num_items = 50)
+	{
+		// loads existing EE_CONfig from DB, if it exists
+		$new_gateway_config_obj = EE_Config::instance()->gateway;
+		$items_actually_migrated = 0;
+		// convert settings
+		$gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
+		// just do a part of them on this request
+		$gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
+			$old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+			if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				// determine the old option's name
+				$old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
+				if (! $old_gateway_settings) {
+					// no settings existed for this gateway anyways... weird...
+					$items_actually_migrated++;
+					continue;
+				}
+				// now prepare the settings to make sure they're in the 4.1 format
+				$new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
+				$new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+				// and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
+				// I think it's ok to do right away this time (we wont need gateway settings elsewhere)
+				delete_option($old_gateway_wp_option_name);
+			} else {// it must be one of the ones we mostly leave alone
+				global $wpdb;
+				// yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
+				// only be saving users 50 milliseconds the one time this runs...
+				$wpdb->query($wpdb->prepare("UPDATE " . $wpdb->options . " SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
+			}
 
-            $items_actually_migrated++;
-        }
-        // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
-            $this->_convert_active_gateways();
-            $this->_converted_active_gateways = true;
-            $items_actually_migrated++;
-        }
+			$items_actually_migrated++;
+		}
+		// if we can keep going, and it hasn' tbeen done yet, convert active gateways
+		if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+			$this->_convert_active_gateways();
+			$this->_converted_active_gateways = true;
+			$items_actually_migrated++;
+		}
 
-        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;
-    }
-    public function _count_records_to_migrate()
-    {
-        $count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
-        $step_of_setting_active_gateways = 1;
-        $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
-    //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__("Gateways", "event_espresso");
-        parent::__construct();
-    }
+		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;
+	}
+	public function _count_records_to_migrate()
+	{
+		$count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
+		$step_of_setting_active_gateways = 1;
+		$count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
+	//  $button_images_to_update =
+		return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__("Gateways", "event_espresso");
+		parent::__construct();
+	}
 
 /**
  * Takes the old array of 3.1 gateway settings for this gateway and converts it
@@ -84,148 +84,148 @@ 
  * @param string $new_gateway_slug
  * @return array
  */
-    private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
-    {
-        $new_gateway_settings = $old_gateway_settings;
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
-                $new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
-                break;
-            case 'Invoice':
-                $new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
-                // Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
-                // it gets used in the receipts which are available to everyone. So usually it's best to not
-                // migrate this.
-                unset($new_gateway_settings['payment_address']);
-                break;
-            case 'Paypal_Pro':
-                $new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
-                $new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
-                $new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
-                $new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
-                $new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
-                $new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
-                break;
-        }
-        return $new_gateway_settings;
-    }
+	private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
+	{
+		$new_gateway_settings = $old_gateway_settings;
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
+				$new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
+				break;
+			case 'Invoice':
+				$new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
+				// Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
+				// it gets used in the receipts which are available to everyone. So usually it's best to not
+				// migrate this.
+				unset($new_gateway_settings['payment_address']);
+				break;
+			case 'Paypal_Pro':
+				$new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
+				$new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
+				$new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
+				$new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
+				$new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
+				$new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
+				break;
+		}
+		return $new_gateway_settings;
+	}
 /**
- * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
- * @param string $new_gateway_slug
- * @return string
- */
-    private function _get_old_gateway_option($new_gateway_slug)
-    {
-        $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
-    //  if( ! $settings){
-    //      $this->add_error(sprintf(esc_html__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
-    //  }
-        return $settings;
-    }
+	 * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
+	 * @param string $new_gateway_slug
+	 * @return string
+	 */
+	private function _get_old_gateway_option($new_gateway_slug)
+	{
+		$option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+		$settings =  get_option($option_name, null);
+	//  if( ! $settings){
+	//      $this->add_error(sprintf(esc_html__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
+	//  }
+		return $settings;
+	}
 
 /**
  * Just gets the old gateways slug
  * @param string $new_gateway_slug
  * @return string
  */
-    private function _get_old_gateway_option_name($new_gateway_slug)
-    {
-        $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
-        $normal_option_prefix = 'event_espresso_';
-        $normal_option_postfix = '_settings';
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $option_name = $normal_option_prefix . 'bank_deposit' . $normal_option_postfix;
-                break;
-            case 'Aim':
-                $option_name = $normal_option_prefix . 'authnet_aim' . $normal_option_postfix;
-                break;
-            case 'Check':
-                $option_name = $normal_option_prefix . 'check_payment' . $normal_option_postfix;
-                break;
-            case 'Ideal':
-                $option_name = $normal_option_prefix . 'ideal_mollie' . $normal_option_postfix;
-                break;
-            case 'Invoice':
-                $option_name = $normal_option_prefix . 'invoice_payment' . $normal_option_postfix;
-                break;
-            case 'Purchase_Order':
-                $option_name = $normal_option_prefix . 'purchase_order_payment' . $normal_option_postfix;
-                break;
-            case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite' . $normal_option_postfix;
-                break;
-            case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite' . $normal_option_postfix;
-                break;
-            default:
-                $option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix . $old_gateway_slug . $normal_option_postfix);
-        }
-        return $option_name;
-    }
+	private function _get_old_gateway_option_name($new_gateway_slug)
+	{
+		$new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
+		$old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+		$normal_option_prefix = 'event_espresso_';
+		$normal_option_postfix = '_settings';
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$option_name = $normal_option_prefix . 'bank_deposit' . $normal_option_postfix;
+				break;
+			case 'Aim':
+				$option_name = $normal_option_prefix . 'authnet_aim' . $normal_option_postfix;
+				break;
+			case 'Check':
+				$option_name = $normal_option_prefix . 'check_payment' . $normal_option_postfix;
+				break;
+			case 'Ideal':
+				$option_name = $normal_option_prefix . 'ideal_mollie' . $normal_option_postfix;
+				break;
+			case 'Invoice':
+				$option_name = $normal_option_prefix . 'invoice_payment' . $normal_option_postfix;
+				break;
+			case 'Purchase_Order':
+				$option_name = $normal_option_prefix . 'purchase_order_payment' . $normal_option_postfix;
+				break;
+			case 'USAePay_Offsite':
+				$option_name = 'espresso_usaepay_offsite' . $normal_option_postfix;
+				break;
+			case 'USAePay_Onsite':
+				$option_name = 'espresso_usaepay_onsite' . $normal_option_postfix;
+				break;
+			default:
+				$option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix . $old_gateway_slug . $normal_option_postfix);
+		}
+		return $option_name;
+	}
 
-    private function _convert_active_gateways()
-    {
-        // just does it all one big swoop
-        $old_active_gateways = get_option('event_espresso_active_gateways');
-        $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
-        foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                $this->add_error(sprintf(esc_html__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
-                continue;
-            }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+	private function _convert_active_gateways()
+	{
+		// just does it all one big swoop
+		$old_active_gateways = get_option('event_espresso_active_gateways');
+		$new_active_gateways = EE_Config::instance()->gateway->active_gateways;
+		foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
+			if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				$this->add_error(sprintf(esc_html__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
+				continue;
+			}
+			$new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
 
-            // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
-        }
-        EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
-    }
+			// in the new format we can also upload gateways to the uploads directory and
+			$new_active_gateways[ $new_gateway_slug ] = false;
+		}
+		EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
+	}
 
-    protected $_gateways_we_know_how_to_migrate = array(
-        'aim' => 'Aim',
-        'bank' => 'Bank',
-        'check' => 'Check',
-        'invoice' => 'Invoice',
-        'paypal' => 'Paypal_Standard',
-        'paypal_pro' => 'Paypal_Pro',
+	protected $_gateways_we_know_how_to_migrate = array(
+		'aim' => 'Aim',
+		'bank' => 'Bank',
+		'check' => 'Check',
+		'invoice' => 'Invoice',
+		'paypal' => 'Paypal_Standard',
+		'paypal_pro' => 'Paypal_Pro',
 
-    );
+	);
 
-    protected $_gateways_we_leave_alone = array(
-        '2checkout' => '2checkout',
-        'anz' => 'Anz',
-        'atos' => 'Atos',
-        'authnet' => 'Authnet',
-        'beanstream' => 'Beanstream',
-        'evertec' => 'Evertec',
-        'eway' => 'Eway',
-        'eway_rapid3' => 'Eway_Rapid3',
-        'exact' => 'Exact',
-        'firstdata' => 'Firstdata',
-        'firstdat_e4' => 'Firstdata_E4',
-        'ideal' => 'Ideal',
-        'infusion_payment' => 'InfusionSoft',
-        'luottokunta' => 'Luottokunta',
-        'megasoft' => 'Megasoft',
-        'moneris_hpp' => 'Moneris_HPP',
-        'mwarrior' => 'Mwarrior',
-        'nab' => 'NAB',
-        'paychoice' => 'Paychoice',
-        'paytrace' => 'Paytrace',
-        'psigate' => 'Psigate',
-        'purchase_order' => 'Purchase_Order',
-        'qbms' => 'QBMS',
-        'quickpay' => 'Quickpay',
-        'realauth' => 'Realauth',
-        'securepay_aus' => 'Securepay_Aus',
-        'stripe' => 'Stripe',
-        'usaepay_offsite' => 'USAePay_Offsite',
-        'usaepay_onsite' => 'USAePay_Onsite',
-        'wepay' => 'Wepay',
-        'worldpay' => 'Worldpay'
-    );
+	protected $_gateways_we_leave_alone = array(
+		'2checkout' => '2checkout',
+		'anz' => 'Anz',
+		'atos' => 'Atos',
+		'authnet' => 'Authnet',
+		'beanstream' => 'Beanstream',
+		'evertec' => 'Evertec',
+		'eway' => 'Eway',
+		'eway_rapid3' => 'Eway_Rapid3',
+		'exact' => 'Exact',
+		'firstdata' => 'Firstdata',
+		'firstdat_e4' => 'Firstdata_E4',
+		'ideal' => 'Ideal',
+		'infusion_payment' => 'InfusionSoft',
+		'luottokunta' => 'Luottokunta',
+		'megasoft' => 'Megasoft',
+		'moneris_hpp' => 'Moneris_HPP',
+		'mwarrior' => 'Mwarrior',
+		'nab' => 'NAB',
+		'paychoice' => 'Paychoice',
+		'paytrace' => 'Paytrace',
+		'psigate' => 'Psigate',
+		'purchase_order' => 'Purchase_Order',
+		'qbms' => 'QBMS',
+		'quickpay' => 'Quickpay',
+		'realauth' => 'Realauth',
+		'securepay_aus' => 'Securepay_Aus',
+		'stripe' => 'Stripe',
+		'usaepay_offsite' => 'USAePay_Offsite',
+		'usaepay_onsite' => 'USAePay_Onsite',
+		'wepay' => 'Wepay',
+		'worldpay' => 'Worldpay'
+	);
 }

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

Indentation +76 added lines, -78 removed lines

@@ -24,87 +24,85 @@
                 'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', esc_html__('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
                 'term_order'=>new EE_Integer_Field('term_order', esc_html__('Term Order','event_espresso'), false, 0)
             ));
-
-
  *
  */
 class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    public function _migration_step($num_items = 50)
-    {
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
-        $items_actually_migrated = 0;
-        foreach ($rows as $event_venue_rel) {
-            $term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
-            if ($term_relation_id) {
-                $this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
-            }
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_category_rel";
-        $this->_new_table = $wpdb->prefix . "term_relationships";
-        $this->_pretty_name = esc_html__("Event to Category (4.1 Term Relationships)", "event_espresso");
-        parent::__construct();
-    }
+	private $_old_table;
+	private $_new_table;
+	public function _migration_step($num_items = 50)
+	{
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+		$items_actually_migrated = 0;
+		foreach ($rows as $event_venue_rel) {
+			$term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
+			if ($term_relation_id) {
+				$this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
+			}
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_category_rel";
+		$this->_new_table = $wpdb->prefix . "term_relationships";
+		$this->_pretty_name = esc_html__("Event to Category (4.1 Term Relationships)", "event_espresso");
+		parent::__construct();
+	}
 
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_event_cat_relation
-     * @return int
-     */
-    private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation)
-    {
-        global $wpdb;
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix . "posts");
-        $new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix . "term_taxonomy");
-        if (! $new_event_id) {
-            $this->add_error(sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
-            return 0;
-        }
-        if (! $new_term_taxonomy_id) {
-            $this->add_error(sprintf(esc_html__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
-            return 0;
-        }
-        $cols_n_values = array(
-            'object_id' => $new_event_id,
-            'term_taxonomy_id' => $new_term_taxonomy_id,
-            'term_order' => 0
-        );
-        $datatypes = array(
-            '%d',// object_id
-            '%d',// term_taxonomy_id
-            '%d',// term_order
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        } else {
-            // increment the term-taxonomie's count
-            $success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
-            if (! $success) {
-                $this->add_error(sprintf(esc_html__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
-            }
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_event_cat_relation
+	 * @return int
+	 */
+	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation)
+	{
+		global $wpdb;
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix . "posts");
+		$new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix . "term_taxonomy");
+		if (! $new_event_id) {
+			$this->add_error(sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
+			return 0;
+		}
+		if (! $new_term_taxonomy_id) {
+			$this->add_error(sprintf(esc_html__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
+			return 0;
+		}
+		$cols_n_values = array(
+			'object_id' => $new_event_id,
+			'term_taxonomy_id' => $new_term_taxonomy_id,
+			'term_order' => 0
+		);
+		$datatypes = array(
+			'%d',// object_id
+			'%d',// term_taxonomy_id
+			'%d',// term_order
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		} else {
+			// increment the term-taxonomie's count
+			$success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
+			if (! $success) {
+				$this->add_error(sprintf(esc_html__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
+			}
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -53,14 +53,14 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
         return $count;
     }
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_category_rel";
-        $this->_new_table = $wpdb->prefix . "term_relationships";
+        $this->_old_table = $wpdb->prefix."events_category_rel";
+        $this->_new_table = $wpdb->prefix."term_relationships";
         $this->_pretty_name = esc_html__("Event to Category (4.1 Term Relationships)", "event_espresso");
         parent::__construct();
     }
@@ -74,13 +74,13 @@ 
     private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation)
     {
         global $wpdb;
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix . "posts");
-        $new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix . "term_taxonomy");
-        if (! $new_event_id) {
+        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
+        $new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
+        if ( ! $new_event_id) {
             $this->add_error(sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
             return 0;
         }
-        if (! $new_term_taxonomy_id) {
+        if ( ! $new_term_taxonomy_id) {
             $this->add_error(sprintf(esc_html__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
             return 0;
         }
@@ -90,18 +90,18 @@ 
             'term_order' => 0
         );
         $datatypes = array(
-            '%d',// object_id
-            '%d',// term_taxonomy_id
-            '%d',// term_order
+            '%d', // object_id
+            '%d', // term_taxonomy_id
+            '%d', // term_order
         );
         $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         } else {
             // increment the term-taxonomie's count
             $success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error(sprintf(esc_html__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
             }
         }