eventespresso / event-espresso-core

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

Indentation +105 added lines, -105 removed lines

@@ -15,114 +15,114 @@
 class EE_DMS_4_5_0_invoice_settings extends EE_Data_Migration_Script_Stage
 {
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__('Update Invoice Gateway Settings', 'event_espresso');
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__('Update Invoice Gateway Settings', 'event_espresso');
+		parent::__construct();
+	}
 
 
-    /**
-     * _count_records_to_migrate
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @access protected
-     * @return int
-     */
-    protected function _count_records_to_migrate(): int
-    {
-        return 1;
-    }
+	/**
+	 * _count_records_to_migrate
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @access protected
+	 * @return int
+	 */
+	protected function _count_records_to_migrate(): int
+	{
+		return 1;
+	}
 
 
-    /**
-     *    _migration_step
-     *
-     * @access protected
-     * @param int $num_items_to_migrate
-     * @return int number of items ACTUALLY migrated
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     */
-    protected function _migration_step($num_items_to_migrate = 1)
-    {
-        // if this isn't set then something is really wrong
-        if (! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
-            throw new EE_Error(
-                esc_html__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso')
-            );
-        }
-        $invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice'])
-            ? EE_Config::instance()->gateway->payment_settings['Invoice']
-            : null;
-        if (! $invoice_settings) {
-            $this->add_error(
-                esc_html__(
-                    'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist',
-                    'event_espresso'
-                )
-            );
-        } else {
-            $invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
-            $invoice_settings['template_invoice_payee_name']   = $invoice_settings['payable_to'];
-            $invoice_settings['template_invoice_address']      = $invoice_settings['payment_address'];
-            $invoice_settings['template_invoice_email']        = '';
-            $invoice_settings['template_invoice_tax_number']   = '';
-            unset($invoice_settings['pdf_instructions']);
-            unset($invoice_settings['payable_to']);
-            unset($invoice_settings['payment_address']);
-            EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
-            EE_Config::instance()->update_espresso_config(false, false);
+	/**
+	 *    _migration_step
+	 *
+	 * @access protected
+	 * @param int $num_items_to_migrate
+	 * @return int number of items ACTUALLY migrated
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 */
+	protected function _migration_step($num_items_to_migrate = 1)
+	{
+		// if this isn't set then something is really wrong
+		if (! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(
+				esc_html__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso')
+			);
+		}
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice'])
+			? EE_Config::instance()->gateway->payment_settings['Invoice']
+			: null;
+		if (! $invoice_settings) {
+			$this->add_error(
+				esc_html__(
+					'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist',
+					'event_espresso'
+				)
+			);
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name']   = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address']      = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email']        = '';
+			$invoice_settings['template_invoice_tax_number']   = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
-            // @todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
-            // (why is it tough to change? because we want to update the receipt and invoice message template, but
-            // message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
-            // update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
-            // also we don't want to build a dependency on the messages code because it is likely to change soon
-            if (
-                isset($invoice_settings['invoice_css']) &&
-                ! in_array($invoice_settings['invoice_css'], ['', 'simple.css'])
-            ) {
-                new PersistentAdminNotice(
-                    'invoice_css_not_updated',
-                    sprintf(
-                        esc_html__(
-                            'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
-                            'event_espresso'
-                        ),
-                        $invoice_settings['invoice_css']
-                    )
-                );
-            }
-            $templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-            $overridden_invoice_body = EEH_Template::locate_template(
-                $templates_relative_path . 'invoice_body.template.php',
-                null,
-                false,
-                false,
-                true
-            );
-            $overridden_receipt_body = EEH_Template::locate_template(
-                $templates_relative_path . 'receipt_body.template.php',
-                null,
-                false,
-                false,
-                true
-            );
-            if ($overridden_invoice_body || $overridden_receipt_body) {
-                new PersistentAdminNotice(
-                    'invoice_overriding_templates', esc_html__(
-                    'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
-                    'event_espresso'
-                ),  true
-                );
-            }
-        }
-        // regardless of whether it worked or not, we ought to continue the migration
-        $this->set_completed();
-        return 1;
-    }
+			// @todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
+			// (why is it tough to change? because we want to update the receipt and invoice message template, but
+			// message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
+			// update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
+			// also we don't want to build a dependency on the messages code because it is likely to change soon
+			if (
+				isset($invoice_settings['invoice_css']) &&
+				! in_array($invoice_settings['invoice_css'], ['', 'simple.css'])
+			) {
+				new PersistentAdminNotice(
+					'invoice_css_not_updated',
+					sprintf(
+						esc_html__(
+							'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
+							'event_espresso'
+						),
+						$invoice_settings['invoice_css']
+					)
+				);
+			}
+			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
+			$overridden_invoice_body = EEH_Template::locate_template(
+				$templates_relative_path . 'invoice_body.template.php',
+				null,
+				false,
+				false,
+				true
+			);
+			$overridden_receipt_body = EEH_Template::locate_template(
+				$templates_relative_path . 'receipt_body.template.php',
+				null,
+				false,
+				false,
+				true
+			);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
+				new PersistentAdminNotice(
+					'invoice_overriding_templates', esc_html__(
+					'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
+					'event_espresso'
+				),  true
+				);
+			}
+		}
+		// regardless of whether it worked or not, we ought to continue the migration
+		$this->set_completed();
+		return 1;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
     protected function _migration_step($num_items_to_migrate = 1)
     {
         // if this isn't set then something is really wrong
-        if (! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+        if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
             throw new EE_Error(
                 esc_html__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso')
             );
@@ -58,7 +58,7 @@ 
         $invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice'])
             ? EE_Config::instance()->gateway->payment_settings['Invoice']
             : null;
-        if (! $invoice_settings) {
+        if ( ! $invoice_settings) {
             $this->add_error(
                 esc_html__(
                     'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist',
@@ -99,14 +99,14 @@ 
             }
             $templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
             $overridden_invoice_body = EEH_Template::locate_template(
-                $templates_relative_path . 'invoice_body.template.php',
+                $templates_relative_path.'invoice_body.template.php',
                 null,
                 false,
                 false,
                 true
             );
             $overridden_receipt_body = EEH_Template::locate_template(
-                $templates_relative_path . 'receipt_body.template.php',
+                $templates_relative_path.'receipt_body.template.php',
                 null,
                 false,
                 false,
@@ -117,7 +117,7 @@ 
                     'invoice_overriding_templates', esc_html__(
                     'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
                     'event_espresso'
-                ),  true
+                ), true
                 );
             }
         }

core/data_migration_scripts/4_10_0_stages/EE_DMS_4_10_0_Event_Question_Group.dmsstage.php

Indentation +134 added lines, -134 removed lines

@@ -10,144 +10,144 @@
 class EE_DMS_4_10_0_Event_Question_Group extends EE_Data_Migration_Script_Stage_Table
 {
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name     = esc_html__('Event-Question Group Relations', 'event_espresso');
-        $this->_old_table       = $wpdb->prefix . 'esp_event_question_group';
-        $this->_extra_where_sql = "WHERE EQG_primary = 0 AND EQG_additional=0";
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name     = esc_html__('Event-Question Group Relations', 'event_espresso');
+		$this->_old_table       = $wpdb->prefix . 'esp_event_question_group';
+		$this->_extra_where_sql = "WHERE EQG_primary = 0 AND EQG_additional=0";
+		parent::__construct();
+	}
 
 
-    /**
-     * Removes the duplicate event_question_group rows that only had EQG_primary=0. Now we just have one row
-     * joining event-to-question-groups with two columns: EQG_primary and EQG_additional, indicating which question
-     * groups apply to which category of registrant.
-     *
-     * @param array $old_row an associative array where keys are column names and values are their values.
-     * @return void
-     */
-    protected function _migrate_old_row($old_row)
-    {
-        if (isset($old_row['EVT_ID'], $old_row['QSG_ID'])) {
-            global $wpdb;
-            // If the question group was also for primary attendees, we should just update that row.
-            // And we delete this row.
-            // Updating all the rows could be slow on massive DBs, so do the slow selection first, then a quick update
-            // in order to avoid locking the table for too long.
-            $ids_to_update = $wpdb->get_col(
-                $wpdb->prepare(
-                    'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
-                    $old_row['EVT_ID'],
-                    $old_row['QSG_ID']
-                )
-            );
-            $success       = false;
-            if ($ids_to_update) {
-                $success = $wpdb->query(
-                    'UPDATE ' .
-                    $this->_old_table .
-                    ' SET EQG_additional=1 WHERE EQG_ID IN (' .
-                    implode(',', array_map('intval', $ids_to_update)) .
-                    ') LIMIT ' .
-                    count($ids_to_update)
-                );
-            }
-            if ($success) {
-                // Ok it's confirmed: the question group WAS for the primary attendee group too. So
-                // now we just need to delete this row.
-                $successful_delete = $wpdb->delete(
-                    $this->_old_table,
-                    [
-                        'EQG_ID' => $old_row['EQG_ID'],
-                    ],
-                    ['%d']
-                );
-                if (! $successful_delete) {
-                    $this->add_error(
-                        sprintf(
-                            esc_html__(
-                                'Could not delete old event-question group relation row "%1$s" because "%2$s"',
-                                'event_espresso'
-                            ),
-                            wp_json_encode($old_row),
-                            $wpdb->last_error
-                        )
-                    );
-                }
-            } else {
-                // Oh, the question group actually was NOT for the primary attendee. So we just need to update this row
-                // Let's do the selection separately from the deletion, this way we don't lock big tables for too long.
-                $ids_to_update2 = $wpdb->get_col(
-                    $wpdb->prepare(
-                        'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EVT_ID=%d AND QSG_ID=%d',
-                        $old_row['EVT_ID'],
-                        $old_row['QSG_ID']
-                    )
-                );
-                if ($ids_to_update2) {
-                    $wpdb->query(
-                        'UPDATE ' .
-                        $this->_old_table .
-                        ' SET EQG_additional=1 WHERE EQG_ID IN (' .
-                        implode(',', array_map('intval', $ids_to_update2)) .
-                        ') LIMIT ' .
-                        count($ids_to_update2)
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * Removes the duplicate event_question_group rows that only had EQG_primary=0. Now we just have one row
+	 * joining event-to-question-groups with two columns: EQG_primary and EQG_additional, indicating which question
+	 * groups apply to which category of registrant.
+	 *
+	 * @param array $old_row an associative array where keys are column names and values are their values.
+	 * @return void
+	 */
+	protected function _migrate_old_row($old_row)
+	{
+		if (isset($old_row['EVT_ID'], $old_row['QSG_ID'])) {
+			global $wpdb;
+			// If the question group was also for primary attendees, we should just update that row.
+			// And we delete this row.
+			// Updating all the rows could be slow on massive DBs, so do the slow selection first, then a quick update
+			// in order to avoid locking the table for too long.
+			$ids_to_update = $wpdb->get_col(
+				$wpdb->prepare(
+					'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
+					$old_row['EVT_ID'],
+					$old_row['QSG_ID']
+				)
+			);
+			$success       = false;
+			if ($ids_to_update) {
+				$success = $wpdb->query(
+					'UPDATE ' .
+					$this->_old_table .
+					' SET EQG_additional=1 WHERE EQG_ID IN (' .
+					implode(',', array_map('intval', $ids_to_update)) .
+					') LIMIT ' .
+					count($ids_to_update)
+				);
+			}
+			if ($success) {
+				// Ok it's confirmed: the question group WAS for the primary attendee group too. So
+				// now we just need to delete this row.
+				$successful_delete = $wpdb->delete(
+					$this->_old_table,
+					[
+						'EQG_ID' => $old_row['EQG_ID'],
+					],
+					['%d']
+				);
+				if (! $successful_delete) {
+					$this->add_error(
+						sprintf(
+							esc_html__(
+								'Could not delete old event-question group relation row "%1$s" because "%2$s"',
+								'event_espresso'
+							),
+							wp_json_encode($old_row),
+							$wpdb->last_error
+						)
+					);
+				}
+			} else {
+				// Oh, the question group actually was NOT for the primary attendee. So we just need to update this row
+				// Let's do the selection separately from the deletion, this way we don't lock big tables for too long.
+				$ids_to_update2 = $wpdb->get_col(
+					$wpdb->prepare(
+						'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EVT_ID=%d AND QSG_ID=%d',
+						$old_row['EVT_ID'],
+						$old_row['QSG_ID']
+					)
+				);
+				if ($ids_to_update2) {
+					$wpdb->query(
+						'UPDATE ' .
+						$this->_old_table .
+						' SET EQG_additional=1 WHERE EQG_ID IN (' .
+						implode(',', array_map('intval', $ids_to_update2)) .
+						') LIMIT ' .
+						count($ids_to_update2)
+					);
+				}
+			}
+		}
+	}
 
 
-    /**
-     * Gets the rows for the existing table that shouldn't exist in 4.10.
-     * Specifically the rows where EQG_primary=false and EQG_additional=false.
-     * Gotcha: because the migration is REMOVING rows as it goes, we shouldn't use the offset.
-     *
-     * @param int   $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     * @global wpdb $wpdb
-     */
-    protected function _get_rows($limit)
-    {
-        global $wpdb;
-        $query = "SELECT * FROM $this->_old_table $this->_extra_where_sql " . $wpdb->prepare(
-                "LIMIT %d",
-                $limit
-            );
-        return $wpdb->get_results($query, ARRAY_A);
-    }
+	/**
+	 * Gets the rows for the existing table that shouldn't exist in 4.10.
+	 * Specifically the rows where EQG_primary=false and EQG_additional=false.
+	 * Gotcha: because the migration is REMOVING rows as it goes, we shouldn't use the offset.
+	 *
+	 * @param int   $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 * @global wpdb $wpdb
+	 */
+	protected function _get_rows($limit)
+	{
+		global $wpdb;
+		$query = "SELECT * FROM $this->_old_table $this->_extra_where_sql " . $wpdb->prepare(
+				"LIMIT %d",
+				$limit
+			);
+		return $wpdb->get_results($query, ARRAY_A);
+	}
 
 
-    /**
-     * Slight departure from the normal procedure here: because this removes rows from the DB, we need to ensure
-     * we count the records first, then do the migration.
-     *
-     * @param int $num_items_to_migrate
-     * @return int number of items ACTUALLY migrated
-     */
-    public function _migration_step($num_items_to_migrate = 50)
-    {
-        // Count the items right away. This migration step will be removing those rows, so we need to count them
-        // right away to get an accurate count.
-        $this->count_records_to_migrate();
-        $rows                    = $this->_get_rows($num_items_to_migrate);
-        $items_actually_migrated = 0;
-        foreach ($rows as $old_row) {
-            $this->_migrate_old_row($old_row);
-            $items_actually_migrated++;
-        }
-        if (
-            empty($rows) ||
-            ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate())
-        ) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	/**
+	 * Slight departure from the normal procedure here: because this removes rows from the DB, we need to ensure
+	 * we count the records first, then do the migration.
+	 *
+	 * @param int $num_items_to_migrate
+	 * @return int number of items ACTUALLY migrated
+	 */
+	public function _migration_step($num_items_to_migrate = 50)
+	{
+		// Count the items right away. This migration step will be removing those rows, so we need to count them
+		// right away to get an accurate count.
+		$this->count_records_to_migrate();
+		$rows                    = $this->_get_rows($num_items_to_migrate);
+		$items_actually_migrated = 0;
+		foreach ($rows as $old_row) {
+			$this->_migrate_old_row($old_row);
+			$items_actually_migrated++;
+		}
+		if (
+			empty($rows) ||
+			($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate())
+		) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
     {
         global $wpdb;
         $this->_pretty_name     = esc_html__('Event-Question Group Relations', 'event_espresso');
-        $this->_old_table       = $wpdb->prefix . 'esp_event_question_group';
+        $this->_old_table       = $wpdb->prefix.'esp_event_question_group';
         $this->_extra_where_sql = "WHERE EQG_primary = 0 AND EQG_additional=0";
         parent::__construct();
     }
@@ -41,19 +41,19 @@ 
             // in order to avoid locking the table for too long.
             $ids_to_update = $wpdb->get_col(
                 $wpdb->prepare(
-                    'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
+                    'SELECT EQG_ID FROM '.$this->_old_table.' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
                     $old_row['EVT_ID'],
                     $old_row['QSG_ID']
                 )
             );
-            $success       = false;
+            $success = false;
             if ($ids_to_update) {
                 $success = $wpdb->query(
-                    'UPDATE ' .
-                    $this->_old_table .
-                    ' SET EQG_additional=1 WHERE EQG_ID IN (' .
-                    implode(',', array_map('intval', $ids_to_update)) .
-                    ') LIMIT ' .
+                    'UPDATE '.
+                    $this->_old_table.
+                    ' SET EQG_additional=1 WHERE EQG_ID IN ('.
+                    implode(',', array_map('intval', $ids_to_update)).
+                    ') LIMIT '.
                     count($ids_to_update)
                 );
             }
@@ -67,7 +67,7 @@ 
                     ],
                     ['%d']
                 );
-                if (! $successful_delete) {
+                if ( ! $successful_delete) {
                     $this->add_error(
                         sprintf(
                             esc_html__(
@@ -84,18 +84,18 @@ 
                 // Let's do the selection separately from the deletion, this way we don't lock big tables for too long.
                 $ids_to_update2 = $wpdb->get_col(
                     $wpdb->prepare(
-                        'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EVT_ID=%d AND QSG_ID=%d',
+                        'SELECT EQG_ID FROM '.$this->_old_table.' WHERE EVT_ID=%d AND QSG_ID=%d',
                         $old_row['EVT_ID'],
                         $old_row['QSG_ID']
                     )
                 );
                 if ($ids_to_update2) {
                     $wpdb->query(
-                        'UPDATE ' .
-                        $this->_old_table .
-                        ' SET EQG_additional=1 WHERE EQG_ID IN (' .
-                        implode(',', array_map('intval', $ids_to_update2)) .
-                        ') LIMIT ' .
+                        'UPDATE '.
+                        $this->_old_table.
+                        ' SET EQG_additional=1 WHERE EQG_ID IN ('.
+                        implode(',', array_map('intval', $ids_to_update2)).
+                        ') LIMIT '.
                         count($ids_to_update2)
                     );
                 }
@@ -116,7 +116,7 @@ 
     protected function _get_rows($limit)
     {
         global $wpdb;
-        $query = "SELECT * FROM $this->_old_table $this->_extra_where_sql " . $wpdb->prepare(
+        $query = "SELECT * FROM $this->_old_table $this->_extra_where_sql ".$wpdb->prepare(
                 "LIMIT %d",
                 $limit
             );

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Indentation +386 added lines, -386 removed lines

@@ -10,9 +10,9 @@ 
 $stages            = glob(EE_CORE . 'data_migration_scripts/4_8_0_stages/*');
 $class_to_filepath = [];
 foreach ($stages as $filepath) {
-    $matches = [];
-    preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+	$matches = [];
+	preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[ $matches[1] ] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
@@ -35,76 +35,76 @@ 
 class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base
 {
 
-    /**
-     * return EE_DMS_Core_4_8_0
-     *
-     * @param TableManager|null  $table_manager
-     * @param TableAnalysis|null $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name      = esc_html__("Data Update to Event Espresso 4.8.0", "event_espresso");
-        $this->_priority         = 10;
-        $this->_migration_stages = [
-            new EE_DMS_4_8_0_pretax_totals(),
-            new EE_DMS_4_8_0_event_subtotals(),
-        ];
-        parent::__construct($table_manager, $table_analysis);
-    }
-
-
-    /**
-     * Because this is being done at basically the same time as the MER-ready branch
-     * of core, it's possible people might have installed MEr-ready branch first,
-     * and then this one, in which case we still want to perform this migration,
-     * even though the version might not have increased
-     *
-     * @param array $version_array
-     * @return bool
-     */
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (
-            version_compare($version_string, '4.8.0.decaf', '<') &&
-            version_compare($version_string, '4.7.0.decaf', '>=')
-        ) {
-            //          echo "$version_string can be migrated from";
-            return true;
-        } elseif (! $version_string) {
-            //          echo "no version string provided: $version_string";
-            // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
-            //          echo "$version_string doesnt apply";
-            return false;
-        }
-    }
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function schema_changes_before_migration()
-    {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $now_in_mysql = current_time('mysql', true);
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-
-        $table_name = 'esp_answer';
-        $sql        = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 * return EE_DMS_Core_4_8_0
+	 *
+	 * @param TableManager|null  $table_manager
+	 * @param TableAnalysis|null $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name      = esc_html__("Data Update to Event Espresso 4.8.0", "event_espresso");
+		$this->_priority         = 10;
+		$this->_migration_stages = [
+			new EE_DMS_4_8_0_pretax_totals(),
+			new EE_DMS_4_8_0_event_subtotals(),
+		];
+		parent::__construct($table_manager, $table_analysis);
+	}
+
+
+	/**
+	 * Because this is being done at basically the same time as the MER-ready branch
+	 * of core, it's possible people might have installed MEr-ready branch first,
+	 * and then this one, in which case we still want to perform this migration,
+	 * even though the version might not have increased
+	 *
+	 * @param array $version_array
+	 * @return bool
+	 */
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (
+			version_compare($version_string, '4.8.0.decaf', '<') &&
+			version_compare($version_string, '4.7.0.decaf', '>=')
+		) {
+			//          echo "$version_string can be migrated from";
+			return true;
+		} elseif (! $version_string) {
+			//          echo "no version string provided: $version_string";
+			// no version string provided... this must be pre 4.3
+			return false;// changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
+			//          echo "$version_string doesnt apply";
+			return false;
+		}
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function schema_changes_before_migration()
+	{
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+
+		$table_name = 'esp_answer';
+		$sql        = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_attendee_meta';
-        $sql        = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
+		$table_name = 'esp_attendee_meta';
+		$sql        = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
 						ATT_ID bigint(20) unsigned NOT NULL,
 						ATT_fname varchar(45) NOT NULL,
 						ATT_lname varchar(45) NOT	NULL,
@@ -119,10 +119,10 @@ 
 							PRIMARY KEY  (ATTM_ID),
 								KEY ATT_ID (ATT_ID),
 								KEY ATT_email (ATT_email(191))";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_country';
-        $sql        = "CNT_ISO varchar(2) collate utf8_bin NOT NULL,
+		$table_name = 'esp_country';
+		$sql        = "CNT_ISO varchar(2) collate utf8_bin NOT NULL,
 					  CNT_ISO3 varchar(3) collate utf8_bin NOT NULL,
 					  RGN_ID tinyint(3) unsigned DEFAULT NULL,
 					  CNT_name varchar(45) collate utf8_bin NOT NULL,
@@ -138,20 +138,20 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_currency';
-        $sql        = "CUR_code varchar(6) collate utf8_bin NOT NULL,
+		$table_name = 'esp_currency';
+		$sql        = "CUR_code varchar(6) collate utf8_bin NOT NULL,
 				CUR_single varchar(45) collate utf8_bin DEFAULT 'dollar',
 				CUR_plural varchar(45) collate utf8_bin DEFAULT 'dollars',
 				CUR_sign varchar(45) collate utf8_bin DEFAULT '$',
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_datetime';
-        $sql        = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_datetime';
+		$sql        = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				  EVT_ID bigint(20) unsigned NOT NULL,
 				  DTT_name varchar(255) NOT NULL DEFAULT '',
 				  DTT_description text NOT NULL,
@@ -167,10 +167,10 @@ 
 						KEY DTT_EVT_start (DTT_EVT_start),
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_event_meta';
-        $sql        = "
+		$table_name = 'esp_event_meta';
+		$sql        = "
 			EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 			EVT_ID bigint(20) unsigned NOT NULL,
 			EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -186,38 +186,38 @@ 
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID),
 			KEY EVT_ID (EVT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_event_question_group';
-        $sql        = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql        = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY QSG_ID (QSG_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_event_venue';
-        $sql        = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql        = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_extra_meta';
-        $sql        = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql        = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_extra_join';
-        $sql        = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_join';
+		$sql        = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
 				EXJ_first_model_id varchar(6) NOT NULL,
 				EXJ_first_model_name varchar(20) NOT NULL,
 				EXJ_second_model_id varchar(6) NOT NULL,
@@ -225,10 +225,10 @@ 
 				PRIMARY KEY  (EXJ_ID),
 				KEY first_model (EXJ_first_model_name,EXJ_first_model_id),
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_line_item';
-        $sql        = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql        = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -247,10 +247,10 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_log';
-        $sql        = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_log';
+		$sql        = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
 				LOG_time datetime DEFAULT NULL,
 				OBJ_ID varchar(45) DEFAULT NULL,
 				OBJ_type varchar(45) DEFAULT NULL,
@@ -261,20 +261,20 @@ 
 				KEY LOG_time (LOG_time),
 				KEY OBJ (OBJ_type,OBJ_ID),
 				KEY LOG_type (LOG_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_message_template';
-        $sql        = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message_template';
+		$sql        = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					GRP_ID int(10) unsigned NOT NULL,
 					MTP_context varchar(50) NOT NULL,
 					MTP_template_field varchar(30) NOT NULL,
 					MTP_content text NOT NULL,
 					PRIMARY KEY  (MTP_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_message_template_group';
-        $sql        = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message_template_group';
+		$sql        = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					MTP_user_id int(10) NOT NULL DEFAULT '1',
 					MTP_name varchar(245) NOT NULL DEFAULT '',
 					MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -286,19 +286,19 @@ 
 					MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_event_message_template';
-        $sql        = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_message_template';
+		$sql        = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 					GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_payment';
-        $sql        = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_payment';
+		$sql        = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					TXN_ID int(10) unsigned DEFAULT NULL,
 					STS_ID varchar(3) collate utf8_bin DEFAULT NULL,
 					PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -315,10 +315,10 @@ 
 					PRIMARY KEY  (PAY_ID),
 					KEY PAY_timestamp (PAY_timestamp),
 					KEY TXN_ID (TXN_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_payment_method';
-        $sql        = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_payment_method';
+		$sql        = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
 				PMD_type varchar(124) DEFAULT NULL,
 				PMD_name varchar(255) DEFAULT NULL,
 				PMD_desc text,
@@ -334,36 +334,36 @@ 
 				PRIMARY KEY  (PMD_ID),
 				UNIQUE KEY PMD_slug_UNIQUE (PMD_slug),
 				KEY PMD_type (PMD_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = "esp_ticket_price";
-        $sql        = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket_price";
+		$sql        = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRC_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (TKP_ID),
 					  KEY TKT_ID (TKT_ID),
 					  KEY PRC_ID (PRC_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = "esp_datetime_ticket";
-        $sql        = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_datetime_ticket";
+		$sql        = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  DTT_ID int(10) unsigned NOT NULL,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (DTK_ID),
 					  KEY DTT_ID (DTT_ID),
 					  KEY TKT_ID (TKT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = "esp_ticket_template";
-        $sql        = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket_template";
+		$sql        = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_name varchar(45) NOT NULL,
 					  TTM_description text,
 					  TTM_file varchar(45),
 					  PRIMARY KEY  (TTM_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_question';
-        $sql        = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql        = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) NOT NULL DEFAULT "",
@@ -377,20 +377,20 @@ 
 					QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID),
 					KEY QST_order (QST_order)';
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_question_group_question';
-        $sql        = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql        = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSG_ID_order (QSG_ID,QGQ_order)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_question_option';
-        $sql        = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql        = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
@@ -400,10 +400,10 @@ 
 					PRIMARY KEY  (QSO_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSO_order (QSO_order)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_registration';
-        $sql        = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_registration';
+		$sql        = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  EVT_ID bigint(20) unsigned NOT NULL,
 					  ATT_ID bigint(20) unsigned NOT NULL,
 					  TXN_ID int(10) unsigned NOT NULL,
@@ -427,20 +427,20 @@ 
 					  KEY TKT_ID (TKT_ID),
 					  KEY EVT_ID (EVT_ID),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_registration_payment';
-        $sql        = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_registration_payment';
+		$sql        = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  REG_ID int(10) unsigned NOT NULL,
 					  PAY_ID int(10) unsigned NULL,
 					  RPY_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRIMARY KEY  (RPY_ID),
 					  KEY REG_ID (REG_ID),
 					  KEY PAY_ID (PAY_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_checkin';
-        $sql        = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql        = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -448,10 +448,10 @@ 
 					PRIMARY KEY  (CHK_ID),
 					KEY REG_ID (REG_ID),
 					KEY DTT_ID (DTT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_state';
-        $sql        = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_state';
+		$sql        = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 					  CNT_ISO varchar(2) collate utf8_bin NOT NULL,
 					  STA_abbrev varchar(24) collate utf8_bin NOT NULL,
 					  STA_name varchar(100) collate utf8_bin NOT NULL,
@@ -459,10 +459,10 @@ 
 					  PRIMARY KEY  (STA_ID),
 					  KEY STA_abbrev (STA_abbrev),
 					  KEY CNT_ISO (CNT_ISO)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_status';
-        $sql        = "STS_ID varchar(3) NOT NULL,
+		$table_name = 'esp_status';
+		$sql        = "STS_ID varchar(3) NOT NULL,
 					  STS_code varchar(45) NOT NULL,
 					  STS_type varchar(45) NOT NULL,
 					  STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -470,10 +470,10 @@ 
 					  STS_open tinyint(1) NOT NULL DEFAULT 1,
 					  UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 					  KEY STS_type (STS_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_transaction';
-        $sql        = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_transaction';
+		$sql        = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					  TXN_total decimal(10,3) DEFAULT '0.00',
 					  TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -485,10 +485,10 @@ 
 					  PRIMARY KEY  (TXN_ID),
 					  KEY TXN_timestamp (TXN_timestamp),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = 'esp_venue_meta';
-        $sql        = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_venue_meta';
+		$sql        = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -507,10 +507,10 @@ 
 			KEY VNU_ID (VNU_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
-        // modified tables
-        $table_name = "esp_price";
-        $sql        = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql);
+		// modified tables
+		$table_name = "esp_price";
+		$sql        = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  PRT_ID tinyint(3) unsigned NOT NULL,
 					  PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRC_name varchar(245) NOT NULL,
@@ -523,10 +523,10 @@ 
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID),
 					  KEY PRT_ID (PRT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = "esp_price_type";
-        $sql        = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_price_type";
+		$sql        = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				  PRT_name varchar(45) NOT NULL,
 				  PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				  PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -535,10 +535,10 @@ 
 				  PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				  UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				  PRIMARY KEY  (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql);
+		$this->_table_has_not_changed_since_previous($table_name, $sql);
 
-        $table_name = "esp_ticket";
-        $sql        = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket";
+		$sql        = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_ID int(10) unsigned NOT NULL,
 					  TKT_name varchar(245) NOT NULL DEFAULT '',
 					  TKT_description text NOT NULL,
@@ -560,10 +560,10 @@ 
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID),
 					  KEY TKT_start_date (TKT_start_date)";
-        $this->_table_is_changed_in_this_version($table_name, $sql);
+		$this->_table_is_changed_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_question_group';
-        $sql        = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group';
+		$sql        = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -576,225 +576,225 @@ 
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 					KEY QSG_order (QSG_order)';
-        $this->_table_is_changed_in_this_version($table_name, $sql);
-        /** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
-        $script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
-        // (because many need to convert old string states to foreign keys into the states table)
-        $script_4_1_defaults->insert_default_states();
-        $script_4_1_defaults->insert_default_countries();
-        /** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
-        $script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
-        $script_4_5_defaults->insert_default_price_types();
-        $script_4_5_defaults->insert_default_prices();
-        $script_4_5_defaults->insert_default_tickets();
-        /** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
-        $script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
-        $script_4_6_defaults->add_default_admin_only_payments();
-        $script_4_6_defaults->insert_default_currencies();
-        $this->verify_new_countries();
-        $this->verify_new_currencies();
-        return true;
-    }
-
-
-    /**
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function schema_changes_after_migration()
-    {
-        $this->fix_non_default_taxes();
-        // this is actually the same as the last DMS
-        /** @var EE_DMS_Core_4_7_0 $script_4_7_defaults */
-        $script_4_7_defaults = EE_Registry::instance()->load_dms('Core_4_7_0');
-        return $script_4_7_defaults->schema_changes_after_migration();
-    }
-
-
-    public function migration_page_hooks()
-    {
-    }
-
-
-    /**
-     * verifies each of the new countries exists that somehow we missed in 4.1
-     *
-     * @throws EE_Error
-     */
-    public function verify_new_countries()
-    {
-        // a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
-        // how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
-        // currency symbols: http://www.xe.com/symbols.php
-        // CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
-        // ('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
-        $newer_countries = [
-            ['AX', 'ALA', 0, 'Åland Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0],
-            ['BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0],
-            ['CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0],
-            ['GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0],
-            ['IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0],
-            ['JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0],
-            ['MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0],
-            ['ME', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0],
-            ['RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+381', 1, 0],
-            ['SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0],
-            ['SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0],
-            ['XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+383', 0, 0],
-            ['YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0],
-            [
-                'BQ',
-                'BES',
-                0,
-                'Bonaire, Saint Eustatius and Saba',
-                'USD',
-                'Dollar',
-                'Dollars',
-                '$',
-                1,
-                2,
-                '+599',
-                0,
-                0,
-            ],
-            ['BV', 'BVT', 0, 'Bouvet Island', 'NOK', 'Krone', 'Krones', 'kr', 1, 2, '+47', 0, 0],
-            ['IO', 'IOT', 0, 'British Indian Ocean Territory', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+246', 0, 0],
-            ['CX', 'CXR', 0, 'Christmas Island', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+61', 0, 0],
-            ['CC', 'CCK', 0, 'Cocos (Keeling) Islands', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+891', 0, 0],
-            [
-                'HM',
-                'HMD',
-                0,
-                'Heard Island and McDonald Islands',
-                'AUD',
-                'Dollar',
-                'Dollars',
-                '$',
-                1,
-                2,
-                '+891',
-                0,
-                0,
-            ],
-            ['PS', 'PSE', 0, 'Palestinian Territory', 'ILS', 'Shekel', 'Shekels', '₪', 1, 2, '+970', 0, 0],
-            [
-                'GS',
-                'SGS',
-                0,
-                'South Georgia and the South Sandwich Islands',
-                'GBP',
-                'Pound',
-                'Pounds',
-                '£',
-                1,
-                2,
-                '+500',
-                0,
-                0,
-            ],
-            ['TL', 'TLS', 0, 'Timor-Leste', 'USD', 'Dollar', 'Dollars', '$', 1, 2, '+670', 0, 0],
-            ['TF', 'ATF', 0, 'French Southern Territories', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+262', 0, 0],
-            [
-                'UM',
-                'UMI',
-                0,
-                'United States Minor Outlying Islands',
-                'USD',
-                'Dollar',
-                'Dollars',
-                '$',
-                1,
-                2,
-                '+1',
-                0,
-                0,
-            ],
-        ];
-        global $wpdb;
-        $country_table  = $wpdb->prefix . "esp_country";
-        $country_format = [
-            "CNT_ISO"         => '%s',
-            "CNT_ISO3"        => '%s',
-            "RGN_ID"          => '%d',
-            "CNT_name"        => '%s',
-            "CNT_cur_code"    => '%s',
-            "CNT_cur_single"  => '%s',
-            "CNT_cur_plural"  => '%s',
-            "CNT_cur_sign"    => '%s',
-            "CNT_cur_sign_b4" => '%d',
-            "CNT_cur_dec_plc" => '%d',
-            "CNT_tel_code"    => '%s',
-            "CNT_is_EU"       => '%d',
-            "CNT_active"      => '%d',
-        ];
-        if ($this->_get_table_analysis()->tableExists($country_table)) {
-            foreach ($newer_countries as $country) {
-                $SQL       = "SELECT COUNT('CNT_ISO') FROM $country_table WHERE CNT_ISO='$country[0]' LIMIT 1";
-                $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
-                    $wpdb->insert(
-                        $country_table,
-                        array_combine(array_keys($country_format), $country),
-                        $country_format
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     * verifies each of the new currencies exists that somehow we missed in 4.6
-     *
-     * @throws EE_Error
-     */
-    public function verify_new_currencies()
-    {
-        // a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
-        // how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
-        // currency symbols: http://www.xe.com/symbols.php
-        // CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
-        // ( 'EUR',  'Euro',  'Euros',  '€',  2,1),
-        $newer_currencies = [
-            ['RSD', 'Dinar', 'Dinars', '', 3, 1],
-        ];
-        global $wpdb;
-        $currency_table  = $wpdb->prefix . "esp_currency";
-        $currency_format = [
-            "CUR_code"    => '%s',
-            "CUR_single"  => '%s',
-            "CUR_plural"  => '%s',
-            "CUR_sign"    => '%s',
-            "CUR_dec_plc" => '%d',
-            "CUR_active"  => '%d',
-        ];
-        if ($this->_get_table_analysis()->tableExists($currency_table)) {
-            foreach ($newer_currencies as $currency) {
-                $SQL       = "SELECT COUNT('CUR_code') FROM $currency_table WHERE CUR_code='$currency[0]' LIMIT 1";
-                $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
-                    $wpdb->insert(
-                        $currency_table,
-                        array_combine(array_keys($currency_format), $currency),
-                        $currency_format
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
-     * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
-     * we should be able to stop doing this in 4.9
-     */
-    public function fix_non_default_taxes()
-    {
-        global $wpdb;
-        $query = $wpdb->prepare(
-            "UPDATE
+		$this->_table_is_changed_in_this_version($table_name, $sql);
+		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
+		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
+		// (because many need to convert old string states to foreign keys into the states table)
+		$script_4_1_defaults->insert_default_states();
+		$script_4_1_defaults->insert_default_countries();
+		/** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
+		$script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
+		$script_4_5_defaults->insert_default_price_types();
+		$script_4_5_defaults->insert_default_prices();
+		$script_4_5_defaults->insert_default_tickets();
+		/** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
+		$script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
+		$script_4_6_defaults->add_default_admin_only_payments();
+		$script_4_6_defaults->insert_default_currencies();
+		$this->verify_new_countries();
+		$this->verify_new_currencies();
+		return true;
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function schema_changes_after_migration()
+	{
+		$this->fix_non_default_taxes();
+		// this is actually the same as the last DMS
+		/** @var EE_DMS_Core_4_7_0 $script_4_7_defaults */
+		$script_4_7_defaults = EE_Registry::instance()->load_dms('Core_4_7_0');
+		return $script_4_7_defaults->schema_changes_after_migration();
+	}
+
+
+	public function migration_page_hooks()
+	{
+	}
+
+
+	/**
+	 * verifies each of the new countries exists that somehow we missed in 4.1
+	 *
+	 * @throws EE_Error
+	 */
+	public function verify_new_countries()
+	{
+		// a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
+		// how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
+		// currency symbols: http://www.xe.com/symbols.php
+		// CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
+		// ('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
+		$newer_countries = [
+			['AX', 'ALA', 0, 'Åland Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0],
+			['BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0],
+			['CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0],
+			['GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0],
+			['IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0],
+			['JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0],
+			['MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0],
+			['ME', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0],
+			['RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+381', 1, 0],
+			['SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0],
+			['SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0],
+			['XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+383', 0, 0],
+			['YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0],
+			[
+				'BQ',
+				'BES',
+				0,
+				'Bonaire, Saint Eustatius and Saba',
+				'USD',
+				'Dollar',
+				'Dollars',
+				'$',
+				1,
+				2,
+				'+599',
+				0,
+				0,
+			],
+			['BV', 'BVT', 0, 'Bouvet Island', 'NOK', 'Krone', 'Krones', 'kr', 1, 2, '+47', 0, 0],
+			['IO', 'IOT', 0, 'British Indian Ocean Territory', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+246', 0, 0],
+			['CX', 'CXR', 0, 'Christmas Island', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+61', 0, 0],
+			['CC', 'CCK', 0, 'Cocos (Keeling) Islands', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+891', 0, 0],
+			[
+				'HM',
+				'HMD',
+				0,
+				'Heard Island and McDonald Islands',
+				'AUD',
+				'Dollar',
+				'Dollars',
+				'$',
+				1,
+				2,
+				'+891',
+				0,
+				0,
+			],
+			['PS', 'PSE', 0, 'Palestinian Territory', 'ILS', 'Shekel', 'Shekels', '₪', 1, 2, '+970', 0, 0],
+			[
+				'GS',
+				'SGS',
+				0,
+				'South Georgia and the South Sandwich Islands',
+				'GBP',
+				'Pound',
+				'Pounds',
+				'£',
+				1,
+				2,
+				'+500',
+				0,
+				0,
+			],
+			['TL', 'TLS', 0, 'Timor-Leste', 'USD', 'Dollar', 'Dollars', '$', 1, 2, '+670', 0, 0],
+			['TF', 'ATF', 0, 'French Southern Territories', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+262', 0, 0],
+			[
+				'UM',
+				'UMI',
+				0,
+				'United States Minor Outlying Islands',
+				'USD',
+				'Dollar',
+				'Dollars',
+				'$',
+				1,
+				2,
+				'+1',
+				0,
+				0,
+			],
+		];
+		global $wpdb;
+		$country_table  = $wpdb->prefix . "esp_country";
+		$country_format = [
+			"CNT_ISO"         => '%s',
+			"CNT_ISO3"        => '%s',
+			"RGN_ID"          => '%d',
+			"CNT_name"        => '%s',
+			"CNT_cur_code"    => '%s',
+			"CNT_cur_single"  => '%s',
+			"CNT_cur_plural"  => '%s',
+			"CNT_cur_sign"    => '%s',
+			"CNT_cur_sign_b4" => '%d',
+			"CNT_cur_dec_plc" => '%d',
+			"CNT_tel_code"    => '%s',
+			"CNT_is_EU"       => '%d',
+			"CNT_active"      => '%d',
+		];
+		if ($this->_get_table_analysis()->tableExists($country_table)) {
+			foreach ($newer_countries as $country) {
+				$SQL       = "SELECT COUNT('CNT_ISO') FROM $country_table WHERE CNT_ISO='$country[0]' LIMIT 1";
+				$countries = $wpdb->get_var($SQL);
+				if (! $countries) {
+					$wpdb->insert(
+						$country_table,
+						array_combine(array_keys($country_format), $country),
+						$country_format
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * verifies each of the new currencies exists that somehow we missed in 4.6
+	 *
+	 * @throws EE_Error
+	 */
+	public function verify_new_currencies()
+	{
+		// a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
+		// how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
+		// currency symbols: http://www.xe.com/symbols.php
+		// CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
+		// ( 'EUR',  'Euro',  'Euros',  '€',  2,1),
+		$newer_currencies = [
+			['RSD', 'Dinar', 'Dinars', '', 3, 1],
+		];
+		global $wpdb;
+		$currency_table  = $wpdb->prefix . "esp_currency";
+		$currency_format = [
+			"CUR_code"    => '%s',
+			"CUR_single"  => '%s',
+			"CUR_plural"  => '%s',
+			"CUR_sign"    => '%s',
+			"CUR_dec_plc" => '%d',
+			"CUR_active"  => '%d',
+		];
+		if ($this->_get_table_analysis()->tableExists($currency_table)) {
+			foreach ($newer_currencies as $currency) {
+				$SQL       = "SELECT COUNT('CUR_code') FROM $currency_table WHERE CUR_code='$currency[0]' LIMIT 1";
+				$countries = $wpdb->get_var($SQL);
+				if (! $countries) {
+					$wpdb->insert(
+						$currency_table,
+						array_combine(array_keys($currency_format), $currency),
+						$currency_format
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
+	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
+	 * we should be able to stop doing this in 4.9
+	 */
+	public function fix_non_default_taxes()
+	{
+		global $wpdb;
+		$query = $wpdb->prepare(
+			"UPDATE
 				{$wpdb->prefix}esp_price p INNER JOIN
 				{$wpdb->prefix}esp_price_type pt ON p.PRT_ID = pt.PRT_ID
 			SET
@@ -803,8 +803,8 @@ 
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
 					",
-            EEM_Price_Type::base_type_tax
-        );
-        $wpdb->query($query);
-    }
+			EEM_Price_Type::base_type_tax
+		);
+		$wpdb->query($query);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -7,12 +7,12 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages            = glob(EE_CORE . 'data_migration_scripts/4_8_0_stages/*');
+$stages            = glob(EE_CORE.'data_migration_scripts/4_8_0_stages/*');
 $class_to_filepath = [];
 foreach ($stages as $filepath) {
     $matches = [];
     preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+    $class_to_filepath[$matches[1]] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
@@ -71,10 +71,10 @@ 
         ) {
             //          echo "$version_string can be migrated from";
             return true;
-        } elseif (! $version_string) {
+        } elseif ( ! $version_string) {
             //          echo "no version string provided: $version_string";
             // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
+            return false; // changed mind. dont want people thinking they should migrate yet because they cant
         } else {
             //          echo "$version_string doesnt apply";
             return false;
@@ -89,9 +89,9 @@ 
      */
     public function schema_changes_before_migration()
     {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $now_in_mysql = current_time('mysql', true);
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
 
         $table_name = 'esp_answer';
         $sql        = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -712,7 +712,7 @@ 
             ],
         ];
         global $wpdb;
-        $country_table  = $wpdb->prefix . "esp_country";
+        $country_table  = $wpdb->prefix."esp_country";
         $country_format = [
             "CNT_ISO"         => '%s',
             "CNT_ISO3"        => '%s',
@@ -732,7 +732,7 @@ 
             foreach ($newer_countries as $country) {
                 $SQL       = "SELECT COUNT('CNT_ISO') FROM $country_table WHERE CNT_ISO='$country[0]' LIMIT 1";
                 $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
+                if ( ! $countries) {
                     $wpdb->insert(
                         $country_table,
                         array_combine(array_keys($country_format), $country),
@@ -760,7 +760,7 @@ 
             ['RSD', 'Dinar', 'Dinars', '', 3, 1],
         ];
         global $wpdb;
-        $currency_table  = $wpdb->prefix . "esp_currency";
+        $currency_table  = $wpdb->prefix."esp_currency";
         $currency_format = [
             "CUR_code"    => '%s',
             "CUR_single"  => '%s',
@@ -773,7 +773,7 @@ 
             foreach ($newer_currencies as $currency) {
                 $SQL       = "SELECT COUNT('CUR_code') FROM $currency_table WHERE CUR_code='$currency[0]' LIMIT 1";
                 $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
+                if ( ! $countries) {
                     $wpdb->insert(
                         $currency_table,
                         array_combine(array_keys($currency_format), $currency),

core/data_migration_scripts/EE_DMS_Core_4_1_0.dms.php

Indentation +1256 added lines, -1256 removed lines

@@ -10,11 +10,11 @@ 
 $stages            = glob(EE_CORE . 'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = [];
 if (! empty($stages)) {
-    foreach ($stages as $filepath) {
-        $matches = [];
-        preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-        $class_to_filepath[ $matches[1] ] = $filepath;
-    }
+	foreach ($stages as $filepath) {
+		$matches = [];
+		preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+		$class_to_filepath[ $matches[1] ] = $filepath;
+	}
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages', $class_to_filepath);
@@ -39,92 +39,92 @@ 
 class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base
 {
 
-    /**
-     * EE_DMS_Core_4_1_0 constructor.
-     *
-     * @param TableManager|null  $table_manager
-     * @param TableAnalysis|null $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name      =
-            esc_html__("Data Migration from Event Espresso 3 to Event Espresso 4.1.0", "event_espresso");
-        $this->_priority         = 10;
-        $this->_migration_stages = [
-            new EE_DMS_4_1_0_org_options(),
-            new EE_DMS_4_1_0_shortcodes(),
-            new EE_DMS_4_1_0_gateways(),
-            new EE_DMS_4_1_0_events(),
-            new EE_DMS_4_1_0_prices(),
-            new EE_DMS_4_1_0_category_details(),
-            new EE_DMS_4_1_0_event_category(),
-            new EE_DMS_4_1_0_venues(),
-            new EE_DMS_4_1_0_event_venue(),
-            new EE_DMS_4_1_0_question_groups(),
-            new EE_DMS_4_1_0_questions(),
-            new EE_DMS_4_1_0_question_group_question(),
-            new EE_DMS_4_1_0_event_question_group(),
-            new EE_DMS_4_1_0_attendees(),
-            new EE_DMS_4_1_0_line_items(),
-            new EE_DMS_4_1_0_answers(),
-            new EE_DMS_4_1_0_checkins(),
-        ];
-        parent::__construct($table_manager, $table_analysis);
-    }
-
-
-    /**
-     * Checks if this 3.1 Check-in table exists. If it doesn't we can't migrate Check-ins
-     *
-     * @return boolean
-     * @global wpdb $wpdb
-     */
-    private function _checkin_table_exists(): bool
-    {
-        global $wpdb;
-        return (bool) $wpdb->get_results(
-            "SHOW TABLES LIKE '" . $wpdb->prefix . "events_attendee_checkin" . "'"
-        );
-    }
-
-
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.0.0.decaf', '<') && version_compare($version_string, '3.1.26', '>=')) {
-            //          echo "$version_string can be migrated fro";
-            return true;
-        } elseif (! $version_string) {
-            //          echo "no version string provided: $version_string";
-            // no version string provided... this must be pre 4.1
-            // because since 4.1 we're
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
-            //          echo "$version_string doesnt apply";
-            return false;
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function schema_changes_before_migration()
-    {
-        // relies on 4.1's EEH_Activation::create_table
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-
-        $table_name = 'esp_answer';
-        $sql        = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 * EE_DMS_Core_4_1_0 constructor.
+	 *
+	 * @param TableManager|null  $table_manager
+	 * @param TableAnalysis|null $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name      =
+			esc_html__("Data Migration from Event Espresso 3 to Event Espresso 4.1.0", "event_espresso");
+		$this->_priority         = 10;
+		$this->_migration_stages = [
+			new EE_DMS_4_1_0_org_options(),
+			new EE_DMS_4_1_0_shortcodes(),
+			new EE_DMS_4_1_0_gateways(),
+			new EE_DMS_4_1_0_events(),
+			new EE_DMS_4_1_0_prices(),
+			new EE_DMS_4_1_0_category_details(),
+			new EE_DMS_4_1_0_event_category(),
+			new EE_DMS_4_1_0_venues(),
+			new EE_DMS_4_1_0_event_venue(),
+			new EE_DMS_4_1_0_question_groups(),
+			new EE_DMS_4_1_0_questions(),
+			new EE_DMS_4_1_0_question_group_question(),
+			new EE_DMS_4_1_0_event_question_group(),
+			new EE_DMS_4_1_0_attendees(),
+			new EE_DMS_4_1_0_line_items(),
+			new EE_DMS_4_1_0_answers(),
+			new EE_DMS_4_1_0_checkins(),
+		];
+		parent::__construct($table_manager, $table_analysis);
+	}
+
+
+	/**
+	 * Checks if this 3.1 Check-in table exists. If it doesn't we can't migrate Check-ins
+	 *
+	 * @return boolean
+	 * @global wpdb $wpdb
+	 */
+	private function _checkin_table_exists(): bool
+	{
+		global $wpdb;
+		return (bool) $wpdb->get_results(
+			"SHOW TABLES LIKE '" . $wpdb->prefix . "events_attendee_checkin" . "'"
+		);
+	}
+
+
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.0.0.decaf', '<') && version_compare($version_string, '3.1.26', '>=')) {
+			//          echo "$version_string can be migrated fro";
+			return true;
+		} elseif (! $version_string) {
+			//          echo "no version string provided: $version_string";
+			// no version string provided... this must be pre 4.1
+			// because since 4.1 we're
+			return false;// changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
+			//          echo "$version_string doesnt apply";
+			return false;
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function schema_changes_before_migration()
+	{
+		// relies on 4.1's EEH_Activation::create_table
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+
+		$table_name = 'esp_answer';
+		$sql        = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_attendee_meta';
-        $sql        = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_attendee_meta';
+		$sql        = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 						ATT_ID bigint(20) unsigned NOT NULL,
 						ATT_fname varchar(45) NOT NULL,
 						ATT_lname varchar(45) NOT NULL,
@@ -140,10 +140,10 @@ 
 								KEY ATT_fname (ATT_fname),
 								KEY ATT_lname (ATT_lname),
 								KEY ATT_email (ATT_email(191))";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_country';
-        $sql        = "CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
+		$table_name = 'esp_country';
+		$sql        = "CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
 					  CNT_ISO3 varchar(3) COLLATE utf8_bin NOT NULL,
 					  RGN_ID tinyint(3) unsigned DEFAULT NULL,
 					  CNT_name varchar(45) COLLATE utf8_bin NOT NULL,
@@ -159,10 +159,10 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_datetime';
-        $sql        = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_datetime';
+		$sql        = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				  EVT_ID bigint(20) unsigned NOT NULL,
 				  DTT_EVT_start datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 				  DTT_EVT_end datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -175,10 +175,10 @@ 
 						PRIMARY KEY  (DTT_ID),
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_event_meta';
-        $sql        = "
+		$table_name = 'esp_event_meta';
+		$sql        = "
 			EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 			EVT_ID bigint(20) unsigned NOT NULL,
 			EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -193,35 +193,35 @@ 
 			EVT_external_URL varchar(200) NULL,
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_event_question_group';
-        $sql        = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql        = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_event_venue';
-        $sql        = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql        = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_extra_meta';
-        $sql        = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql        = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_line_item';
-        $sql        = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql        = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -237,20 +237,20 @@ 
 				OBJ_ID int(11) DEFAULT NULL,
 				OBJ_type varchar(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_message_template';
-        $sql        = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message_template';
+		$sql        = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					GRP_ID int(10) unsigned NOT NULL,
 					MTP_context varchar(50) NOT NULL,
 					MTP_template_field varchar(30) NOT NULL,
 					MTP_content text NOT NULL,
 					PRIMARY KEY  (MTP_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_message_template_group';
-        $sql        = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message_template_group';
+		$sql        = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned DEFAULT NULL,
 					MTP_user_id int(10) NOT NULL DEFAULT '1',
 					MTP_messenger varchar(30) NOT NULL,
@@ -262,10 +262,10 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_payment';
-        $sql        = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_payment';
+		$sql        = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					TXN_ID int(10) unsigned DEFAULT NULL,
 					STS_ID varchar(3) COLLATE utf8_bin DEFAULT NULL,
 					PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -281,10 +281,10 @@ 
 					PRIMARY KEY  (PAY_ID),
 					KEY TXN_ID (TXN_ID),
 					KEY PAY_timestamp (PAY_timestamp)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = "esp_ticket";
-        $sql        = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket";
+		$sql        = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_ID int(10) unsigned NOT NULL,
 					  TKT_name varchar(245) NOT NULL DEFAULT '',
 					  TKT_description text NOT NULL,
@@ -303,32 +303,32 @@ 
 					  TKT_parent int(10) unsigned DEFAULT '0',
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = "esp_ticket_price";
-        $sql        = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket_price";
+		$sql        = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRC_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (TKP_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = "esp_datetime_ticket";
-        $sql        = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_datetime_ticket";
+		$sql        = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  DTT_ID int(10) unsigned NOT NULL,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (DTK_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = "esp_ticket_template";
-        $sql        = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket_template";
+		$sql        = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_name varchar(45) NOT NULL,
 					  TTM_description text,
 					  TTM_file varchar(45),
 					  PRIMARY KEY  (TTM_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = "esp_price";
-        $sql        = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_price";
+		$sql        = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  PRT_ID tinyint(3) unsigned NOT NULL,
 					  PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRC_name varchar(245) NOT NULL,
@@ -339,10 +339,10 @@ 
 					  PRC_order tinyint(3) unsigned NOT NULL DEFAULT '0',
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = "esp_price_type";
-        $sql        = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_price_type";
+		$sql        = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				  PRT_name varchar(45) NOT NULL,
 				  PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				  PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -350,10 +350,10 @@ 
 				  PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				  UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				  PRIMARY KEY  (PRT_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_question';
-        $sql        = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql        = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) DEFAULT NULL,
@@ -365,11 +365,11 @@ 
 					QST_wp_user bigint(20) unsigned NULL,
 					QST_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-        $this->_table_is_new_in_this_version($table_name, $sql);
-        $this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
+		$this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
-        $table_name = 'esp_question_group';
-        $sql        = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group';
+		$sql        = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -380,26 +380,26 @@ 
 					QSG_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_question_group_question';
-        $sql        = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql        = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					PRIMARY KEY  (QGQ_ID) ";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_question_option';
-        $sql        = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql        = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QSO_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_registration';
-        $sql        = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_registration';
+		$sql        = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  EVT_ID bigint(20) unsigned NOT NULL,
 					  ATT_ID bigint(20) unsigned NOT NULL,
 					  TXN_ID int(10) unsigned NOT NULL,
@@ -422,28 +422,28 @@ 
 					  KEY STS_ID (STS_ID),
 					  KEY REG_url_link (REG_url_link),
 					  KEY REG_code (REG_code)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_checkin';
-        $sql        = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql        = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
 					CHK_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					PRIMARY KEY  (CHK_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_state';
-        $sql        = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_state';
+		$sql        = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 					  CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
 					  STA_abbrev varchar(6) COLLATE utf8_bin NOT NULL,
 					  STA_name varchar(100) COLLATE utf8_bin NOT NULL,
 					  STA_active tinyint(1) DEFAULT '1',
 					  PRIMARY KEY  (STA_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_status';
-        $sql        = "STS_ID varchar(3) COLLATE utf8_bin NOT NULL,
+		$table_name = 'esp_status';
+		$sql        = "STS_ID varchar(3) COLLATE utf8_bin NOT NULL,
 					  STS_code varchar(45) COLLATE utf8_bin NOT NULL,
 					  STS_type set('event','registration','transaction','payment','email') COLLATE utf8_bin NOT NULL,
 					  STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -451,10 +451,10 @@ 
 					  STS_open tinyint(1) NOT NULL DEFAULT 1,
 					  UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 					  KEY STS_type (STS_type)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_transaction';
-        $sql        = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_transaction';
+		$sql        = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					  TXN_total decimal(10,3) DEFAULT '0.00',
 					  TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -464,10 +464,10 @@ 
 					  PRIMARY KEY  (TXN_ID),
 					  KEY TXN_timestamp (TXN_timestamp),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
+		$this->_table_is_new_in_this_version($table_name, $sql);
 
-        $table_name = 'esp_venue_meta';
-        $sql        = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_venue_meta';
+		$sql        = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -485,51 +485,51 @@ 
 			PRIMARY KEY  (VNUM_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_is_new_in_this_version($table_name, $sql);
-        // setting up the default stats and countries is also essential for the data migrations to run
-        // (because many need to convert old string states to foreign keys into the states table)
-        $this->insert_default_states();
-        $this->insert_default_countries();
-        // setting up default prices, price types, and tickets is also essential for the price migrations
-        $this->insert_default_price_types();
-        $this->insert_default_prices();
-        $this->insert_default_tickets();
-        // setting up the config wp option pretty well counts as a 'schema change', or at least should happen here
-        EE_Config::instance()->update_espresso_config();
-        return true;
-    }
-
-
-    /**
-     * Yes we could have cleaned up the ee3 tables here. But just in case someone
-     * didn't backup their DB, and decides they want ot keep using EE3, we'll
-     * leave them for now. Maybe remove them in 4.5 or something.
-     *
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        return true;
-    }
-
-
-    /**
-     * insert_default_states
-     *
-     * @access public
-     * @static
-     * @return void
-     * @throws EE_Error
-     */
-    public function insert_default_states()
-    {
-        global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
-        if ($this->_get_table_analysis()->tableExists($state_table)) {
-            $SQL    = "SELECT COUNT('STA_ID') FROM " . $state_table;
-            $states = $wpdb->get_var($SQL);
-            if (! $states) {
-                $SQL = "INSERT INTO " . $state_table . "
+		$this->_table_is_new_in_this_version($table_name, $sql);
+		// setting up the default stats and countries is also essential for the data migrations to run
+		// (because many need to convert old string states to foreign keys into the states table)
+		$this->insert_default_states();
+		$this->insert_default_countries();
+		// setting up default prices, price types, and tickets is also essential for the price migrations
+		$this->insert_default_price_types();
+		$this->insert_default_prices();
+		$this->insert_default_tickets();
+		// setting up the config wp option pretty well counts as a 'schema change', or at least should happen here
+		EE_Config::instance()->update_espresso_config();
+		return true;
+	}
+
+
+	/**
+	 * Yes we could have cleaned up the ee3 tables here. But just in case someone
+	 * didn't backup their DB, and decides they want ot keep using EE3, we'll
+	 * leave them for now. Maybe remove them in 4.5 or something.
+	 *
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		return true;
+	}
+
+
+	/**
+	 * insert_default_states
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function insert_default_states()
+	{
+		global $wpdb;
+		$state_table = $wpdb->prefix . "esp_state";
+		if ($this->_get_table_analysis()->tableExists($state_table)) {
+			$SQL    = "SELECT COUNT('STA_ID') FROM " . $state_table;
+			$states = $wpdb->get_var($SQL);
+			if (! $states) {
+				$SQL = "INSERT INTO " . $state_table . "
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -603,29 +603,29 @@ 
 				(70, 'CA', 'NT', 'Northwest Territories', 1),
 				(71, 'CA', 'NU', 'Nunavut', 1),
 				(72, 'CA', 'YT', 'Yukon', 1);";
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-    /**
-     * insert_default_countries
-     *
-     * @access public
-     * @static
-     * @return void
-     * @throws EE_Error
-     */
-    public function insert_default_countries()
-    {
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        if ($this->_get_table_analysis()->tableExists($country_table)) {
-            $SQL       = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
-            $countries = $wpdb->get_var($SQL);
-            if (! $countries) {
-                $SQL = "INSERT INTO " . $country_table . "
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+	/**
+	 * insert_default_countries
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function insert_default_countries()
+	{
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		if ($this->_get_table_analysis()->tableExists($country_table)) {
+			$SQL       = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+			$countries = $wpdb->get_var($SQL);
+			if (! $countries) {
+				$SQL = "INSERT INTO " . $country_table . "
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -853,1051 +853,1051 @@ 
 				('ZA', 'ZAF', 0, 'South Africa', 'ZAR', 'Rand', 'Rands', 'R', 1, 2, '+27', 0, 0),
 				('ZM', 'ZMB', 0, 'Zambia', 'ZMK', 'Kwacha', 'Kwachas', '', 1, 2, '+260', 0, 0),
 				('ZW', 'ZWE', 0, 'Zimbabwe', 'ZWD', 'Dollar', 'Dollars', 'Z$', 1, 2, '+263', 0, 0);";
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-    /**
-     * insert_default_price_types
-     *
-     * @access public
-     * @static
-     * @return void
-     * @throws EE_Error
-     */
-    public function insert_default_price_types()
-    {
-        global $wpdb;
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL               = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-            $price_types_exist = $wpdb->get_var($SQL);
-            if (! $price_types_exist) {
-                $SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+	/**
+	 * insert_default_price_types
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function insert_default_price_types()
+	{
+		global $wpdb;
+		$price_type_table = $wpdb->prefix . "esp_price_type";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL               = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
+			if (! $price_types_exist) {
+				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
 							(1, '" . esc_html__('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
 							(2, '" . esc_html__('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
 							(3, '" . esc_html__('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
 							(4, '" . esc_html__('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
 							(5, '" . esc_html__('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-    /**
-     * insert_default_prices. We assume we're upgrading to regular here.
-     * If we're INSTALLING 4.1 CAF, then we add a few extra default prices
-     * when EEH_Activation's initialize_db_content is called via a hook in
-     * EE_Brewing_regular
-     *
-     * @access public
-     * @static
-     * @return void
-     * @throws EE_Error
-     */
-    public function insert_default_prices()
-    {
-        global $wpdb;
-        $price_table = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_table)) {
-            $SQL          = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
-            $prices_exist = $wpdb->get_var($SQL);
-            if (! $prices_exist) {
-                $SQL = "INSERT INTO $price_table
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+	/**
+	 * insert_default_prices. We assume we're upgrading to regular here.
+	 * If we're INSTALLING 4.1 CAF, then we add a few extra default prices
+	 * when EEH_Activation's initialize_db_content is called via a hook in
+	 * EE_Brewing_regular
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function insert_default_prices()
+	{
+		global $wpdb;
+		$price_table = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_table)) {
+			$SQL          = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
+			$prices_exist = $wpdb->get_var($SQL);
+			if (! $prices_exist) {
+				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Admission', '', 1, null, 0, 0, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-    /**
-     * insert default ticket
-     *
-     * @access public
-     * @static
-     * @return void
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    public function insert_default_tickets()
-    {
-        global $wpdb;
-        $ticket_table = $wpdb->prefix . "esp_ticket";
-        if ($this->_get_table_analysis()->tableExists($ticket_table)) {
-            $SQL           = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
-            $tickets_exist = $wpdb->get_var($SQL);
-            if (! $tickets_exist) {
-                $SQL = "INSERT INTO $ticket_table
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+	/**
+	 * insert default ticket
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	public function insert_default_tickets()
+	{
+		global $wpdb;
+		$ticket_table = $wpdb->prefix . "esp_ticket";
+		if ($this->_get_table_analysis()->tableExists($ticket_table)) {
+			$SQL           = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$tickets_exist = $wpdb->get_var($SQL);
+			if (! $tickets_exist) {
+				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
 					( 1, 0, '" .
-                       esc_html__("Free Ticket", "event_espresso") .
-                       "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-        $ticket_price_table = $wpdb->prefix . "esp_ticket_price";
-        if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
-            $SQL              = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
-            $ticket_prc_exist = $wpdb->get_var($SQL);
-            if (! $ticket_prc_exist) {
-                $SQL = "INSERT INTO $ticket_price_table
+					   esc_html__("Free Ticket", "event_espresso") .
+					   "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+		$ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+		if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
+			$SQL              = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$ticket_prc_exist = $wpdb->get_var($SQL);
+			if (! $ticket_prc_exist) {
+				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-    /**
-     * Gets a country entry as an array, or creates one if none is found. Much like EEM_Country::instance()->get_one(),
-     * but is independent of outside code which can change in future versions of EE. Also, $country_name CAN be a 3.1
-     * country ID (int), a 2-letter ISO, 3-letter ISO, or name
-     *
-     * @param int|string $country_name or country ID
-     * @return array where keys are columns, values are column values
-     * @throws EE_Error
-     * @throws EE_Error
-     * @global wpdb      $wpdb
-     */
-    public function get_or_create_country($country_name): array
-    {
-        if (! $country_name) {
-            throw new EE_Error(esc_html__("Could not get a country because country name is blank", "event_espresso"));
-        }
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        if (is_int($country_name)) {
-            $country_name = $this->get_iso_from_3_1_country_id($country_name);
-        }
-        $country = $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT * FROM $country_table WHERE
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+	/**
+	 * Gets a country entry as an array, or creates one if none is found. Much like EEM_Country::instance()->get_one(),
+	 * but is independent of outside code which can change in future versions of EE. Also, $country_name CAN be a 3.1
+	 * country ID (int), a 2-letter ISO, 3-letter ISO, or name
+	 *
+	 * @param int|string $country_name or country ID
+	 * @return array where keys are columns, values are column values
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 * @global wpdb      $wpdb
+	 */
+	public function get_or_create_country($country_name): array
+	{
+		if (! $country_name) {
+			throw new EE_Error(esc_html__("Could not get a country because country name is blank", "event_espresso"));
+		}
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		if (is_int($country_name)) {
+			$country_name = $this->get_iso_from_3_1_country_id($country_name);
+		}
+		$country = $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT * FROM $country_table WHERE
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
 			CNT_name LIKE %s LIMIT 1",
-                $country_name,
-                $country_name,
-                $country_name
-            ),
-            ARRAY_A
-        );
-        if (! $country) {
-            // insert a new one then
-            $cols_n_values = [
-                'CNT_ISO'         => $this->_find_available_country_iso(),
-                'CNT_ISO3'        => $this->_find_available_country_iso(3),
-                'RGN_ID'          => 0,
-                'CNT_name'        => $country_name,
-                'CNT_cur_code'    => 'USD',
-                'CNT_cur_single'  => 'Dollar',
-                'CNT_cur_plural'  => 'Dollars',
-                'CNT_cur_sign'    => '&#36;',
-                'CNT_cur_sign_b4' => true,
-                'CNT_cur_dec_plc' => 2,
-                'CNT_cur_dec_mrk' => '.',
-                'CNT_cur_thsnds'  => ',',
-                'CNT_tel_code'    => '+1',
-                'CNT_is_EU'       => false,
-                'CNT_active'      => true,
-            ];
-            $data_types    = [
-                '%s',// CNT_ISO
-                '%s',// CNT_ISO3
-                '%d',// RGN_ID
-                '%s',// CNT_name
-                '%s',// CNT_cur_code
-                '%s',// CNT_cur_single
-                '%s',// CNT_cur_plural
-                '%s',// CNT_cur_sign
-                '%d',// CNT_cur_sign_b4
-                '%d',// CNT_cur_dec_plc
-                '%s',// CNT_cur_dec_mrk
-                '%s',// CNT_cur_thsnds
-                '%s',// CNT_tel_code
-                '%d',// CNT_is_EU
-                '%d',// CNT_active
-            ];
-            $success       = $wpdb->insert(
-                $country_table,
-                $cols_n_values,
-                $data_types
-            );
-            if (! $success) {
-                throw new EE_Error(
-                    $this->_create_error_message_for_db_insertion(
-                        'N/A',
-                        ['country_id' => $country_name],
-                        $country_table,
-                        $cols_n_values,
-                        $data_types
-                    )
-                );
-            }
-            $country = $cols_n_values;
-        }
-        return $country;
-    }
-
-
-    /**
-     * finds a country iso which hasn't been used yet
-     *
-     * @param int   $num_letters
-     * @return string
-     * @global wpdb $wpdb
-     */
-    private function _find_available_country_iso(int $num_letters = 2): string
-    {
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        $attempts      = 0;
-        do {
-            $current_iso           = strtoupper(wp_generate_password($num_letters, false));
-            $country_with_that_iso = $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT count(CNT_ISO) FROM " . $country_table . " WHERE CNT_ISO=%s",
-                    $current_iso
-                )
-            );
-            $attempts++;
-            // keep going until we find an available country code, or we arbitrarily
-            // decide we've tried this enough. Somehow they have way too many countries
-            // (probably because they're mis-using the EE3 country_id like a custom question)
-        } while (intval($country_with_that_iso) && $attempts < 200);
-        return $current_iso;
-    }
-
-
-    /**
-     * Gets a state entry as an array, or creates one if none is found. Much like EEM_State::instance()->get_one(), but
-     * is independent of outside code which can change in future versions of EE
-     *
-     * @param string     $state_name
-     * @param int|string $country_name
-     * @return array where keys are columns, values are column values
-     * @throws EE_Error
-     * @global wpdb      $wpdb
-     */
-    public function get_or_create_state(string $state_name, $country_name = ''): array
-    {
-        if (! $state_name) {
-            throw new EE_Error(
-                esc_html__(
-                    "Could not get-or-create state because no state name was provided",
-                    "event_espresso"
-                )
-            );
-        }
-        try {
-            $country     = $this->get_or_create_country($country_name);
-            $country_iso = $country['CNT_ISO'];
-        } catch (EE_Error $e) {
-            $country_iso = $this->get_default_country_iso();
-        }
-        global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
-        $state       = $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT * FROM $state_table WHERE
+				$country_name,
+				$country_name,
+				$country_name
+			),
+			ARRAY_A
+		);
+		if (! $country) {
+			// insert a new one then
+			$cols_n_values = [
+				'CNT_ISO'         => $this->_find_available_country_iso(),
+				'CNT_ISO3'        => $this->_find_available_country_iso(3),
+				'RGN_ID'          => 0,
+				'CNT_name'        => $country_name,
+				'CNT_cur_code'    => 'USD',
+				'CNT_cur_single'  => 'Dollar',
+				'CNT_cur_plural'  => 'Dollars',
+				'CNT_cur_sign'    => '&#36;',
+				'CNT_cur_sign_b4' => true,
+				'CNT_cur_dec_plc' => 2,
+				'CNT_cur_dec_mrk' => '.',
+				'CNT_cur_thsnds'  => ',',
+				'CNT_tel_code'    => '+1',
+				'CNT_is_EU'       => false,
+				'CNT_active'      => true,
+			];
+			$data_types    = [
+				'%s',// CNT_ISO
+				'%s',// CNT_ISO3
+				'%d',// RGN_ID
+				'%s',// CNT_name
+				'%s',// CNT_cur_code
+				'%s',// CNT_cur_single
+				'%s',// CNT_cur_plural
+				'%s',// CNT_cur_sign
+				'%d',// CNT_cur_sign_b4
+				'%d',// CNT_cur_dec_plc
+				'%s',// CNT_cur_dec_mrk
+				'%s',// CNT_cur_thsnds
+				'%s',// CNT_tel_code
+				'%d',// CNT_is_EU
+				'%d',// CNT_active
+			];
+			$success       = $wpdb->insert(
+				$country_table,
+				$cols_n_values,
+				$data_types
+			);
+			if (! $success) {
+				throw new EE_Error(
+					$this->_create_error_message_for_db_insertion(
+						'N/A',
+						['country_id' => $country_name],
+						$country_table,
+						$cols_n_values,
+						$data_types
+					)
+				);
+			}
+			$country = $cols_n_values;
+		}
+		return $country;
+	}
+
+
+	/**
+	 * finds a country iso which hasn't been used yet
+	 *
+	 * @param int   $num_letters
+	 * @return string
+	 * @global wpdb $wpdb
+	 */
+	private function _find_available_country_iso(int $num_letters = 2): string
+	{
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		$attempts      = 0;
+		do {
+			$current_iso           = strtoupper(wp_generate_password($num_letters, false));
+			$country_with_that_iso = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT count(CNT_ISO) FROM " . $country_table . " WHERE CNT_ISO=%s",
+					$current_iso
+				)
+			);
+			$attempts++;
+			// keep going until we find an available country code, or we arbitrarily
+			// decide we've tried this enough. Somehow they have way too many countries
+			// (probably because they're mis-using the EE3 country_id like a custom question)
+		} while (intval($country_with_that_iso) && $attempts < 200);
+		return $current_iso;
+	}
+
+
+	/**
+	 * Gets a state entry as an array, or creates one if none is found. Much like EEM_State::instance()->get_one(), but
+	 * is independent of outside code which can change in future versions of EE
+	 *
+	 * @param string     $state_name
+	 * @param int|string $country_name
+	 * @return array where keys are columns, values are column values
+	 * @throws EE_Error
+	 * @global wpdb      $wpdb
+	 */
+	public function get_or_create_state(string $state_name, $country_name = ''): array
+	{
+		if (! $state_name) {
+			throw new EE_Error(
+				esc_html__(
+					"Could not get-or-create state because no state name was provided",
+					"event_espresso"
+				)
+			);
+		}
+		try {
+			$country     = $this->get_or_create_country($country_name);
+			$country_iso = $country['CNT_ISO'];
+		} catch (EE_Error $e) {
+			$country_iso = $this->get_default_country_iso();
+		}
+		global $wpdb;
+		$state_table = $wpdb->prefix . "esp_state";
+		$state       = $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
 			CNT_ISO LIKE %s LIMIT 1",
-                $state_name,
-                $state_name,
-                $country_iso
-            ),
-            ARRAY_A
-        );
-        if (! $state) {
-            // insert a new one then
-            $cols_n_values = [
-                'CNT_ISO'    => $country_iso,
-                'STA_abbrev' => substr($state_name, 0, 6),
-                'STA_name'   => $state_name,
-                'STA_active' => true,
-            ];
-            $data_types    = [
-                '%s',// CNT_ISO
-                '%s',// STA_abbrev
-                '%s',// STA_name
-                '%d',// STA_active
-            ];
-            $success       = $wpdb->insert($state_table, $cols_n_values, $data_types);
-            if (! $success) {
-                throw new EE_Error(
-                    $this->_create_error_message_for_db_insertion(
-                        'N/A',
-                        ['state' => $state_name, 'country_id' => $country_name],
-                        $state_table,
-                        $cols_n_values,
-                        $data_types
-                    )
-                );
-            }
-            $state           = $cols_n_values;
-            $state['STA_ID'] = $wpdb->insert_id;
-        }
-        return $state;
-    }
-
-
-    /**
-     * Fixes times like "5:00 PM" into the expected 24-hour format "17:00".
-     * THis is actually just copied from the 3.1 JSON API because it needed to do the exact same thing
-     *
-     * @param string|null $timeString
-     * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes
-     *                with leading zeros)
-     */
-    public function convertTimeFromAMPM(?string $timeString): string
-    {
-        $matches = [];
-        preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
-        if (! $matches || count($matches) < 3) {
-            $hour    = '00';
-            $minutes = '00';
-        } else {
-            $hour    = intval($matches[1]);
-            $minutes = $matches[2];
-        }
-        if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
-            $hour = intval($hour) + 12;
-        }
-        $hour    = str_pad("$hour", 2, '0', STR_PAD_LEFT);
-        $minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
-        return "$hour:$minutes";
-    }
-
-
-    /**
-     * Gets the ISO3 fora country given its 3.1 country ID.
-     *
-     * @param int $country_id
-     * @return string the country's ISO3 code
-     */
-    public function get_iso_from_3_1_country_id(int $country_id): string
-    {
-        $old_countries = [
-            [64, 'United States', 'US', 'USA', 1],
-            [15, 'Australia', 'AU', 'AUS', 1],
-            [39, 'Canada', 'CA', 'CAN', 1],
-            [171, 'United Kingdom', 'GB', 'GBR', 1],
-            [70, 'France', 'FR', 'FRA', 2],
-            [111, 'Italy', 'IT', 'ITA', 2],
-            [63, 'Spain', 'ES', 'ESP', 2],
-            [1, 'Afghanistan', 'AF', 'AFG', 1],
-            [2, 'Albania', 'AL', 'ALB', 1],
-            [3, 'Germany', 'DE', 'DEU', 2],
-            [198, 'Switzerland', 'CH', 'CHE', 1],
-            [87, 'Netherlands', 'NL', 'NLD', 2],
-            [197, 'Sweden', 'SE', 'SWE', 1],
-            [230, 'Akrotiri and Dhekelia', 'CY', 'CYP', 2],
-            [4, 'Andorra', 'AD', 'AND', 2],
-            [5, 'Angola', 'AO', 'AGO', 1],
-            [6, 'Anguilla', 'AI', 'AIA', 1],
-            [7, 'Antarctica', 'AQ', 'ATA', 1],
-            [8, 'Antigua and Barbuda', 'AG', 'ATG', 1],
-            [10, 'Saudi Arabia', 'SA', 'SAU', 1],
-            [11, 'Algeria', 'DZ', 'DZA', 1],
-            [12, 'Argentina', 'AR', 'ARG', 1],
-            [13, 'Armenia', 'AM', 'ARM', 1],
-            [14, 'Aruba', 'AW', 'ABW', 1],
-            [16, 'Austria', 'AT', 'AUT', 2],
-            [17, 'Azerbaijan', 'AZ', 'AZE', 1],
-            [18, 'Bahamas', 'BS', 'BHS', 1],
-            [19, 'Bahrain', 'BH', 'BHR', 1],
-            [20, 'Bangladesh', 'BD', 'BGD', 1],
-            [21, 'Barbados', 'BB', 'BRB', 1],
-            [22, 'Belgium ', 'BE', 'BEL', 2],
-            [23, 'Belize', 'BZ', 'BLZ', 1],
-            [24, 'Benin', 'BJ', 'BEN', 1],
-            [25, 'Bermudas', 'BM', 'BMU', 1],
-            [26, 'Belarus', 'BY', 'BLR', 1],
-            [27, 'Bolivia', 'BO', 'BOL', 1],
-            [28, 'Bosnia and Herzegovina', 'BA', 'BIH', 1],
-            [29, 'Botswana', 'BW', 'BWA', 1],
-            [96, 'Bouvet Island', 'BV', 'BVT', 1],
-            [30, 'Brazil', 'BR', 'BRA', 1],
-            [31, 'Brunei', 'BN', 'BRN', 1],
-            [32, 'Bulgaria', 'BG', 'BGR', 1],
-            [33, 'Burkina Faso', 'BF', 'BFA', 1],
-            [34, 'Burundi', 'BI', 'BDI', 1],
-            [35, 'Bhutan', 'BT', 'BTN', 1],
-            [36, 'Cape Verde', 'CV', 'CPV', 1],
-            [37, 'Cambodia', 'KH', 'KHM', 1],
-            [38, 'Cameroon', 'CM', 'CMR', 1],
-            [98, 'Cayman Islands', 'KY', 'CYM', 1],
-            [172, 'Central African Republic', 'CF', 'CAF', 1],
-            [40, 'Chad', 'TD', 'TCD', 1],
-            [41, 'Chile', 'CL', 'CHL', 1],
-            [42, 'China', 'CN', 'CHN', 1],
-            [105, 'Christmas Island', 'CX', 'CXR', 1],
-            [43, 'Cyprus', 'CY', 'CYP', 2],
-            [99, 'Cocos Island', 'CC', 'CCK', 1],
-            [100, 'Cook Islands', 'CK', 'COK', 1],
-            [44, 'Colombia', 'CO', 'COL', 1],
-            [45, 'Comoros', 'KM', 'COM', 1],
-            [46, 'Congo', 'CG', 'COG', 1],
-            [47, 'North Korea', 'KP', 'PRK', 1],
-            [50, 'Costa Rica', 'CR', 'CRI', 1],
-            [51, 'Croatia', 'HR', 'HRV', 1],
-            [52, 'Cuba', 'CU', 'CUB', 1],
-            [173, 'Czech Republic', 'CZ', 'CZE', 1],
-            [53, 'Denmark', 'DK', 'DNK', 1],
-            [54, 'Djibouti', 'DJ', 'DJI', 1],
-            [55, 'Dominica', 'DM', 'DMA', 1],
-            [174, 'Dominican Republic', 'DO', 'DOM', 1],
-            [56, 'Ecuador', 'EC', 'ECU', 1],
-            [57, 'Egypt', 'EG', 'EGY', 1],
-            [58, 'El Salvador', 'SV', 'SLV', 1],
-            [60, 'Eritrea', 'ER', 'ERI', 1],
-            [61, 'Slovakia', 'SK', 'SVK', 2],
-            [62, 'Slovenia', 'SI', 'SVN', 2],
-            [65, 'Estonia', 'EE', 'EST', 2],
-            [66, 'Ethiopia', 'ET', 'ETH', 1],
-            [102, 'Faroe islands', 'FO', 'FRO', 1],
-            [103, 'Falkland Islands', 'FK', 'FLK', 1],
-            [67, 'Fiji', 'FJ', 'FJI', 1],
-            [69, 'Finland', 'FI', 'FIN', 2],
-            [71, 'Gabon', 'GA', 'GAB', 1],
-            [72, 'Gambia', 'GM', 'GMB', 1],
-            [73, 'Georgia', 'GE', 'GEO', 1],
-            [74, 'Ghana', 'GH', 'GHA', 1],
-            [75, 'Gibraltar', 'GI', 'GIB', 1],
-            [76, 'Greece', 'GR', 'GRC', 2],
-            [77, 'Grenada', 'GD', 'GRD', 1],
-            [78, 'Greenland', 'GL', 'GRL', 1],
-            [79, 'Guadeloupe', 'GP', 'GLP', 1],
-            [80, 'Guam', 'GU', 'GUM', 1],
-            [81, 'Guatemala', 'GT', 'GTM', 1],
-            [82, 'Guinea', 'GN', 'GIN', 1],
-            [83, 'Equatorial Guinea', 'GQ', 'GNQ', 1],
-            [84, 'Guinea-Bissau', 'GW', 'GNB', 1],
-            [85, 'Guyana', 'GY', 'GUY', 1],
-            [86, 'Haiti', 'HT', 'HTI', 1],
-            [88, 'Honduras', 'HN', 'HND', 1],
-            [89, 'Hong Kong', 'HK', 'HKG', 1],
-            [90, 'Hungary', 'HU', 'HUN', 1],
-            [91, 'India', 'IN', 'IND', 1],
-            [205, 'British Indian Ocean Territory', 'IO', 'IOT', 1],
-            [92, 'Indonesia', 'ID', 'IDN', 1],
-            [93, 'Iraq', 'IQ', 'IRQ', 1],
-            [94, 'Iran', 'IR', 'IRN', 1],
-            [95, 'Ireland', 'IE', 'IRL', 2],
-            [97, 'Iceland', 'IS', 'ISL', 1],
-            [110, 'Israel', 'IL', 'ISR', 1],
-            [49, 'Ivory Coast ', 'CI', 'CIV', 1],
-            [112, 'Jamaica', 'JM', 'JAM', 1],
-            [113, 'Japan', 'JP', 'JPN', 1],
-            [114, 'Jordan', 'JO', 'JOR', 1],
-            [115, 'Kazakhstan', 'KZ', 'KAZ', 1],
-            [116, 'Kenya', 'KE', 'KEN', 1],
-            [117, 'Kyrgyzstan', 'KG', 'KGZ', 1],
-            [118, 'Kiribati', 'KI', 'KIR', 1],
-            [48, 'South Korea', 'KR', 'KOR', 1],
-            [228, 'Kosovo', 'XK', 'XKV', 2],
-            // there is no official ISO code for Kosovo yet (http://geonames.wordpress.com/2010/03/08/xk-country-code-for-kosovo/) so using a temporary country code and a modified 3 character code for ISO code -- this should be updated if/when Kosovo gets its own ISO code
-            [119, 'Kuwait', 'KW', 'KWT', 1],
-            [120, 'Laos', 'LA', 'LAO', 1],
-            [121, 'Latvia', 'LV', 'LVA', 2],
-            [122, 'Lesotho', 'LS', 'LSO', 1],
-            [123, 'Lebanon', 'LB', 'LBN', 1],
-            [124, 'Liberia', 'LR', 'LBR', 1],
-            [125, 'Libya', 'LY', 'LBY', 1],
-            [126, 'Liechtenstein', 'LI', 'LIE', 1],
-            [127, 'Lithuania', 'LT', 'LTU', 2],
-            [128, 'Luxemburg', 'LU', 'LUX', 2],
-            [129, 'Macao', 'MO', 'MAC', 1],
-            [130, 'Macedonia', 'MK', 'MKD', 1],
-            [131, 'Madagascar', 'MG', 'MDG', 1],
-            [132, 'Malaysia', 'MY', 'MYS', 1],
-            [133, 'Malawi', 'MW', 'MWI', 1],
-            [134, 'Maldivas', 'MV', 'MDV', 1],
-            [135, 'Mali', 'ML', 'MLI', 1],
-            [136, 'Malta', 'MT', 'MLT', 2],
-            [101, 'Northern Marianas', 'MP', 'MNP', 1],
-            [137, 'Morocco', 'MA', 'MAR', 1],
-            [104, 'Marshall islands', 'MH', 'MHL', 1],
-            [138, 'Martinique', 'MQ', 'MTQ', 1],
-            [139, 'Mauritius', 'MU', 'MUS', 1],
-            [140, 'Mauritania', 'MR', 'MRT', 1],
-            [141, 'Mayote', 'YT', 'MYT', 2],
-            [142, 'Mexico', 'MX', 'MEX', 1],
-            [143, 'Micronesia', 'FM', 'FSM', 1],
-            [144, 'Moldova', 'MD', 'MDA', 1],
-            [145, 'Monaco', 'MC', 'MCO', 2],
-            [146, 'Mongolia', 'MN', 'MNG', 1],
-            [147, 'Montserrat', 'MS', 'MSR', 1],
-            [227, 'Montenegro', 'ME', 'MNE', 2],
-            [148, 'Mozambique', 'MZ', 'MOZ', 1],
-            [149, 'Myanmar', 'MM', 'MMR', 1],
-            [150, 'Namibia', 'NA', 'NAM', 1],
-            [151, 'Nauru', 'NR', 'NRU', 1],
-            [152, 'Nepal', 'NP', 'NPL', 1],
-            [9, 'Netherlands Antilles', 'AN', 'ANT', 1],
-            [153, 'Nicaragua', 'NI', 'NIC', 1],
-            [154, 'Niger', 'NE', 'NER', 1],
-            [155, 'Nigeria', 'NG', 'NGA', 1],
-            [156, 'Niue', 'NU', 'NIU', 1],
-            [157, 'Norway', 'NO', 'NOR', 1],
-            [158, 'New Caledonia', 'NC', 'NCL', 1],
-            [159, 'New Zealand', 'NZ', 'NZL', 1],
-            [160, 'Oman', 'OM', 'OMN', 1],
-            [161, 'Pakistan', 'PK', 'PAK', 1],
-            [162, 'Palau', 'PW', 'PLW', 1],
-            [163, 'Panama', 'PA', 'PAN', 1],
-            [164, 'Papua New Guinea', 'PG', 'PNG', 1],
-            [165, 'Paraguay', 'PY', 'PRY', 1],
-            [166, 'Peru', 'PE', 'PER', 1],
-            [68, 'Philippines', 'PH', 'PHL', 1],
-            [167, 'Poland', 'PL', 'POL', 1],
-            [168, 'Portugal', 'PT', 'PRT', 2],
-            [169, 'Puerto Rico', 'PR', 'PRI', 1],
-            [170, 'Qatar', 'QA', 'QAT', 1],
-            [176, 'Rwanda', 'RW', 'RWA', 1],
-            [177, 'Romania', 'RO', 'ROM', 2],
-            [178, 'Russia', 'RU', 'RUS', 1],
-            [229, 'Saint Pierre and Miquelon', 'PM', 'SPM', 2],
-            [180, 'Samoa', 'WS', 'WSM', 1],
-            [181, 'American Samoa', 'AS', 'ASM', 1],
-            [183, 'San Marino', 'SM', 'SMR', 2],
-            [184, 'Saint Vincent and the Grenadines', 'VC', 'VCT', 1],
-            [185, 'Saint Helena', 'SH', 'SHN', 1],
-            [186, 'Saint Lucia', 'LC', 'LCA', 1],
-            [188, 'Senegal', 'SN', 'SEN', 1],
-            [189, 'Seychelles', 'SC', 'SYC', 1],
-            [190, 'Sierra Leona', 'SL', 'SLE', 1],
-            [191, 'Singapore', 'SG', 'SGP', 1],
-            [192, 'Syria', 'SY', 'SYR', 1],
-            [193, 'Somalia', 'SO', 'SOM', 1],
-            [194, 'Sri Lanka', 'LK', 'LKA', 1],
-            [195, 'South Africa', 'ZA', 'ZAF', 1],
-            [196, 'Sudan', 'SD', 'SDN', 1],
-            [199, 'Suriname', 'SR', 'SUR', 1],
-            [200, 'Swaziland', 'SZ', 'SWZ', 1],
-            [201, 'Thailand', 'TH', 'THA', 1],
-            [202, 'Taiwan', 'TW', 'TWN', 1],
-            [203, 'Tanzania', 'TZ', 'TZA', 1],
-            [204, 'Tajikistan', 'TJ', 'TJK', 1],
-            [206, 'Timor-Leste', 'TL', 'TLS', 1],
-            [207, 'Togo', 'TG', 'TGO', 1],
-            [208, 'Tokelau', 'TK', 'TKL', 1],
-            [209, 'Tonga', 'TO', 'TON', 1],
-            [210, 'Trinidad and Tobago', 'TT', 'TTO', 1],
-            [211, 'Tunisia', 'TN', 'TUN', 1],
-            [212, 'Turkmenistan', 'TM', 'TKM', 1],
-            [213, 'Turkey', 'TR', 'TUR', 1],
-            [214, 'Tuvalu', 'TV', 'TUV', 1],
-            [215, 'Ukraine', 'UA', 'UKR', 1],
-            [216, 'Uganda', 'UG', 'UGA', 1],
-            [59, 'United Arab Emirates', 'AE', 'ARE', 1],
-            [217, 'Uruguay', 'UY', 'URY', 1],
-            [218, 'Uzbekistan', 'UZ', 'UZB', 1],
-            [219, 'Vanuatu', 'VU', 'VUT', 1],
-            [220, 'Vatican City', 'VA', 'VAT', 2],
-            [221, 'Venezuela', 'VE', 'VEN', 1],
-            [222, 'Vietnam', 'VN', 'VNM', 1],
-            [108, 'Virgin Islands', 'VI', 'VIR', 1],
-            [223, 'Yemen', 'YE', 'YEM', 1],
-            [225, 'Zambia', 'ZM', 'ZMB', 1],
-            [226, 'Zimbabwe', 'ZW', 'ZWE', 1],
-        ];
-        $country_iso   = 'US';
-        foreach ($old_countries as $country_array) {
-            // note: index 0 is the 3.1 country ID
-            if ($country_array[0] == $country_id) {
-                // note: index 2 is the ISO
-                $country_iso = $country_array[2];
-                break;
-            }
-        }
-        return $country_iso;
-    }
-
-
-    /**
-     * Gets the ISO3 for the
-     *
-     * @return string
-     */
-    public function get_default_country_iso(): string
-    {
-        $old_org_options = get_option('events_organization_settings');
-        return $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
-    }
-
-
-    /**
-     * Converts a 3.1 payment status to its equivalent 4.1 registration status
-     *
-     * @param string  $payment_status                   possible value for 3.1's evens_attendee.payment_status
-     * @param boolean $this_thing_required_pre_approval whether the thing we're considering (the general setting's
-     *                                                  default payment status, the event's default payment status, or
-     *                                                  the attendee's payment status) required pre-approval.
-     * @return string STS_ID for use in 4.1
-     */
-    public function convert_3_1_payment_status_to_4_1_STS_ID(
-        string $payment_status,
-        bool $this_thing_required_pre_approval = false
-    ): string {
-        // EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
-        if ($this_thing_required_pre_approval) {
-            return 'RNA';
-        } else {
-            $mapping = [
-                'Completed'        => 'RAP',
-                ''                 => 'RPP',
-                'Incomplete'       => 'RPP',
-                'Pending'          => 'RAP',
-                // stati that only occurred on 3.1 attendees:
-                'Payment Declined' => 'RPP',
-                'Not Completed'    => 'RPP',
-                'Cancelled'        => 'RPP',
-                'Declined'         => 'RPP',
-            ];
-        }
-        return $mapping[ $payment_status ] ?? 'RNA';
-    }
-
-
-    /**
-     * Makes sure the 3.1's image url is converted to an image attachment post to the 4.1 CPT event
-     * and sets it as the featured image on the CPT event
-     *
-     * @param string                         $guid
-     * @param int                            $new_cpt_id
-     * @param EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
-     * @return boolean whether we had to do the big job of creating an image attachment
-     */
-    public function convert_image_url_to_attachment_and_attach_to_post(
-        string $guid,
-        int $new_cpt_id,
-        EE_Data_Migration_Script_Stage $migration_stage
-    ): bool {
-        $created_attachment_post = false;
-        $guid                    = $this->_get_original_guid($guid);
-        if ($guid) {
-            // check for an existing attachment post with this guid
-            $attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-            if (! $attachment_post_id) {
-                // post thumbnail with that GUID doesn't exist, we should create one
-                $attachment_post_id      = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
-                $created_attachment_post = true;
-            }
-            // double-check we actually have an attachment post
-            if ($attachment_post_id) {
-                update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
-            } else {
-                $migration_stage->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not update event image %s for CPT with ID %d, but attachments post ID is %d",
-                            "event_espresso"
-                        ),
-                        $guid,
-                        $new_cpt_id,
-                        $attachment_post_id
-                    )
-                );
-            }
-        }
-        return $created_attachment_post;
-    }
-
-
-    /**
-     * In 3.1, the event thumbnail image DOESN'T point to the original image, but instead
-     * to a large thumbnail (which has nearly the same GUID, except it adds "-{width}x{height}" before the filetype,
-     * or whatever dimensions it is. Eg 'http://mysite.com/image1-300x400.jpg' instead of
-     * 'http://mysite.com/image1.jpg' ). This function attempts to strip that off and get the original file, if it
-     * exists
-     *
-     * @param string $guid_in_old_event
-     * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
-     */
-    private function _get_original_guid(string $guid_in_old_event): string
-    {
-        $original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
-        // do a head request to verify the file exists
-        $head_response = wp_remote_head($original_guid);
-        if (! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
-            return $original_guid;
-        }
-        return $guid_in_old_event;
-    }
-
-
-    /**
-     * Creates an image attachment post for the GUID. If the GUID points to a remote image,
-     * we download it to our uploads directory so that it can be properly processed (eg, creates different sizes of
-     * thumbnails)
-     *
-     * @param string                         $guid
-     * @param EE_Data_Migration_Script_Stage $migration_stage
-     * @return int
-     */
-    private function _create_image_attachment_from_GUID(string $guid, EE_Data_Migration_Script_Stage $migration_stage)
-    {
-        if (! $guid) {
-            $migration_stage->add_error(
-                esc_html__(
-                    "Cannot create image attachment for a blank GUID!",
-                    "event_espresso"
-                )
-            );
-            return 0;
-        }
-        $wp_filetype   = wp_check_filetype(basename($guid));
-        $wp_upload_dir = wp_upload_dir();
-        // if the file is located remotely, download it to our uploads DIR, because wp_generate_attachment_metadata
-        // needs the file to be local
-        if (strpos($guid, $wp_upload_dir['url']) === false) {
-            // image is located remotely. download it and place it in the uploads directory
-            if (! is_readable($guid)) {
-                $migration_stage->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not create image attachment from non-existent file: %s",
-                            "event_espresso"
-                        ),
-                        $guid
-                    )
-                );
-                return 0;
-            }
-            $contents = file_get_contents($guid);
-            if ($contents === false) {
-                $migration_stage->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not read image at %s, and therefore couldn't create an attachment post for it.",
-                            "event_espresso"
-                        ),
-                        $guid
-                    )
-                );
-                return false;
-            }
-            $local_filepath = $wp_upload_dir['path'] . '/' . basename($guid);
-            $save_file      = fopen($local_filepath, 'w');
-            fwrite($save_file, $contents);
-            fclose($save_file);
-            $guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
-        } else {
-            $local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
-        }
-        $attachment = [
-            'guid'           => $guid,
-            'post_mime_type' => $wp_filetype['type'],
-            'post_title'     => preg_replace('/\.[^.]+$/', '', basename($guid)),
-            'post_content'   => '',
-            'post_status'    => 'inherit',
-        ];
-        $attach_id  = wp_insert_attachment($attachment, $guid);
-        if (! $attach_id) {
-            $migration_stage->add_error(
-                sprintf(
-                    esc_html__(
-                        "Could not create image attachment post from image '%s'. Attachment data was %s.",
-                        "event_espresso"
-                    ),
-                    $guid,
-                    $this->_json_encode($attachment)
-                )
-            );
-            return $attach_id;
-        }
-        // you must first include the image.php file
-        // for the function wp_generate_attachment_metadata() to work
-        require_once(ABSPATH . 'wp-admin/includes/image.php');
-        $attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
-        if (! $attach_data) {
-            $migration_stage->add_error(
-                sprintf(
-                    esc_html__(
-                        "Could not generate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.",
-                        "event_espresso"
-                    ),
-                    $attach_id,
-                    $local_filepath,
-                    $guid
-                )
-            );
-            return $attach_id;
-        }
-        $metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
-        if (! $metadata_save_result) {
-            $migration_stage->add_error(
-                sprintf(
-                    esc_html__(
-                        "Could not update attachment metadata for attachment %d with data %s",
-                        "event_espresso"
-                    ),
-                    $attach_id,
-                    $this->_json_encode($attach_data)
-                )
-            );
-        }
-        return $attach_id;
-    }
-
-
-    /**
-     * Finds the attachment post containing info about an image attachment given the GUID (link to the image itself),
-     * and returns its ID.
-     *
-     * @param string $guid
-     * @return int
-     * @global wpdb  $wpdb
-     */
-    private function _get_image_attachment_id_by_GUID(string $guid): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
-    }
-
-
-    /**
-     * Returns a mysql-formatted DATETIME in UTC time, given a $DATETIME_string
-     * (and optionally a timezone; if none is given, the wp default is used)
-     *
-     * @param EE_Data_Migration_Script_Stage $stage
-     * @param array                          $row_of_data , the row from the DB (as an array) we're trying to find the
-     *                                                    UTC time for
-     * @param string                         $DATETIME_string
-     * @param string|null                    $timezone
-     * @return string
-     */
-    public function convert_date_string_to_utc(
-        EE_Data_Migration_Script_Stage $stage,
-        array $row_of_data,
-        string $DATETIME_string,
-        ?string $timezone = null
-    ): string {
-        $original_tz = $timezone;
-        if (! $timezone) {
-            $timezone = $this->_get_wp_timezone();
-        }
-        if (! $timezone) {
-            $stage->add_error(
-                sprintf(
-                    esc_html__("Could not find timezone given %s for %s", "event_espresso"),
-                    $original_tz,
-                    $row_of_data
-                )
-            );
-            $timezone = 'UTC';
-        }
-        try {
-            $date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
-            EEH_DTT_Helper::setTimezone($date_obj, new DateTimeZone('UTC'));
-        } catch (Exception $e) {
-            $stage->add_error(
-                sprintf(
-                    esc_html__(
-                        "Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.",
-                        "event_espresso"
-                    ),
-                    $DATETIME_string,
-                    $timezone
-                )
-            );
-            $date_obj = new DateTime();
-        }
-        return $date_obj->format('Y-m-d H:i:s');
-    }
-
-
-    /**
-     * Gets the default timezone string from wordpress (even if they set a gmt offset)
-     *
-     * @return string
-     */
-    private function _get_wp_timezone()
-    {
-        $timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
-        // if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-        if (empty($timezone)) {
-            // let's get a the WordPress UTC offset
-            $offset   = (int) get_option('gmt_offset');
-            $timezone = $this->timezone_convert_to_string_from_offset($offset);
-        }
-        return $timezone;
-    }
-
-
-    /**
-     * Gets the wordpress timezone string from a UTC offset
-     *
-     * @param int $offset
-     * @return boolean
-     */
-    private function timezone_convert_to_string_from_offset(int $offset): bool
-    {
-        // shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did not work as expected - its not reliable
-        $offset        *= 3600; // convert hour offset to seconds
-        $abbreviations = timezone_abbreviations_list();
-        foreach ($abbreviations as $abbreviation) {
-            foreach ($abbreviation as $city) {
-                if ($city['offset'] == $offset) {
-                    return $city['timezone_id'];
-                }
-            }
-        }
-        return false;
-    }
-
-
-    public function migration_page_hooks()
-    {
-        add_filter(
-            'FHEE__ee_migration_page__header',
-            [$this, '_migrate_page_hook_simplify_version_strings'],
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__ee_migration_page__p_after_header',
-            [$this, '_migration_page_hook_simplify_next_db_state'],
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_1_main',
-            [$this, '_migrate_page_hook_simplify_version_strings'],
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_1_button_text',
-            [$this, '_migrate_page_hook_simplify_version_strings'],
-            10,
-            3
-        );
-        add_action(
-            'AHEE__ee_migration_page__option_1_extra_details',
-            [$this, '_migration_page_hook_option_1_extra_details'],
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_2_main',
-            [$this, '_migrate_page_hook_simplify_version_strings'],
-            10,
-            4
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_2_button_text',
-            [$this, '_migration_page_hook_simplify_next_db_state'],
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_2_details',
-            [$this, '_migration_page_hook_simplify_next_db_state'],
-            10,
-            2
-        );
-        add_action(
-            'AHEE__ee_migration_page__after_migration_options_table',
-            [$this, '_migration_page_hook_after_migration_options_table']
-        );
-        add_filter(
-            'FHEE__ee_migration_page__done_migration_header',
-            [$this, '_migration_page_hook_simplify_next_db_state'],
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__p_after_done_migration_header',
-            [$this, '_migration_page_hook_simplify_next_db_state'],
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__migration_options_template',
-            [$this, 'use_migration_options_from_ee3_template']
-        );
-    }
-
-
-    public function _migrate_page_hook_simplify_version_strings(
-        $old_content,
-        $current_db_state,
-        $next_db_state,
-        $ultimate_db_state = null
-    ) {
-        return str_replace(
-            [$current_db_state, $next_db_state, $ultimate_db_state],
-            [
-                esc_html__('EE3', 'event_espresso'),
-                esc_html__('EE4', 'event_espresso'),
-                esc_html__("EE4", 'event_espresso'),
-            ],
-            $old_content
-        );
-    }
-
-
-    public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state)
-    {
-        return str_replace($next_db_state, esc_html__("EE4", 'event_espresso'), $old_content);
-    }
-
-
-    public function _migration_page_hook_option_1_extra_details()
-    {
-        ?>
+				$state_name,
+				$state_name,
+				$country_iso
+			),
+			ARRAY_A
+		);
+		if (! $state) {
+			// insert a new one then
+			$cols_n_values = [
+				'CNT_ISO'    => $country_iso,
+				'STA_abbrev' => substr($state_name, 0, 6),
+				'STA_name'   => $state_name,
+				'STA_active' => true,
+			];
+			$data_types    = [
+				'%s',// CNT_ISO
+				'%s',// STA_abbrev
+				'%s',// STA_name
+				'%d',// STA_active
+			];
+			$success       = $wpdb->insert($state_table, $cols_n_values, $data_types);
+			if (! $success) {
+				throw new EE_Error(
+					$this->_create_error_message_for_db_insertion(
+						'N/A',
+						['state' => $state_name, 'country_id' => $country_name],
+						$state_table,
+						$cols_n_values,
+						$data_types
+					)
+				);
+			}
+			$state           = $cols_n_values;
+			$state['STA_ID'] = $wpdb->insert_id;
+		}
+		return $state;
+	}
+
+
+	/**
+	 * Fixes times like "5:00 PM" into the expected 24-hour format "17:00".
+	 * THis is actually just copied from the 3.1 JSON API because it needed to do the exact same thing
+	 *
+	 * @param string|null $timeString
+	 * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes
+	 *                with leading zeros)
+	 */
+	public function convertTimeFromAMPM(?string $timeString): string
+	{
+		$matches = [];
+		preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
+		if (! $matches || count($matches) < 3) {
+			$hour    = '00';
+			$minutes = '00';
+		} else {
+			$hour    = intval($matches[1]);
+			$minutes = $matches[2];
+		}
+		if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
+			$hour = intval($hour) + 12;
+		}
+		$hour    = str_pad("$hour", 2, '0', STR_PAD_LEFT);
+		$minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
+		return "$hour:$minutes";
+	}
+
+
+	/**
+	 * Gets the ISO3 fora country given its 3.1 country ID.
+	 *
+	 * @param int $country_id
+	 * @return string the country's ISO3 code
+	 */
+	public function get_iso_from_3_1_country_id(int $country_id): string
+	{
+		$old_countries = [
+			[64, 'United States', 'US', 'USA', 1],
+			[15, 'Australia', 'AU', 'AUS', 1],
+			[39, 'Canada', 'CA', 'CAN', 1],
+			[171, 'United Kingdom', 'GB', 'GBR', 1],
+			[70, 'France', 'FR', 'FRA', 2],
+			[111, 'Italy', 'IT', 'ITA', 2],
+			[63, 'Spain', 'ES', 'ESP', 2],
+			[1, 'Afghanistan', 'AF', 'AFG', 1],
+			[2, 'Albania', 'AL', 'ALB', 1],
+			[3, 'Germany', 'DE', 'DEU', 2],
+			[198, 'Switzerland', 'CH', 'CHE', 1],
+			[87, 'Netherlands', 'NL', 'NLD', 2],
+			[197, 'Sweden', 'SE', 'SWE', 1],
+			[230, 'Akrotiri and Dhekelia', 'CY', 'CYP', 2],
+			[4, 'Andorra', 'AD', 'AND', 2],
+			[5, 'Angola', 'AO', 'AGO', 1],
+			[6, 'Anguilla', 'AI', 'AIA', 1],
+			[7, 'Antarctica', 'AQ', 'ATA', 1],
+			[8, 'Antigua and Barbuda', 'AG', 'ATG', 1],
+			[10, 'Saudi Arabia', 'SA', 'SAU', 1],
+			[11, 'Algeria', 'DZ', 'DZA', 1],
+			[12, 'Argentina', 'AR', 'ARG', 1],
+			[13, 'Armenia', 'AM', 'ARM', 1],
+			[14, 'Aruba', 'AW', 'ABW', 1],
+			[16, 'Austria', 'AT', 'AUT', 2],
+			[17, 'Azerbaijan', 'AZ', 'AZE', 1],
+			[18, 'Bahamas', 'BS', 'BHS', 1],
+			[19, 'Bahrain', 'BH', 'BHR', 1],
+			[20, 'Bangladesh', 'BD', 'BGD', 1],
+			[21, 'Barbados', 'BB', 'BRB', 1],
+			[22, 'Belgium ', 'BE', 'BEL', 2],
+			[23, 'Belize', 'BZ', 'BLZ', 1],
+			[24, 'Benin', 'BJ', 'BEN', 1],
+			[25, 'Bermudas', 'BM', 'BMU', 1],
+			[26, 'Belarus', 'BY', 'BLR', 1],
+			[27, 'Bolivia', 'BO', 'BOL', 1],
+			[28, 'Bosnia and Herzegovina', 'BA', 'BIH', 1],
+			[29, 'Botswana', 'BW', 'BWA', 1],
+			[96, 'Bouvet Island', 'BV', 'BVT', 1],
+			[30, 'Brazil', 'BR', 'BRA', 1],
+			[31, 'Brunei', 'BN', 'BRN', 1],
+			[32, 'Bulgaria', 'BG', 'BGR', 1],
+			[33, 'Burkina Faso', 'BF', 'BFA', 1],
+			[34, 'Burundi', 'BI', 'BDI', 1],
+			[35, 'Bhutan', 'BT', 'BTN', 1],
+			[36, 'Cape Verde', 'CV', 'CPV', 1],
+			[37, 'Cambodia', 'KH', 'KHM', 1],
+			[38, 'Cameroon', 'CM', 'CMR', 1],
+			[98, 'Cayman Islands', 'KY', 'CYM', 1],
+			[172, 'Central African Republic', 'CF', 'CAF', 1],
+			[40, 'Chad', 'TD', 'TCD', 1],
+			[41, 'Chile', 'CL', 'CHL', 1],
+			[42, 'China', 'CN', 'CHN', 1],
+			[105, 'Christmas Island', 'CX', 'CXR', 1],
+			[43, 'Cyprus', 'CY', 'CYP', 2],
+			[99, 'Cocos Island', 'CC', 'CCK', 1],
+			[100, 'Cook Islands', 'CK', 'COK', 1],
+			[44, 'Colombia', 'CO', 'COL', 1],
+			[45, 'Comoros', 'KM', 'COM', 1],
+			[46, 'Congo', 'CG', 'COG', 1],
+			[47, 'North Korea', 'KP', 'PRK', 1],
+			[50, 'Costa Rica', 'CR', 'CRI', 1],
+			[51, 'Croatia', 'HR', 'HRV', 1],
+			[52, 'Cuba', 'CU', 'CUB', 1],
+			[173, 'Czech Republic', 'CZ', 'CZE', 1],
+			[53, 'Denmark', 'DK', 'DNK', 1],
+			[54, 'Djibouti', 'DJ', 'DJI', 1],
+			[55, 'Dominica', 'DM', 'DMA', 1],
+			[174, 'Dominican Republic', 'DO', 'DOM', 1],
+			[56, 'Ecuador', 'EC', 'ECU', 1],
+			[57, 'Egypt', 'EG', 'EGY', 1],
+			[58, 'El Salvador', 'SV', 'SLV', 1],
+			[60, 'Eritrea', 'ER', 'ERI', 1],
+			[61, 'Slovakia', 'SK', 'SVK', 2],
+			[62, 'Slovenia', 'SI', 'SVN', 2],
+			[65, 'Estonia', 'EE', 'EST', 2],
+			[66, 'Ethiopia', 'ET', 'ETH', 1],
+			[102, 'Faroe islands', 'FO', 'FRO', 1],
+			[103, 'Falkland Islands', 'FK', 'FLK', 1],
+			[67, 'Fiji', 'FJ', 'FJI', 1],
+			[69, 'Finland', 'FI', 'FIN', 2],
+			[71, 'Gabon', 'GA', 'GAB', 1],
+			[72, 'Gambia', 'GM', 'GMB', 1],
+			[73, 'Georgia', 'GE', 'GEO', 1],
+			[74, 'Ghana', 'GH', 'GHA', 1],
+			[75, 'Gibraltar', 'GI', 'GIB', 1],
+			[76, 'Greece', 'GR', 'GRC', 2],
+			[77, 'Grenada', 'GD', 'GRD', 1],
+			[78, 'Greenland', 'GL', 'GRL', 1],
+			[79, 'Guadeloupe', 'GP', 'GLP', 1],
+			[80, 'Guam', 'GU', 'GUM', 1],
+			[81, 'Guatemala', 'GT', 'GTM', 1],
+			[82, 'Guinea', 'GN', 'GIN', 1],
+			[83, 'Equatorial Guinea', 'GQ', 'GNQ', 1],
+			[84, 'Guinea-Bissau', 'GW', 'GNB', 1],
+			[85, 'Guyana', 'GY', 'GUY', 1],
+			[86, 'Haiti', 'HT', 'HTI', 1],
+			[88, 'Honduras', 'HN', 'HND', 1],
+			[89, 'Hong Kong', 'HK', 'HKG', 1],
+			[90, 'Hungary', 'HU', 'HUN', 1],
+			[91, 'India', 'IN', 'IND', 1],
+			[205, 'British Indian Ocean Territory', 'IO', 'IOT', 1],
+			[92, 'Indonesia', 'ID', 'IDN', 1],
+			[93, 'Iraq', 'IQ', 'IRQ', 1],
+			[94, 'Iran', 'IR', 'IRN', 1],
+			[95, 'Ireland', 'IE', 'IRL', 2],
+			[97, 'Iceland', 'IS', 'ISL', 1],
+			[110, 'Israel', 'IL', 'ISR', 1],
+			[49, 'Ivory Coast ', 'CI', 'CIV', 1],
+			[112, 'Jamaica', 'JM', 'JAM', 1],
+			[113, 'Japan', 'JP', 'JPN', 1],
+			[114, 'Jordan', 'JO', 'JOR', 1],
+			[115, 'Kazakhstan', 'KZ', 'KAZ', 1],
+			[116, 'Kenya', 'KE', 'KEN', 1],
+			[117, 'Kyrgyzstan', 'KG', 'KGZ', 1],
+			[118, 'Kiribati', 'KI', 'KIR', 1],
+			[48, 'South Korea', 'KR', 'KOR', 1],
+			[228, 'Kosovo', 'XK', 'XKV', 2],
+			// there is no official ISO code for Kosovo yet (http://geonames.wordpress.com/2010/03/08/xk-country-code-for-kosovo/) so using a temporary country code and a modified 3 character code for ISO code -- this should be updated if/when Kosovo gets its own ISO code
+			[119, 'Kuwait', 'KW', 'KWT', 1],
+			[120, 'Laos', 'LA', 'LAO', 1],
+			[121, 'Latvia', 'LV', 'LVA', 2],
+			[122, 'Lesotho', 'LS', 'LSO', 1],
+			[123, 'Lebanon', 'LB', 'LBN', 1],
+			[124, 'Liberia', 'LR', 'LBR', 1],
+			[125, 'Libya', 'LY', 'LBY', 1],
+			[126, 'Liechtenstein', 'LI', 'LIE', 1],
+			[127, 'Lithuania', 'LT', 'LTU', 2],
+			[128, 'Luxemburg', 'LU', 'LUX', 2],
+			[129, 'Macao', 'MO', 'MAC', 1],
+			[130, 'Macedonia', 'MK', 'MKD', 1],
+			[131, 'Madagascar', 'MG', 'MDG', 1],
+			[132, 'Malaysia', 'MY', 'MYS', 1],
+			[133, 'Malawi', 'MW', 'MWI', 1],
+			[134, 'Maldivas', 'MV', 'MDV', 1],
+			[135, 'Mali', 'ML', 'MLI', 1],
+			[136, 'Malta', 'MT', 'MLT', 2],
+			[101, 'Northern Marianas', 'MP', 'MNP', 1],
+			[137, 'Morocco', 'MA', 'MAR', 1],
+			[104, 'Marshall islands', 'MH', 'MHL', 1],
+			[138, 'Martinique', 'MQ', 'MTQ', 1],
+			[139, 'Mauritius', 'MU', 'MUS', 1],
+			[140, 'Mauritania', 'MR', 'MRT', 1],
+			[141, 'Mayote', 'YT', 'MYT', 2],
+			[142, 'Mexico', 'MX', 'MEX', 1],
+			[143, 'Micronesia', 'FM', 'FSM', 1],
+			[144, 'Moldova', 'MD', 'MDA', 1],
+			[145, 'Monaco', 'MC', 'MCO', 2],
+			[146, 'Mongolia', 'MN', 'MNG', 1],
+			[147, 'Montserrat', 'MS', 'MSR', 1],
+			[227, 'Montenegro', 'ME', 'MNE', 2],
+			[148, 'Mozambique', 'MZ', 'MOZ', 1],
+			[149, 'Myanmar', 'MM', 'MMR', 1],
+			[150, 'Namibia', 'NA', 'NAM', 1],
+			[151, 'Nauru', 'NR', 'NRU', 1],
+			[152, 'Nepal', 'NP', 'NPL', 1],
+			[9, 'Netherlands Antilles', 'AN', 'ANT', 1],
+			[153, 'Nicaragua', 'NI', 'NIC', 1],
+			[154, 'Niger', 'NE', 'NER', 1],
+			[155, 'Nigeria', 'NG', 'NGA', 1],
+			[156, 'Niue', 'NU', 'NIU', 1],
+			[157, 'Norway', 'NO', 'NOR', 1],
+			[158, 'New Caledonia', 'NC', 'NCL', 1],
+			[159, 'New Zealand', 'NZ', 'NZL', 1],
+			[160, 'Oman', 'OM', 'OMN', 1],
+			[161, 'Pakistan', 'PK', 'PAK', 1],
+			[162, 'Palau', 'PW', 'PLW', 1],
+			[163, 'Panama', 'PA', 'PAN', 1],
+			[164, 'Papua New Guinea', 'PG', 'PNG', 1],
+			[165, 'Paraguay', 'PY', 'PRY', 1],
+			[166, 'Peru', 'PE', 'PER', 1],
+			[68, 'Philippines', 'PH', 'PHL', 1],
+			[167, 'Poland', 'PL', 'POL', 1],
+			[168, 'Portugal', 'PT', 'PRT', 2],
+			[169, 'Puerto Rico', 'PR', 'PRI', 1],
+			[170, 'Qatar', 'QA', 'QAT', 1],
+			[176, 'Rwanda', 'RW', 'RWA', 1],
+			[177, 'Romania', 'RO', 'ROM', 2],
+			[178, 'Russia', 'RU', 'RUS', 1],
+			[229, 'Saint Pierre and Miquelon', 'PM', 'SPM', 2],
+			[180, 'Samoa', 'WS', 'WSM', 1],
+			[181, 'American Samoa', 'AS', 'ASM', 1],
+			[183, 'San Marino', 'SM', 'SMR', 2],
+			[184, 'Saint Vincent and the Grenadines', 'VC', 'VCT', 1],
+			[185, 'Saint Helena', 'SH', 'SHN', 1],
+			[186, 'Saint Lucia', 'LC', 'LCA', 1],
+			[188, 'Senegal', 'SN', 'SEN', 1],
+			[189, 'Seychelles', 'SC', 'SYC', 1],
+			[190, 'Sierra Leona', 'SL', 'SLE', 1],
+			[191, 'Singapore', 'SG', 'SGP', 1],
+			[192, 'Syria', 'SY', 'SYR', 1],
+			[193, 'Somalia', 'SO', 'SOM', 1],
+			[194, 'Sri Lanka', 'LK', 'LKA', 1],
+			[195, 'South Africa', 'ZA', 'ZAF', 1],
+			[196, 'Sudan', 'SD', 'SDN', 1],
+			[199, 'Suriname', 'SR', 'SUR', 1],
+			[200, 'Swaziland', 'SZ', 'SWZ', 1],
+			[201, 'Thailand', 'TH', 'THA', 1],
+			[202, 'Taiwan', 'TW', 'TWN', 1],
+			[203, 'Tanzania', 'TZ', 'TZA', 1],
+			[204, 'Tajikistan', 'TJ', 'TJK', 1],
+			[206, 'Timor-Leste', 'TL', 'TLS', 1],
+			[207, 'Togo', 'TG', 'TGO', 1],
+			[208, 'Tokelau', 'TK', 'TKL', 1],
+			[209, 'Tonga', 'TO', 'TON', 1],
+			[210, 'Trinidad and Tobago', 'TT', 'TTO', 1],
+			[211, 'Tunisia', 'TN', 'TUN', 1],
+			[212, 'Turkmenistan', 'TM', 'TKM', 1],
+			[213, 'Turkey', 'TR', 'TUR', 1],
+			[214, 'Tuvalu', 'TV', 'TUV', 1],
+			[215, 'Ukraine', 'UA', 'UKR', 1],
+			[216, 'Uganda', 'UG', 'UGA', 1],
+			[59, 'United Arab Emirates', 'AE', 'ARE', 1],
+			[217, 'Uruguay', 'UY', 'URY', 1],
+			[218, 'Uzbekistan', 'UZ', 'UZB', 1],
+			[219, 'Vanuatu', 'VU', 'VUT', 1],
+			[220, 'Vatican City', 'VA', 'VAT', 2],
+			[221, 'Venezuela', 'VE', 'VEN', 1],
+			[222, 'Vietnam', 'VN', 'VNM', 1],
+			[108, 'Virgin Islands', 'VI', 'VIR', 1],
+			[223, 'Yemen', 'YE', 'YEM', 1],
+			[225, 'Zambia', 'ZM', 'ZMB', 1],
+			[226, 'Zimbabwe', 'ZW', 'ZWE', 1],
+		];
+		$country_iso   = 'US';
+		foreach ($old_countries as $country_array) {
+			// note: index 0 is the 3.1 country ID
+			if ($country_array[0] == $country_id) {
+				// note: index 2 is the ISO
+				$country_iso = $country_array[2];
+				break;
+			}
+		}
+		return $country_iso;
+	}
+
+
+	/**
+	 * Gets the ISO3 for the
+	 *
+	 * @return string
+	 */
+	public function get_default_country_iso(): string
+	{
+		$old_org_options = get_option('events_organization_settings');
+		return $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
+	}
+
+
+	/**
+	 * Converts a 3.1 payment status to its equivalent 4.1 registration status
+	 *
+	 * @param string  $payment_status                   possible value for 3.1's evens_attendee.payment_status
+	 * @param boolean $this_thing_required_pre_approval whether the thing we're considering (the general setting's
+	 *                                                  default payment status, the event's default payment status, or
+	 *                                                  the attendee's payment status) required pre-approval.
+	 * @return string STS_ID for use in 4.1
+	 */
+	public function convert_3_1_payment_status_to_4_1_STS_ID(
+		string $payment_status,
+		bool $this_thing_required_pre_approval = false
+	): string {
+		// EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
+		if ($this_thing_required_pre_approval) {
+			return 'RNA';
+		} else {
+			$mapping = [
+				'Completed'        => 'RAP',
+				''                 => 'RPP',
+				'Incomplete'       => 'RPP',
+				'Pending'          => 'RAP',
+				// stati that only occurred on 3.1 attendees:
+				'Payment Declined' => 'RPP',
+				'Not Completed'    => 'RPP',
+				'Cancelled'        => 'RPP',
+				'Declined'         => 'RPP',
+			];
+		}
+		return $mapping[ $payment_status ] ?? 'RNA';
+	}
+
+
+	/**
+	 * Makes sure the 3.1's image url is converted to an image attachment post to the 4.1 CPT event
+	 * and sets it as the featured image on the CPT event
+	 *
+	 * @param string                         $guid
+	 * @param int                            $new_cpt_id
+	 * @param EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
+	 * @return boolean whether we had to do the big job of creating an image attachment
+	 */
+	public function convert_image_url_to_attachment_and_attach_to_post(
+		string $guid,
+		int $new_cpt_id,
+		EE_Data_Migration_Script_Stage $migration_stage
+	): bool {
+		$created_attachment_post = false;
+		$guid                    = $this->_get_original_guid($guid);
+		if ($guid) {
+			// check for an existing attachment post with this guid
+			$attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
+			if (! $attachment_post_id) {
+				// post thumbnail with that GUID doesn't exist, we should create one
+				$attachment_post_id      = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
+				$created_attachment_post = true;
+			}
+			// double-check we actually have an attachment post
+			if ($attachment_post_id) {
+				update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
+			} else {
+				$migration_stage->add_error(
+					sprintf(
+						esc_html__(
+							"Could not update event image %s for CPT with ID %d, but attachments post ID is %d",
+							"event_espresso"
+						),
+						$guid,
+						$new_cpt_id,
+						$attachment_post_id
+					)
+				);
+			}
+		}
+		return $created_attachment_post;
+	}
+
+
+	/**
+	 * In 3.1, the event thumbnail image DOESN'T point to the original image, but instead
+	 * to a large thumbnail (which has nearly the same GUID, except it adds "-{width}x{height}" before the filetype,
+	 * or whatever dimensions it is. Eg 'http://mysite.com/image1-300x400.jpg' instead of
+	 * 'http://mysite.com/image1.jpg' ). This function attempts to strip that off and get the original file, if it
+	 * exists
+	 *
+	 * @param string $guid_in_old_event
+	 * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
+	 */
+	private function _get_original_guid(string $guid_in_old_event): string
+	{
+		$original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
+		// do a head request to verify the file exists
+		$head_response = wp_remote_head($original_guid);
+		if (! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
+			return $original_guid;
+		}
+		return $guid_in_old_event;
+	}
+
+
+	/**
+	 * Creates an image attachment post for the GUID. If the GUID points to a remote image,
+	 * we download it to our uploads directory so that it can be properly processed (eg, creates different sizes of
+	 * thumbnails)
+	 *
+	 * @param string                         $guid
+	 * @param EE_Data_Migration_Script_Stage $migration_stage
+	 * @return int
+	 */
+	private function _create_image_attachment_from_GUID(string $guid, EE_Data_Migration_Script_Stage $migration_stage)
+	{
+		if (! $guid) {
+			$migration_stage->add_error(
+				esc_html__(
+					"Cannot create image attachment for a blank GUID!",
+					"event_espresso"
+				)
+			);
+			return 0;
+		}
+		$wp_filetype   = wp_check_filetype(basename($guid));
+		$wp_upload_dir = wp_upload_dir();
+		// if the file is located remotely, download it to our uploads DIR, because wp_generate_attachment_metadata
+		// needs the file to be local
+		if (strpos($guid, $wp_upload_dir['url']) === false) {
+			// image is located remotely. download it and place it in the uploads directory
+			if (! is_readable($guid)) {
+				$migration_stage->add_error(
+					sprintf(
+						esc_html__(
+							"Could not create image attachment from non-existent file: %s",
+							"event_espresso"
+						),
+						$guid
+					)
+				);
+				return 0;
+			}
+			$contents = file_get_contents($guid);
+			if ($contents === false) {
+				$migration_stage->add_error(
+					sprintf(
+						esc_html__(
+							"Could not read image at %s, and therefore couldn't create an attachment post for it.",
+							"event_espresso"
+						),
+						$guid
+					)
+				);
+				return false;
+			}
+			$local_filepath = $wp_upload_dir['path'] . '/' . basename($guid);
+			$save_file      = fopen($local_filepath, 'w');
+			fwrite($save_file, $contents);
+			fclose($save_file);
+			$guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
+		} else {
+			$local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
+		}
+		$attachment = [
+			'guid'           => $guid,
+			'post_mime_type' => $wp_filetype['type'],
+			'post_title'     => preg_replace('/\.[^.]+$/', '', basename($guid)),
+			'post_content'   => '',
+			'post_status'    => 'inherit',
+		];
+		$attach_id  = wp_insert_attachment($attachment, $guid);
+		if (! $attach_id) {
+			$migration_stage->add_error(
+				sprintf(
+					esc_html__(
+						"Could not create image attachment post from image '%s'. Attachment data was %s.",
+						"event_espresso"
+					),
+					$guid,
+					$this->_json_encode($attachment)
+				)
+			);
+			return $attach_id;
+		}
+		// you must first include the image.php file
+		// for the function wp_generate_attachment_metadata() to work
+		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		$attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
+		if (! $attach_data) {
+			$migration_stage->add_error(
+				sprintf(
+					esc_html__(
+						"Could not generate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.",
+						"event_espresso"
+					),
+					$attach_id,
+					$local_filepath,
+					$guid
+				)
+			);
+			return $attach_id;
+		}
+		$metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
+		if (! $metadata_save_result) {
+			$migration_stage->add_error(
+				sprintf(
+					esc_html__(
+						"Could not update attachment metadata for attachment %d with data %s",
+						"event_espresso"
+					),
+					$attach_id,
+					$this->_json_encode($attach_data)
+				)
+			);
+		}
+		return $attach_id;
+	}
+
+
+	/**
+	 * Finds the attachment post containing info about an image attachment given the GUID (link to the image itself),
+	 * and returns its ID.
+	 *
+	 * @param string $guid
+	 * @return int
+	 * @global wpdb  $wpdb
+	 */
+	private function _get_image_attachment_id_by_GUID(string $guid): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
+	}
+
+
+	/**
+	 * Returns a mysql-formatted DATETIME in UTC time, given a $DATETIME_string
+	 * (and optionally a timezone; if none is given, the wp default is used)
+	 *
+	 * @param EE_Data_Migration_Script_Stage $stage
+	 * @param array                          $row_of_data , the row from the DB (as an array) we're trying to find the
+	 *                                                    UTC time for
+	 * @param string                         $DATETIME_string
+	 * @param string|null                    $timezone
+	 * @return string
+	 */
+	public function convert_date_string_to_utc(
+		EE_Data_Migration_Script_Stage $stage,
+		array $row_of_data,
+		string $DATETIME_string,
+		?string $timezone = null
+	): string {
+		$original_tz = $timezone;
+		if (! $timezone) {
+			$timezone = $this->_get_wp_timezone();
+		}
+		if (! $timezone) {
+			$stage->add_error(
+				sprintf(
+					esc_html__("Could not find timezone given %s for %s", "event_espresso"),
+					$original_tz,
+					$row_of_data
+				)
+			);
+			$timezone = 'UTC';
+		}
+		try {
+			$date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
+			EEH_DTT_Helper::setTimezone($date_obj, new DateTimeZone('UTC'));
+		} catch (Exception $e) {
+			$stage->add_error(
+				sprintf(
+					esc_html__(
+						"Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.",
+						"event_espresso"
+					),
+					$DATETIME_string,
+					$timezone
+				)
+			);
+			$date_obj = new DateTime();
+		}
+		return $date_obj->format('Y-m-d H:i:s');
+	}
+
+
+	/**
+	 * Gets the default timezone string from wordpress (even if they set a gmt offset)
+	 *
+	 * @return string
+	 */
+	private function _get_wp_timezone()
+	{
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
+		// if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
+		if (empty($timezone)) {
+			// let's get a the WordPress UTC offset
+			$offset   = (int) get_option('gmt_offset');
+			$timezone = $this->timezone_convert_to_string_from_offset($offset);
+		}
+		return $timezone;
+	}
+
+
+	/**
+	 * Gets the wordpress timezone string from a UTC offset
+	 *
+	 * @param int $offset
+	 * @return boolean
+	 */
+	private function timezone_convert_to_string_from_offset(int $offset): bool
+	{
+		// shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did not work as expected - its not reliable
+		$offset        *= 3600; // convert hour offset to seconds
+		$abbreviations = timezone_abbreviations_list();
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['offset'] == $offset) {
+					return $city['timezone_id'];
+				}
+			}
+		}
+		return false;
+	}
+
+
+	public function migration_page_hooks()
+	{
+		add_filter(
+			'FHEE__ee_migration_page__header',
+			[$this, '_migrate_page_hook_simplify_version_strings'],
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__ee_migration_page__p_after_header',
+			[$this, '_migration_page_hook_simplify_next_db_state'],
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_1_main',
+			[$this, '_migrate_page_hook_simplify_version_strings'],
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_1_button_text',
+			[$this, '_migrate_page_hook_simplify_version_strings'],
+			10,
+			3
+		);
+		add_action(
+			'AHEE__ee_migration_page__option_1_extra_details',
+			[$this, '_migration_page_hook_option_1_extra_details'],
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_2_main',
+			[$this, '_migrate_page_hook_simplify_version_strings'],
+			10,
+			4
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_2_button_text',
+			[$this, '_migration_page_hook_simplify_next_db_state'],
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_2_details',
+			[$this, '_migration_page_hook_simplify_next_db_state'],
+			10,
+			2
+		);
+		add_action(
+			'AHEE__ee_migration_page__after_migration_options_table',
+			[$this, '_migration_page_hook_after_migration_options_table']
+		);
+		add_filter(
+			'FHEE__ee_migration_page__done_migration_header',
+			[$this, '_migration_page_hook_simplify_next_db_state'],
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__p_after_done_migration_header',
+			[$this, '_migration_page_hook_simplify_next_db_state'],
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__migration_options_template',
+			[$this, 'use_migration_options_from_ee3_template']
+		);
+	}
+
+
+	public function _migrate_page_hook_simplify_version_strings(
+		$old_content,
+		$current_db_state,
+		$next_db_state,
+		$ultimate_db_state = null
+	) {
+		return str_replace(
+			[$current_db_state, $next_db_state, $ultimate_db_state],
+			[
+				esc_html__('EE3', 'event_espresso'),
+				esc_html__('EE4', 'event_espresso'),
+				esc_html__("EE4", 'event_espresso'),
+			],
+			$old_content
+		);
+	}
+
+
+	public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state)
+	{
+		return str_replace($next_db_state, esc_html__("EE4", 'event_espresso'), $old_content);
+	}
+
+
+	public function _migration_page_hook_option_1_extra_details()
+	{
+		?>
         <p><?php
-        printf(
-            esc_html__(
-                "Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents",
-                "event_espresso"
-            )
-        ); ?></p><?php
-    }
-
-
-    public function _migration_page_hook_after_migration_options_table()
-    {
-        ?><p class="ee-attention">
+		printf(
+			esc_html__(
+				"Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents",
+				"event_espresso"
+			)
+		); ?></p><?php
+	}
+
+
+	public function _migration_page_hook_after_migration_options_table()
+	{
+		?><p class="ee-attention">
         <strong><span class="reminder-spn">
                 <?php
-                esc_html_e(
-                    "Important note to those using Event Espresso 3 addons: ",
-                    "event_espresso"
-                ); ?></span></strong>
+				esc_html_e(
+					"Important note to those using Event Espresso 3 addons: ",
+					"event_espresso"
+				); ?></span></strong>
         <br/>
         <?php
-        esc_html_e(
-            "Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.",
-            "event_espresso"
-        ); ?>
+		esc_html_e(
+			"Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.",
+			"event_espresso"
+		); ?>
         </p><?php
-    }
-
-
-    /**
-     * When showing the migration options, show more options and info than normal (ie, give folks the option
-     * to start using EE4 without migrating. From EE3 that's fine, because it doesn't actually remove any data, because
-     * EE4 doesn't have any yet. But when migrating from EE4 it would remove old data, so its not a great idea).
-     *
-     * @param $template_filepath
-     * @return string
-     */
-    public function use_migration_options_from_ee3_template($template_filepath): string
-    {
-        return EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee3.template.php';
-    }
+	}
+
+
+	/**
+	 * When showing the migration options, show more options and info than normal (ie, give folks the option
+	 * to start using EE4 without migrating. From EE3 that's fine, because it doesn't actually remove any data, because
+	 * EE4 doesn't have any yet. But when migrating from EE4 it would remove old data, so its not a great idea).
+	 *
+	 * @param $template_filepath
+	 * @return string
+	 */
+	public function use_migration_options_from_ee3_template($template_filepath): string
+	{
+		return EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee3.template.php';
+	}
 }

Spacing +85 added lines, -85 removed lines

@@ -7,13 +7,13 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages            = glob(EE_CORE . 'data_migration_scripts/4_1_0_stages/*');
+$stages            = glob(EE_CORE.'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = [];
-if (! empty($stages)) {
+if ( ! empty($stages)) {
     foreach ($stages as $filepath) {
         $matches = [];
         preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-        $class_to_filepath[ $matches[1] ] = $filepath;
+        $class_to_filepath[$matches[1]] = $filepath;
     }
 }
 // give addons a chance to autoload their stages too
@@ -83,7 +83,7 @@ 
     {
         global $wpdb;
         return (bool) $wpdb->get_results(
-            "SHOW TABLES LIKE '" . $wpdb->prefix . "events_attendee_checkin" . "'"
+            "SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'"
         );
     }
 
@@ -94,11 +94,11 @@ 
         if (version_compare($version_string, '4.0.0.decaf', '<') && version_compare($version_string, '3.1.26', '>=')) {
             //          echo "$version_string can be migrated fro";
             return true;
-        } elseif (! $version_string) {
+        } elseif ( ! $version_string) {
             //          echo "no version string provided: $version_string";
             // no version string provided... this must be pre 4.1
             // because since 4.1 we're
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
+            return false; // changed mind. dont want people thinking they should migrate yet because they cant
         } else {
             //          echo "$version_string doesnt apply";
             return false;
@@ -113,7 +113,7 @@ 
     public function schema_changes_before_migration()
     {
         // relies on 4.1's EEH_Activation::create_table
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
 
         $table_name = 'esp_answer';
         $sql        = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -524,12 +524,12 @@ 
     public function insert_default_states()
     {
         global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
+        $state_table = $wpdb->prefix."esp_state";
         if ($this->_get_table_analysis()->tableExists($state_table)) {
-            $SQL    = "SELECT COUNT('STA_ID') FROM " . $state_table;
+            $SQL    = "SELECT COUNT('STA_ID') FROM ".$state_table;
             $states = $wpdb->get_var($SQL);
-            if (! $states) {
-                $SQL = "INSERT INTO " . $state_table . "
+            if ( ! $states) {
+                $SQL = "INSERT INTO ".$state_table."
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -620,12 +620,12 @@ 
     public function insert_default_countries()
     {
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         if ($this->_get_table_analysis()->tableExists($country_table)) {
-            $SQL       = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+            $SQL       = "SELECT COUNT('CNT_ISO') FROM ".$country_table;
             $countries = $wpdb->get_var($SQL);
-            if (! $countries) {
-                $SQL = "INSERT INTO " . $country_table . "
+            if ( ! $countries) {
+                $SQL = "INSERT INTO ".$country_table."
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -870,17 +870,17 @@ 
     public function insert_default_price_types()
     {
         global $wpdb;
-        $price_type_table = $wpdb->prefix . "esp_price_type";
+        $price_type_table = $wpdb->prefix."esp_price_type";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL               = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
+            $SQL               = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
             $price_types_exist = $wpdb->get_var($SQL);
-            if (! $price_types_exist) {
+            if ( ! $price_types_exist) {
                 $SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
-							(1, '" . esc_html__('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
-							(2, '" . esc_html__('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
-							(3, '" . esc_html__('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
-							(4, '" . esc_html__('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
-							(5, '" . esc_html__('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
+							(1, '".esc_html__('Base Price', 'event_espresso')."', 1,  0, 0, 0),
+							(2, '" . esc_html__('Percent Discount', 'event_espresso')."', 2,  1, 20, 0),
+							(3, '" . esc_html__('Fixed Discount', 'event_espresso')."', 2,  0, 30, 0),
+							(4, '" . esc_html__('Percent Surcharge', 'event_espresso')."', 3,  1, 40, 0),
+							(5, '" . esc_html__('Fixed Surcharge', 'event_espresso')."', 3,  0, 50, 0);";
                 $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
                 $wpdb->query($SQL);
             }
@@ -902,11 +902,11 @@ 
     public function insert_default_prices()
     {
         global $wpdb;
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_table = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_table)) {
-            $SQL          = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
+            $SQL          = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
             $prices_exist = $wpdb->get_var($SQL);
-            if (! $prices_exist) {
+            if ( ! $prices_exist) {
                 $SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Admission', '', 1, null, 0, 0, 0);";
@@ -929,25 +929,25 @@ 
     public function insert_default_tickets()
     {
         global $wpdb;
-        $ticket_table = $wpdb->prefix . "esp_ticket";
+        $ticket_table = $wpdb->prefix."esp_ticket";
         if ($this->_get_table_analysis()->tableExists($ticket_table)) {
-            $SQL           = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+            $SQL           = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
             $tickets_exist = $wpdb->get_var($SQL);
-            if (! $tickets_exist) {
+            if ( ! $tickets_exist) {
                 $SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" .
-                       esc_html__("Free Ticket", "event_espresso") .
+					( 1, 0, '".
+                       esc_html__("Free Ticket", "event_espresso").
                        "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
                 $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
                 $wpdb->query($SQL);
             }
         }
-        $ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+        $ticket_price_table = $wpdb->prefix."esp_ticket_price";
         if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
-            $SQL              = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+            $SQL              = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
             $ticket_prc_exist = $wpdb->get_var($SQL);
-            if (! $ticket_prc_exist) {
+            if ( ! $ticket_prc_exist) {
                 $SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
@@ -972,11 +972,11 @@ 
      */
     public function get_or_create_country($country_name): array
     {
-        if (! $country_name) {
+        if ( ! $country_name) {
             throw new EE_Error(esc_html__("Could not get a country because country name is blank", "event_espresso"));
         }
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         if (is_int($country_name)) {
             $country_name = $this->get_iso_from_3_1_country_id($country_name);
         }
@@ -992,7 +992,7 @@ 
             ),
             ARRAY_A
         );
-        if (! $country) {
+        if ( ! $country) {
             // insert a new one then
             $cols_n_values = [
                 'CNT_ISO'         => $this->_find_available_country_iso(),
@@ -1011,29 +1011,29 @@ 
                 'CNT_is_EU'       => false,
                 'CNT_active'      => true,
             ];
-            $data_types    = [
-                '%s',// CNT_ISO
-                '%s',// CNT_ISO3
-                '%d',// RGN_ID
-                '%s',// CNT_name
-                '%s',// CNT_cur_code
-                '%s',// CNT_cur_single
-                '%s',// CNT_cur_plural
-                '%s',// CNT_cur_sign
-                '%d',// CNT_cur_sign_b4
-                '%d',// CNT_cur_dec_plc
-                '%s',// CNT_cur_dec_mrk
-                '%s',// CNT_cur_thsnds
-                '%s',// CNT_tel_code
-                '%d',// CNT_is_EU
-                '%d',// CNT_active
+            $data_types = [
+                '%s', // CNT_ISO
+                '%s', // CNT_ISO3
+                '%d', // RGN_ID
+                '%s', // CNT_name
+                '%s', // CNT_cur_code
+                '%s', // CNT_cur_single
+                '%s', // CNT_cur_plural
+                '%s', // CNT_cur_sign
+                '%d', // CNT_cur_sign_b4
+                '%d', // CNT_cur_dec_plc
+                '%s', // CNT_cur_dec_mrk
+                '%s', // CNT_cur_thsnds
+                '%s', // CNT_tel_code
+                '%d', // CNT_is_EU
+                '%d', // CNT_active
             ];
-            $success       = $wpdb->insert(
+            $success = $wpdb->insert(
                 $country_table,
                 $cols_n_values,
                 $data_types
             );
-            if (! $success) {
+            if ( ! $success) {
                 throw new EE_Error(
                     $this->_create_error_message_for_db_insertion(
                         'N/A',
@@ -1060,13 +1060,13 @@ 
     private function _find_available_country_iso(int $num_letters = 2): string
     {
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         $attempts      = 0;
         do {
             $current_iso           = strtoupper(wp_generate_password($num_letters, false));
             $country_with_that_iso = $wpdb->get_var(
                 $wpdb->prepare(
-                    "SELECT count(CNT_ISO) FROM " . $country_table . " WHERE CNT_ISO=%s",
+                    "SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s",
                     $current_iso
                 )
             );
@@ -1074,7 +1074,7 @@ 
             // keep going until we find an available country code, or we arbitrarily
             // decide we've tried this enough. Somehow they have way too many countries
             // (probably because they're mis-using the EE3 country_id like a custom question)
-        } while (intval($country_with_that_iso) && $attempts < 200);
+        }while (intval($country_with_that_iso) && $attempts < 200);
         return $current_iso;
     }
 
@@ -1091,7 +1091,7 @@ 
      */
     public function get_or_create_state(string $state_name, $country_name = ''): array
     {
-        if (! $state_name) {
+        if ( ! $state_name) {
             throw new EE_Error(
                 esc_html__(
                     "Could not get-or-create state because no state name was provided",
@@ -1106,7 +1106,7 @@ 
             $country_iso = $this->get_default_country_iso();
         }
         global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
+        $state_table = $wpdb->prefix."esp_state";
         $state       = $wpdb->get_row(
             $wpdb->prepare(
                 "SELECT * FROM $state_table WHERE
@@ -1119,7 +1119,7 @@ 
             ),
             ARRAY_A
         );
-        if (! $state) {
+        if ( ! $state) {
             // insert a new one then
             $cols_n_values = [
                 'CNT_ISO'    => $country_iso,
@@ -1127,14 +1127,14 @@ 
                 'STA_name'   => $state_name,
                 'STA_active' => true,
             ];
-            $data_types    = [
-                '%s',// CNT_ISO
-                '%s',// STA_abbrev
-                '%s',// STA_name
-                '%d',// STA_active
+            $data_types = [
+                '%s', // CNT_ISO
+                '%s', // STA_abbrev
+                '%s', // STA_name
+                '%d', // STA_active
             ];
-            $success       = $wpdb->insert($state_table, $cols_n_values, $data_types);
-            if (! $success) {
+            $success = $wpdb->insert($state_table, $cols_n_values, $data_types);
+            if ( ! $success) {
                 throw new EE_Error(
                     $this->_create_error_message_for_db_insertion(
                         'N/A',
@@ -1164,7 +1164,7 @@ 
     {
         $matches = [];
         preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
-        if (! $matches || count($matches) < 3) {
+        if ( ! $matches || count($matches) < 3) {
             $hour    = '00';
             $minutes = '00';
         } else {
@@ -1413,7 +1413,7 @@ 
             [225, 'Zambia', 'ZM', 'ZMB', 1],
             [226, 'Zimbabwe', 'ZW', 'ZWE', 1],
         ];
-        $country_iso   = 'US';
+        $country_iso = 'US';
         foreach ($old_countries as $country_array) {
             // note: index 0 is the 3.1 country ID
             if ($country_array[0] == $country_id) {
@@ -1467,7 +1467,7 @@ 
                 'Declined'         => 'RPP',
             ];
         }
-        return $mapping[ $payment_status ] ?? 'RNA';
+        return $mapping[$payment_status] ?? 'RNA';
     }
 
 
@@ -1490,7 +1490,7 @@ 
         if ($guid) {
             // check for an existing attachment post with this guid
             $attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-            if (! $attachment_post_id) {
+            if ( ! $attachment_post_id) {
                 // post thumbnail with that GUID doesn't exist, we should create one
                 $attachment_post_id      = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
                 $created_attachment_post = true;
@@ -1531,7 +1531,7 @@ 
         $original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
         // do a head request to verify the file exists
         $head_response = wp_remote_head($original_guid);
-        if (! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
+        if ( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
             return $original_guid;
         }
         return $guid_in_old_event;
@@ -1549,7 +1549,7 @@ 
      */
     private function _create_image_attachment_from_GUID(string $guid, EE_Data_Migration_Script_Stage $migration_stage)
     {
-        if (! $guid) {
+        if ( ! $guid) {
             $migration_stage->add_error(
                 esc_html__(
                     "Cannot create image attachment for a blank GUID!",
@@ -1564,7 +1564,7 @@ 
         // needs the file to be local
         if (strpos($guid, $wp_upload_dir['url']) === false) {
             // image is located remotely. download it and place it in the uploads directory
-            if (! is_readable($guid)) {
+            if ( ! is_readable($guid)) {
                 $migration_stage->add_error(
                     sprintf(
                         esc_html__(
@@ -1589,7 +1589,7 @@ 
                 );
                 return false;
             }
-            $local_filepath = $wp_upload_dir['path'] . '/' . basename($guid);
+            $local_filepath = $wp_upload_dir['path'].'/'.basename($guid);
             $save_file      = fopen($local_filepath, 'w');
             fwrite($save_file, $contents);
             fclose($save_file);
@@ -1604,8 +1604,8 @@ 
             'post_content'   => '',
             'post_status'    => 'inherit',
         ];
-        $attach_id  = wp_insert_attachment($attachment, $guid);
-        if (! $attach_id) {
+        $attach_id = wp_insert_attachment($attachment, $guid);
+        if ( ! $attach_id) {
             $migration_stage->add_error(
                 sprintf(
                     esc_html__(
@@ -1620,9 +1620,9 @@ 
         }
         // you must first include the image.php file
         // for the function wp_generate_attachment_metadata() to work
-        require_once(ABSPATH . 'wp-admin/includes/image.php');
+        require_once(ABSPATH.'wp-admin/includes/image.php');
         $attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
-        if (! $attach_data) {
+        if ( ! $attach_data) {
             $migration_stage->add_error(
                 sprintf(
                     esc_html__(
@@ -1637,7 +1637,7 @@ 
             return $attach_id;
         }
         $metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
-        if (! $metadata_save_result) {
+        if ( ! $metadata_save_result) {
             $migration_stage->add_error(
                 sprintf(
                     esc_html__(
@@ -1686,10 +1686,10 @@ 
         ?string $timezone = null
     ): string {
         $original_tz = $timezone;
-        if (! $timezone) {
+        if ( ! $timezone) {
             $timezone = $this->_get_wp_timezone();
         }
-        if (! $timezone) {
+        if ( ! $timezone) {
             $stage->add_error(
                 sprintf(
                     esc_html__("Could not find timezone given %s for %s", "event_espresso"),
@@ -1746,7 +1746,7 @@ 
     private function timezone_convert_to_string_from_offset(int $offset): bool
     {
         // shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did not work as expected - its not reliable
-        $offset        *= 3600; // convert hour offset to seconds
+        $offset *= 3600; // convert hour offset to seconds
         $abbreviations = timezone_abbreviations_list();
         foreach ($abbreviations as $abbreviation) {
             foreach ($abbreviation as $city) {
@@ -1898,6 +1898,6 @@ 
      */
     public function use_migration_options_from_ee3_template($template_filepath): string
     {
-        return EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee3.template.php';
+        return EE_MAINTENANCE_TEMPLATE_PATH.'migration_options_from_ee3.template.php';
     }
 }

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

Indentation +119 added lines, -119 removed lines

@@ -31,136 +31,136 @@
 class EE_DMS_4_1_0_answers extends EE_Data_Migration_Script_Stage_Table
 {
 
-    private string $_new_answer_table;
+	private string $_new_answer_table;
 
-    private string $_new_question_table;
+	private string $_new_question_table;
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Answers", "event_espresso");
-        $this->_old_table   = $wpdb->prefix . "events_answer";
-        // join to attendee and then join to events table
-        $this->select_expression   = 'ans.*, e.event_status';
-        $this->_extra_where_sql    = ' AS ans
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Answers", "event_espresso");
+		$this->_old_table   = $wpdb->prefix . "events_answer";
+		// join to attendee and then join to events table
+		$this->select_expression   = 'ans.*, e.event_status';
+		$this->_extra_where_sql    = ' AS ans
             INNER JOIN ' . $wpdb->prefix . 'events_attendee AS att ON ans.attendee_id = att.id
             INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id = e.id
             WHERE e.event_status !="D"';
-        $this->_new_answer_table   = $wpdb->prefix . "esp_answer";
-        $this->_new_question_table = $wpdb->prefix . "esp_question";
-        parent::__construct();
-    }
+		$this->_new_answer_table   = $wpdb->prefix . "esp_answer";
+		$this->_new_question_table = $wpdb->prefix . "esp_question";
+		parent::__construct();
+	}
 
 
-    /**
-     * @throws EE_Error
-     */
-    protected function _migrate_old_row($old_row)
-    {
-        // get the new REGs for the old answer
-        global $wpdb;
-        $old_attendee_table = $wpdb->prefix . "events_attendee";
-        $new_reg_table      = $wpdb->prefix . "esp_registration";
-        $regs               =
-            $this->get_migration_script()->get_mapping_new_pk(
-                $old_attendee_table,
-                $old_row['attendee_id'],
-                $new_reg_table
-            );
-        if (! $regs) {
-            $this->add_error(
-                sprintf(
-                    esc_html__(
-                        "Could not find new registrations for old attendee %d when creating answer %s",
-                        "event_espresso"
-                    ),
-                    $old_row['attendee_id'],
-                    $this->_json_encode($old_row)
-                )
-            );
-            return;
-        }
-        // as inefficient as this sounds, we create an answer per REGISTRATION, (even if the registrations use the same attendee)
-        foreach ($regs as $new_reg_id) {
-            $this->_insert_new_answer($old_row, $new_reg_id);
-        }
-    }
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _migrate_old_row($old_row)
+	{
+		// get the new REGs for the old answer
+		global $wpdb;
+		$old_attendee_table = $wpdb->prefix . "events_attendee";
+		$new_reg_table      = $wpdb->prefix . "esp_registration";
+		$regs               =
+			$this->get_migration_script()->get_mapping_new_pk(
+				$old_attendee_table,
+				$old_row['attendee_id'],
+				$new_reg_table
+			);
+		if (! $regs) {
+			$this->add_error(
+				sprintf(
+					esc_html__(
+						"Could not find new registrations for old attendee %d when creating answer %s",
+						"event_espresso"
+					),
+					$old_row['attendee_id'],
+					$this->_json_encode($old_row)
+				)
+			);
+			return;
+		}
+		// as inefficient as this sounds, we create an answer per REGISTRATION, (even if the registrations use the same attendee)
+		foreach ($regs as $new_reg_id) {
+			$this->_insert_new_answer($old_row, $new_reg_id);
+		}
+	}
 
 
-    /**
-     * @param array $old_answer
-     * @param int   $new_reg_id
-     * @return void
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_answer(array $old_answer, int $new_reg_id): void
-    {
-        global $wpdb;
-        $old_question_table = $wpdb->prefix . "events_question";
-        $new_question_id    =
-            $this->get_migration_script()->get_mapping_new_pk(
-                $old_question_table,
-                $old_answer['question_id'],
-                $this->_new_question_table
-            );
+	/**
+	 * @param array $old_answer
+	 * @param int   $new_reg_id
+	 * @return void
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_answer(array $old_answer, int $new_reg_id): void
+	{
+		global $wpdb;
+		$old_question_table = $wpdb->prefix . "events_question";
+		$new_question_id    =
+			$this->get_migration_script()->get_mapping_new_pk(
+				$old_question_table,
+				$old_answer['question_id'],
+				$this->_new_question_table
+			);
 
-        $question_row = $this->_get_question_type_and_system($new_question_id);
-        if ($question_row['QST_system']) {
-            // It's an answer to a system question? EE3 used to store that on both the attendee and the answers column,
-            // but not EE4! It's just stored in the attendee meta table. The answers table is ONLY for answers to custom
-            // questions.
-            return;
-        }
-        if ($question_row['QST_type'] == 'MULTIPLE') {
-            $ans_value = serialize(explode(",", stripslashes($old_answer['answer'])));
-        } else {
-            $ans_value = stripslashes($old_answer['answer']);
-        }
-        $cols_n_values = [
-            'REG_ID'    => $new_reg_id,
-            'QST_ID'    => $new_question_id,
-            'ANS_value' => $ans_value,
-        ];
-        $data_types    = [
-            '%d',// REG_ID
-            '%d',// QST_ID
-            '%s',// ANS_value
-        ];
-        $success       = $wpdb->insert($this->_new_answer_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_answer,
-                    $this->_new_answer_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
+		$question_row = $this->_get_question_type_and_system($new_question_id);
+		if ($question_row['QST_system']) {
+			// It's an answer to a system question? EE3 used to store that on both the attendee and the answers column,
+			// but not EE4! It's just stored in the attendee meta table. The answers table is ONLY for answers to custom
+			// questions.
+			return;
+		}
+		if ($question_row['QST_type'] == 'MULTIPLE') {
+			$ans_value = serialize(explode(",", stripslashes($old_answer['answer'])));
+		} else {
+			$ans_value = stripslashes($old_answer['answer']);
+		}
+		$cols_n_values = [
+			'REG_ID'    => $new_reg_id,
+			'QST_ID'    => $new_question_id,
+			'ANS_value' => $ans_value,
+		];
+		$data_types    = [
+			'%d',// REG_ID
+			'%d',// QST_ID
+			'%s',// ANS_value
+		];
+		$success       = $wpdb->insert($this->_new_answer_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_answer,
+					$this->_new_answer_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
 
 
-    /**
-     * Gets the question's type
-     *
-     * @param int   $question_id
-     * @return array
-     *  - @type string $QST_type
-     *  - @type string $QST_system
-     * @global wpdb $wpdb
-     */
-    private function _get_question_type_and_system(int $question_id): array
-    {
-        global $wpdb;
-        return $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT QST_type, QST_system FROM " . $this->_new_question_table . " WHERE QST_ID=%d LIMIT 1",
-                $question_id
-            ),
-            ARRAY_A
-        );
-    }
+	/**
+	 * Gets the question's type
+	 *
+	 * @param int   $question_id
+	 * @return array
+	 *  - @type string $QST_type
+	 *  - @type string $QST_system
+	 * @global wpdb $wpdb
+	 */
+	private function _get_question_type_and_system(int $question_id): array
+	{
+		global $wpdb;
+		return $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT QST_type, QST_system FROM " . $this->_new_question_table . " WHERE QST_ID=%d LIMIT 1",
+				$question_id
+			),
+			ARRAY_A
+		);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -40,15 +40,15 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__("Answers", "event_espresso");
-        $this->_old_table   = $wpdb->prefix . "events_answer";
+        $this->_old_table   = $wpdb->prefix."events_answer";
         // join to attendee and then join to events table
         $this->select_expression   = 'ans.*, e.event_status';
         $this->_extra_where_sql    = ' AS ans
-            INNER JOIN ' . $wpdb->prefix . 'events_attendee AS att ON ans.attendee_id = att.id
-            INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id = e.id
+            INNER JOIN ' . $wpdb->prefix.'events_attendee AS att ON ans.attendee_id = att.id
+            INNER JOIN ' . $wpdb->prefix.'events_detail AS e ON att.event_id = e.id
             WHERE e.event_status !="D"';
-        $this->_new_answer_table   = $wpdb->prefix . "esp_answer";
-        $this->_new_question_table = $wpdb->prefix . "esp_question";
+        $this->_new_answer_table   = $wpdb->prefix."esp_answer";
+        $this->_new_question_table = $wpdb->prefix."esp_question";
         parent::__construct();
     }
 
@@ -60,15 +60,15 @@ 
     {
         // get the new REGs for the old answer
         global $wpdb;
-        $old_attendee_table = $wpdb->prefix . "events_attendee";
-        $new_reg_table      = $wpdb->prefix . "esp_registration";
+        $old_attendee_table = $wpdb->prefix."events_attendee";
+        $new_reg_table      = $wpdb->prefix."esp_registration";
         $regs               =
             $this->get_migration_script()->get_mapping_new_pk(
                 $old_attendee_table,
                 $old_row['attendee_id'],
                 $new_reg_table
             );
-        if (! $regs) {
+        if ( ! $regs) {
             $this->add_error(
                 sprintf(
                     esc_html__(
@@ -98,7 +98,7 @@ 
     private function _insert_new_answer(array $old_answer, int $new_reg_id): void
     {
         global $wpdb;
-        $old_question_table = $wpdb->prefix . "events_question";
+        $old_question_table = $wpdb->prefix."events_question";
         $new_question_id    =
             $this->get_migration_script()->get_mapping_new_pk(
                 $old_question_table,
@@ -123,13 +123,13 @@ 
             'QST_ID'    => $new_question_id,
             'ANS_value' => $ans_value,
         ];
-        $data_types    = [
-            '%d',// REG_ID
-            '%d',// QST_ID
-            '%s',// ANS_value
+        $data_types = [
+            '%d', // REG_ID
+            '%d', // QST_ID
+            '%s', // ANS_value
         ];
-        $success       = $wpdb->insert($this->_new_answer_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_answer_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -157,7 +157,7 @@ 
         global $wpdb;
         return $wpdb->get_row(
             $wpdb->prepare(
-                "SELECT QST_type, QST_system FROM " . $this->_new_question_table . " WHERE QST_ID=%d LIMIT 1",
+                "SELECT QST_type, QST_system FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1",
                 $question_id
             ),
             ARRAY_A

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

Indentation +912 added lines, -912 removed lines

@@ -223,937 +223,937 @@
 class EE_DMS_4_1_0_attendees extends EE_Data_Migration_Script_Stage_Table
 {
 
-    private string $_new_attendee_cpt_table;
+	private string $_new_attendee_cpt_table;
 
-    private string $_new_attendee_meta_table;
+	private string $_new_attendee_meta_table;
 
-    private string $_new_reg_table;
+	private string $_new_reg_table;
 
-    private string $_new_transaction_table;
+	private string $_new_transaction_table;
 
-    private string $_new_payment_table;
+	private string $_new_payment_table;
 
-    private string $_old_mer_table;
+	private string $_old_mer_table;
 
-    private string $_new_ticket_table;
+	private string $_new_ticket_table;
 
-    private string $_new_ticket_datetime_table;
+	private string $_new_ticket_datetime_table;
 
-    private string $_new_datetime_table;
+	private string $_new_datetime_table;
 
-    private string $_new_datetime_ticket_table;
+	private string $_new_datetime_ticket_table;
 
-    private string $_new_price_table;
+	private string $_new_price_table;
 
-    private string $_new_ticket_price_table;
+	private string $_new_ticket_price_table;
 
-    /**
-     * Remembers whether the mer table exists
-     *
-     * @var boolean
-     */
-    private ?bool $_mer_tables_exist = null;
+	/**
+	 * Remembers whether the mer table exists
+	 *
+	 * @var boolean
+	 */
+	private ?bool $_mer_tables_exist = null;
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Attendees", "event_espresso");
-        $this->_old_table   = $wpdb->prefix . "events_attendee";
-        // Only select the event status column from the event table.
-        $this->select_expression = 'att.*, e.event_status';
-        // Only select attendees for events that aren't deleted.
-        $this->_extra_where_sql           = 'AS att
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Attendees", "event_espresso");
+		$this->_old_table   = $wpdb->prefix . "events_attendee";
+		// Only select the event status column from the event table.
+		$this->select_expression = 'att.*, e.event_status';
+		// Only select attendees for events that aren't deleted.
+		$this->_extra_where_sql           = 'AS att
             INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_old_mer_table             = $wpdb->prefix . "events_multi_event_registration_id_group";
-        $this->_new_attendee_cpt_table    = $wpdb->posts;
-        $this->_new_attendee_meta_table   = $wpdb->prefix . "esp_attendee_meta";
-        $this->_new_reg_table             = $wpdb->prefix . "esp_registration";
-        $this->_new_transaction_table     = $wpdb->prefix . "esp_transaction";
-        $this->_new_payment_table         = $wpdb->prefix . "esp_payment";
-        $this->_new_ticket_table          = $wpdb->prefix . "esp_ticket";
-        $this->_new_ticket_datetime_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_datetime_table        = $wpdb->prefix . "esp_datetime";
-        $this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_price_table           = $wpdb->prefix . "esp_price";
-        $this->_new_ticket_price_table    = $wpdb->prefix . "esp_ticket_price";
-        parent::__construct();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _migrate_old_row($old_row)
-    {
-        // first check if there's already a new attendee with similar characteristics
-        $new_att_id = $this->_find_attendee_cpt_matching($old_row);
-        if (! $new_att_id) {
-            $new_att_id = $this->_insert_new_attendee_cpt($old_row);
-            if (! $new_att_id) {
-                // if we couldn't even make an attendee, abandon all hope
-                return;
-            }
-            $new_att_meta_id = $this->_insert_attendee_meta_row($old_row, $new_att_id);
-            if ($new_att_meta_id) {
-                $this->get_migration_script()->set_mapping(
-                    $this->_old_table,
-                    $old_row['id'],
-                    $this->_new_attendee_meta_table,
-                    $new_att_meta_id
-                );
-            }
-        }
-        $this->get_migration_script()->set_mapping(
-            $this->_old_table,
-            $old_row['id'],
-            $this->_new_attendee_cpt_table,
-            $new_att_id
-        );
-
-        $txn_id = $this->_insert_new_transaction($old_row);
-        if (! $txn_id) {
-            // if we couldn't make the transaction, also abandon all hope
-            return;
-        }
-        $this->get_migration_script()->set_mapping(
-            $this->_old_table,
-            $old_row['id'],
-            $this->_new_transaction_table,
-            $txn_id
-        );
-        $pay_id = $this->_insert_new_payment($old_row, $txn_id);
-        if ($pay_id) {
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $old_row['id'],
-                $this->_new_payment_table,
-                $pay_id
-            );
-        }
-
-
-        // even if there was no payment, we can go ahead with adding the reg
-        $new_regs = $this->_insert_new_registrations($old_row, $new_att_id, $txn_id);
-        if ($new_regs) {
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $old_row['id'],
-                $this->_new_reg_table,
-                $new_regs
-            );
-        }
-    }
-
-
-    /**
-     * Checks if there's already an attendee CPT in the db that has the same
-     * first and last name, and email. If so, returns its ID as an int.
-     *
-     * @param array $old_attendee
-     * @return int
-     * @global wpdb $wpdb
-     */
-    private function _find_attendee_cpt_matching(array $old_attendee): int
-    {
-        global $wpdb;
-        $existing_attendee_id =
-            $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT id FROM " .
-                    $this->_new_attendee_cpt_table .
-                    " AS cpt INNER JOIN " .
-                    $this->_new_attendee_meta_table .
-                    " AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1",
-                    $old_attendee['fname'],
-                    $old_attendee['lname'],
-                    $old_attendee['email']
-                )
-            );
-        return intval($existing_attendee_id);
-    }
-
-
-    private function _insert_new_attendee_cpt($old_attendee): int
-    {
-        global $wpdb;
-        $cols_n_values = [
-            'post_title'    => stripslashes($old_attendee['fname'] . " " . $old_attendee['lname']),// ATT_full_name
-            'post_content'  => '',// ATT_bio
-            'post_name'     => sanitize_title($old_attendee['fname'] . "-" . $old_attendee['lname']),// ATT_slug
-            'post_date'     => $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_attendee,
-                $old_attendee['date']
-            ),// ATT_created
-            'post_excerpt'  => '',// ATT_short_bio
-            'post_modified' => $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_attendee,
-                $old_attendee['date']
-            ),// ATT_modified
-            'post_author'   => 0,// ATT_author
-            'post_parent'   => 0,// ATT_parent
-            'post_type'     => 'espresso_attendees',// post_type
-            'post_status'   => 'publish',// status
-        ];
-        $data_types    = [
-            '%s',// ATT_full_name
-            '%s',// ATT_bio
-            '%s',// ATT_slug
-            '%s',// ATT_created
-            '%s',// ATT_short_bio
-            '%s',// ATT_modified
-            '%d',// ATT_author
-            '%d',// ATT_parent
-            '%s',// post_type
-            '%s',// status
-        ];
-        $success       = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_attendee,
-                    $this->_new_attendee_cpt_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    private function _insert_attendee_meta_row($old_attendee, $new_attendee_cpt_id): int
-    {
-        global $wpdb;
-        // get the state and country ids from the old row
-        try {
-            $new_country     =
-                $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
-            $new_country_iso = $new_country['CNT_ISO'];
-        } catch (EE_Error $exception) {
-            $new_country_iso = $this->get_migration_script()->get_default_country_iso();
-        }
-        try {
-            $new_state    =
-                $this->get_migration_script()->get_or_create_state(
-                    stripslashes($old_attendee['state']),
-                    $new_country_iso
-                );
-            $new_state_id = $new_state['STA_ID'];
-        } catch (EE_Error $exception) {
-            $new_state_id = 0;
-        }
-        $cols_n_values = [
-            'ATT_ID'       => $new_attendee_cpt_id,
-            'ATT_fname'    => stripslashes($old_attendee['fname']),
-            'ATT_lname'    => stripslashes($old_attendee['lname']),
-            'ATT_address'  => stripslashes($old_attendee['address']),
-            'ATT_address2' => stripslashes($old_attendee['address2']),
-            'ATT_city'     => stripslashes($old_attendee['city']),
-            'STA_ID'       => $new_state_id,
-            'CNT_ISO'      => $new_country_iso,
-            'ATT_zip'      => stripslashes($old_attendee['zip']),
-            'ATT_email'    => stripslashes($old_attendee['email']),
-            'ATT_phone'    => stripslashes($old_attendee['phone']),
-        ];
-        $data_types    = [
-            '%d',// ATT_ID
-            '%s',// ATT_fname
-            '%s',// ATT_lname
-            '%s',// ATT_address
-            '%s',// ATT_address2
-            '%s',// ATT_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// ATT_zip
-            '%s',// ATT_email
-            '%s',// ATT_phone
-        ];
-        $success       = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_attendee,
-                    $this->_new_attendee_meta_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Note: we don't necessarily create a new transaction for each attendee row.
-     * Only if the old attendee 'is_primary' is true; otherwise we find the old attendee row that
-     * 'is_primary' and has the same 'txn_id', then we return ITS new transaction id
-     *
-     * @param array $old_attendee
-     * @return int new transaction id
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_transaction(array $old_attendee): int
-    {
-        global $wpdb;
-
-        // first: let's check for an existing transaction for this old attendee
-        if (intval($old_attendee['is_primary'])) {// primary attendee, so create txn
-            $txn_id =
-                $this->get_migration_script()->get_mapping_new_pk(
-                    $this->_old_table,
-                    intval($old_attendee['id']),
-                    $this->_new_transaction_table
-                );
-        } else { // non-primary attendee, so find its primary attendee's transaction
-            $primary_attendee_old_id =
-                $wpdb->get_var(
-                    $wpdb->prepare(
-                        "SELECT id FROM " . $this->_old_table . " WHERE is_primary=1 and registration_id=%s",
-                        $old_attendee['registration_id']
-                    )
-                );
-            if (! $primary_attendee_old_id) {
-                $primary_attendee        =
-                    $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
-                $primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : null;
-            }
-            $txn_id =
-                $this->get_migration_script()->get_mapping_new_pk(
-                    $this->_old_table,
-                    intval($primary_attendee_old_id),
-                    $this->_new_transaction_table
-                );
-            if (! $txn_id) {
-                $this->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.",
-                            "event_espresso"
-                        ),
-                        $this->_json_encode($old_attendee),
-                        $primary_attendee_old_id
-                    )
-                );
-                $txn_id = 0;
-            }
-        }
-        // if there isn't yet a transaction row for this, create one
-        // (so even if it was a non-primary attendee with no EE3 primary attendee,
-        // it ought to have SOME transaction, so we'll make one)
-        if (! $txn_id) {
-            // maps 3.1 payment stati onto 4.1 transaction stati
-            $txn_status_mapping = [
-                'Completed'        => 'TCM',
-                'Pending'          => 'TIN',
-                'Payment Declined' => 'TIN',
-                'Incomplete'       => 'TIN',
-                'Not Completed'    => 'TIN',
-                'Cancelled'        => 'TIN',
-                'Declined'         => 'TIN',
-            ];
-            $STS_ID             = $txn_status_mapping[ $old_attendee['payment_status'] ] ?? 'TIN';
-            $cols_n_values      = [
-                'TXN_timestamp' => $this->get_migration_script()->convert_date_string_to_utc(
-                    $this,
-                    $old_attendee,
-                    $old_attendee['date']
-                ),
-                'TXN_total'     => floatval($old_attendee['total_cost']),
-                'TXN_paid'      => floatval($old_attendee['amount_pd']),
-                'STS_ID'        => $STS_ID,
-                'TXN_hash_salt' => $old_attendee['hashSalt'],
-            ];
-            $data_types         = [
-                '%s',// TXN_timestamp
-                '%f',// TXN_total
-                '%f',// TXN_paid
-                '%s',// STS_ID
-                '%s',// TXN_hash_salt
-            ];
-            $success            = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $data_types);
-            if (! $success) {
-                $this->add_error(
-                    $this->get_migration_script()->_create_error_message_for_db_insertion(
-                        $this->_old_table,
-                        $old_attendee,
-                        $this->_new_transaction_table,
-                        $cols_n_values,
-                        $data_types
-                    )
-                );
-                return 0;
-            }
-            $txn_id = $wpdb->insert_id;
-        }
-
-        return $txn_id;
-    }
-
-
-    /**
-     * Detects if the MER tables exist
-     *
-     * @return boolean
-     * @global wpdb $wpdb
-     */
-    private function _mer_tables_exist(): ?bool
-    {
-        if ($this->_mer_tables_exist === null) {
-            global $wpdb;
-
-            if ($wpdb->get_var("SHOW TABLES LIKE '$this->_old_mer_table'") != $this->_old_mer_table) {
-                $this->_mer_tables_exist = false;
-            } else {
-                $this->_mer_tables_exist = true;
-            }
-        }
-        return $this->_mer_tables_exist;
-    }
-
-
-    /**
-     * Gets the 4.1 registration's status given the 3.1 attendee row. We consider
-     * whether the event required pre-approval or not,a dn the 4.1 payment status.
-     *
-     * @param array $old_attendee_row
-     * @return string
-     * @global wpdb $wpdb
-     */
-    private function _get_reg_status_for_old_payment_status(array $old_attendee_row): string
-    {
-        // need event default reg status and if pre_approval was required
-        global $wpdb;
-        $event_required_pre_approval =
-            $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT require_pre_approval FROM " . $wpdb->prefix . "events_detail WHERE id = %d",
-                    $old_attendee_row['event_id']
-                )
-            );
-        return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
-            $old_attendee_row['payment_status'],
-            intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve'])
-        );
-    }
-
-
-    /**
-     * Adds however many registrations are indicated by the old attendee's QUANTITY field,
-     * and returns an array of their IDs
-     *
-     * @param array $old_attendee
-     * @param int   $new_attendee_id
-     * @param int   $new_txn_id
-     * @return array of new registration ids
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_registrations(array $old_attendee, int $new_attendee_id, int $new_txn_id): array
-    {
-        global $wpdb;
-
-        $STS_ID       = $this->_get_reg_status_for_old_payment_status($old_attendee);
-        $new_event_id =
-            $this->get_migration_script()->get_mapping_new_pk(
-                $wpdb->prefix . 'events_detail',
-                $old_attendee['event_id'],
-                $wpdb->posts
-            );
-        if (! $new_event_id) {
-            $this->add_error(
-                sprintf(
-                    esc_html__(
-                        "Could not find NEW event CPT ID for old event '%d' on old attendee %s",
-                        "event_espresso"
-                    ),
-                    $old_attendee['event_id'],
-                    $this->_json_encode($old_attendee)
-                )
-            );
-        }
-
-        $ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
-        if (! $ticket_id) {
-            $ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
-            $this->add_error(
-                sprintf(
-                    esc_html__(
-                        'Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d',
-                        'event_espresso'
-                    ),
-                    $old_attendee['id'],
-                    $new_event_id,
-                    $ticket_id
-                )
-            );
-        }
-        $regs_on_this_row = intval($old_attendee['quantity']);
-        $new_regs         = [];
-        // 4 cases we need to account for:
-        // 1 old attendee_details row with a quantity of X (no mer)
-        // Y old attendee_details rows with a quantity of 1 (no mer) joined by their common registration_id
-        // Y old attendee_details rows with a quantity of x (because of mer)
-        // Y old attendee_details rows with a quantity of 1 (because of mer) joined by wp_events_multi_event_registration_id_group
-        for ($count = 1; $count <= $regs_on_this_row; $count++) {
-            // sum regs on older rows
-            $regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee, true);
-            $cols_n_values              = [
-                'EVT_ID'           => $new_event_id,
-                'ATT_ID'           => $new_attendee_id,
-                'TXN_ID'           => $new_txn_id,
-                'TKT_ID'           => $ticket_id,
-                'STS_ID'           => $STS_ID,
-                'REG_date'         => $this->get_migration_script()->convert_date_string_to_utc(
-                    $this,
-                    $old_attendee,
-                    $old_attendee['date']
-                ),
-                'REG_final_price'  => $old_attendee['final_price'],
-                'REG_session'      => substr($old_attendee['attendee_session'], 0, 44),
-                'REG_code'         => sanitize_key($old_attendee['registration_id']),
-                'REG_url_link'     => sanitize_key($old_attendee['registration_id'] . '-' . $count),
-                'REG_count'        => $regs_on_this_event_and_txn + $count,
-                'REG_group_size'   => $this->_sum_old_attendees_on_old_txn($old_attendee),
-                'REG_att_is_going' => true,
-                'REG_deleted'      => false,
-            ];
-            $data_types                 = [
-                '%d',// EVT_ID
-                '%d',// ATT_ID
-                '%d',// TXN_ID
-                '%d',// TKT_ID
-                '%s',// STS_ID
-                '%s',// REG_date
-                '%f',// REG_final_price
-                '%s',// REG_session
-                '%s',// REG_code
-                '%s',// REG_url_link
-                '%d',// REG_count
-                '%d',// REG_group_size
-                '%d',// REG_att_is_going
-                '%d',// REG_deleted
-            ];
-            $success                    = $wpdb->insert($this->_new_reg_table, $cols_n_values, $data_types);
-            if (! $success) {
-                $this->add_error(
-                    $this->get_migration_script()->_create_error_message_for_db_insertion(
-                        $this->_old_table,
-                        $old_attendee,
-                        $this->_new_reg_table,
-                        $cols_n_values,
-                        $data_types
-                    )
-                );
-                return [];
-            }
-            $cols_n_values['REG_ID'] = $wpdb->insert_id;
-            $new_regs[]              = $wpdb->insert_id;
-        }
-        $this->_add_regs_to_ticket_and_datetimes($ticket_id, count($new_regs), $STS_ID);
-        return $new_regs;
-    }
-
-
-    /**
-     * Increments the sold values on the ticket and its related datetimes by the amount sold,
-     * which should be done directly after adding the rows. Yes this means we're constantly incrementing
-     * the sold amounts as we go, and is less efficient than a single big query,
-     * but it's safer because we KNOW these regs have been added, rather than inferring
-     * that they WILL be added (because the attendees stage runs nearly last during
-     * the migration script)
-     *
-     * @param int    $new_ticket_id
-     * @param int    $quantity_sold
-     * @param string $STS_ID
-     * @return boolean whether they were successfully updated or not
-     */
-    protected function _add_regs_to_ticket_and_datetimes(int $new_ticket_id, int $quantity_sold, string $STS_ID): bool
-    {
-        if ($STS_ID != 'RAP') {
-            return true;
-        }
-        global $wpdb;
-        $success =
-            $wpdb->query(
-                $wpdb->prepare(
-                    "UPDATE $this->_new_ticket_table SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d",
-                    $quantity_sold,
-                    $new_ticket_id
-                )
-            );
-        if ($success) {
-            // get the ticket's datetimes, and increment them too
-            $success_update_datetimes = $wpdb->query(
-                $wpdb->prepare(
-                    "UPDATE $this->_new_ticket_table TKT
+		$this->_old_mer_table             = $wpdb->prefix . "events_multi_event_registration_id_group";
+		$this->_new_attendee_cpt_table    = $wpdb->posts;
+		$this->_new_attendee_meta_table   = $wpdb->prefix . "esp_attendee_meta";
+		$this->_new_reg_table             = $wpdb->prefix . "esp_registration";
+		$this->_new_transaction_table     = $wpdb->prefix . "esp_transaction";
+		$this->_new_payment_table         = $wpdb->prefix . "esp_payment";
+		$this->_new_ticket_table          = $wpdb->prefix . "esp_ticket";
+		$this->_new_ticket_datetime_table = $wpdb->prefix . "esp_datetime_ticket";
+		$this->_new_datetime_table        = $wpdb->prefix . "esp_datetime";
+		$this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
+		$this->_new_price_table           = $wpdb->prefix . "esp_price";
+		$this->_new_ticket_price_table    = $wpdb->prefix . "esp_ticket_price";
+		parent::__construct();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _migrate_old_row($old_row)
+	{
+		// first check if there's already a new attendee with similar characteristics
+		$new_att_id = $this->_find_attendee_cpt_matching($old_row);
+		if (! $new_att_id) {
+			$new_att_id = $this->_insert_new_attendee_cpt($old_row);
+			if (! $new_att_id) {
+				// if we couldn't even make an attendee, abandon all hope
+				return;
+			}
+			$new_att_meta_id = $this->_insert_attendee_meta_row($old_row, $new_att_id);
+			if ($new_att_meta_id) {
+				$this->get_migration_script()->set_mapping(
+					$this->_old_table,
+					$old_row['id'],
+					$this->_new_attendee_meta_table,
+					$new_att_meta_id
+				);
+			}
+		}
+		$this->get_migration_script()->set_mapping(
+			$this->_old_table,
+			$old_row['id'],
+			$this->_new_attendee_cpt_table,
+			$new_att_id
+		);
+
+		$txn_id = $this->_insert_new_transaction($old_row);
+		if (! $txn_id) {
+			// if we couldn't make the transaction, also abandon all hope
+			return;
+		}
+		$this->get_migration_script()->set_mapping(
+			$this->_old_table,
+			$old_row['id'],
+			$this->_new_transaction_table,
+			$txn_id
+		);
+		$pay_id = $this->_insert_new_payment($old_row, $txn_id);
+		if ($pay_id) {
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$old_row['id'],
+				$this->_new_payment_table,
+				$pay_id
+			);
+		}
+
+
+		// even if there was no payment, we can go ahead with adding the reg
+		$new_regs = $this->_insert_new_registrations($old_row, $new_att_id, $txn_id);
+		if ($new_regs) {
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$old_row['id'],
+				$this->_new_reg_table,
+				$new_regs
+			);
+		}
+	}
+
+
+	/**
+	 * Checks if there's already an attendee CPT in the db that has the same
+	 * first and last name, and email. If so, returns its ID as an int.
+	 *
+	 * @param array $old_attendee
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	private function _find_attendee_cpt_matching(array $old_attendee): int
+	{
+		global $wpdb;
+		$existing_attendee_id =
+			$wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT id FROM " .
+					$this->_new_attendee_cpt_table .
+					" AS cpt INNER JOIN " .
+					$this->_new_attendee_meta_table .
+					" AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1",
+					$old_attendee['fname'],
+					$old_attendee['lname'],
+					$old_attendee['email']
+				)
+			);
+		return intval($existing_attendee_id);
+	}
+
+
+	private function _insert_new_attendee_cpt($old_attendee): int
+	{
+		global $wpdb;
+		$cols_n_values = [
+			'post_title'    => stripslashes($old_attendee['fname'] . " " . $old_attendee['lname']),// ATT_full_name
+			'post_content'  => '',// ATT_bio
+			'post_name'     => sanitize_title($old_attendee['fname'] . "-" . $old_attendee['lname']),// ATT_slug
+			'post_date'     => $this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_attendee,
+				$old_attendee['date']
+			),// ATT_created
+			'post_excerpt'  => '',// ATT_short_bio
+			'post_modified' => $this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_attendee,
+				$old_attendee['date']
+			),// ATT_modified
+			'post_author'   => 0,// ATT_author
+			'post_parent'   => 0,// ATT_parent
+			'post_type'     => 'espresso_attendees',// post_type
+			'post_status'   => 'publish',// status
+		];
+		$data_types    = [
+			'%s',// ATT_full_name
+			'%s',// ATT_bio
+			'%s',// ATT_slug
+			'%s',// ATT_created
+			'%s',// ATT_short_bio
+			'%s',// ATT_modified
+			'%d',// ATT_author
+			'%d',// ATT_parent
+			'%s',// post_type
+			'%s',// status
+		];
+		$success       = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_attendee,
+					$this->_new_attendee_cpt_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	private function _insert_attendee_meta_row($old_attendee, $new_attendee_cpt_id): int
+	{
+		global $wpdb;
+		// get the state and country ids from the old row
+		try {
+			$new_country     =
+				$this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
+			$new_country_iso = $new_country['CNT_ISO'];
+		} catch (EE_Error $exception) {
+			$new_country_iso = $this->get_migration_script()->get_default_country_iso();
+		}
+		try {
+			$new_state    =
+				$this->get_migration_script()->get_or_create_state(
+					stripslashes($old_attendee['state']),
+					$new_country_iso
+				);
+			$new_state_id = $new_state['STA_ID'];
+		} catch (EE_Error $exception) {
+			$new_state_id = 0;
+		}
+		$cols_n_values = [
+			'ATT_ID'       => $new_attendee_cpt_id,
+			'ATT_fname'    => stripslashes($old_attendee['fname']),
+			'ATT_lname'    => stripslashes($old_attendee['lname']),
+			'ATT_address'  => stripslashes($old_attendee['address']),
+			'ATT_address2' => stripslashes($old_attendee['address2']),
+			'ATT_city'     => stripslashes($old_attendee['city']),
+			'STA_ID'       => $new_state_id,
+			'CNT_ISO'      => $new_country_iso,
+			'ATT_zip'      => stripslashes($old_attendee['zip']),
+			'ATT_email'    => stripslashes($old_attendee['email']),
+			'ATT_phone'    => stripslashes($old_attendee['phone']),
+		];
+		$data_types    = [
+			'%d',// ATT_ID
+			'%s',// ATT_fname
+			'%s',// ATT_lname
+			'%s',// ATT_address
+			'%s',// ATT_address2
+			'%s',// ATT_city
+			'%d',// STA_ID
+			'%s',// CNT_ISO
+			'%s',// ATT_zip
+			'%s',// ATT_email
+			'%s',// ATT_phone
+		];
+		$success       = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_attendee,
+					$this->_new_attendee_meta_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Note: we don't necessarily create a new transaction for each attendee row.
+	 * Only if the old attendee 'is_primary' is true; otherwise we find the old attendee row that
+	 * 'is_primary' and has the same 'txn_id', then we return ITS new transaction id
+	 *
+	 * @param array $old_attendee
+	 * @return int new transaction id
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_transaction(array $old_attendee): int
+	{
+		global $wpdb;
+
+		// first: let's check for an existing transaction for this old attendee
+		if (intval($old_attendee['is_primary'])) {// primary attendee, so create txn
+			$txn_id =
+				$this->get_migration_script()->get_mapping_new_pk(
+					$this->_old_table,
+					intval($old_attendee['id']),
+					$this->_new_transaction_table
+				);
+		} else { // non-primary attendee, so find its primary attendee's transaction
+			$primary_attendee_old_id =
+				$wpdb->get_var(
+					$wpdb->prepare(
+						"SELECT id FROM " . $this->_old_table . " WHERE is_primary=1 and registration_id=%s",
+						$old_attendee['registration_id']
+					)
+				);
+			if (! $primary_attendee_old_id) {
+				$primary_attendee        =
+					$this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
+				$primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : null;
+			}
+			$txn_id =
+				$this->get_migration_script()->get_mapping_new_pk(
+					$this->_old_table,
+					intval($primary_attendee_old_id),
+					$this->_new_transaction_table
+				);
+			if (! $txn_id) {
+				$this->add_error(
+					sprintf(
+						esc_html__(
+							"Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.",
+							"event_espresso"
+						),
+						$this->_json_encode($old_attendee),
+						$primary_attendee_old_id
+					)
+				);
+				$txn_id = 0;
+			}
+		}
+		// if there isn't yet a transaction row for this, create one
+		// (so even if it was a non-primary attendee with no EE3 primary attendee,
+		// it ought to have SOME transaction, so we'll make one)
+		if (! $txn_id) {
+			// maps 3.1 payment stati onto 4.1 transaction stati
+			$txn_status_mapping = [
+				'Completed'        => 'TCM',
+				'Pending'          => 'TIN',
+				'Payment Declined' => 'TIN',
+				'Incomplete'       => 'TIN',
+				'Not Completed'    => 'TIN',
+				'Cancelled'        => 'TIN',
+				'Declined'         => 'TIN',
+			];
+			$STS_ID             = $txn_status_mapping[ $old_attendee['payment_status'] ] ?? 'TIN';
+			$cols_n_values      = [
+				'TXN_timestamp' => $this->get_migration_script()->convert_date_string_to_utc(
+					$this,
+					$old_attendee,
+					$old_attendee['date']
+				),
+				'TXN_total'     => floatval($old_attendee['total_cost']),
+				'TXN_paid'      => floatval($old_attendee['amount_pd']),
+				'STS_ID'        => $STS_ID,
+				'TXN_hash_salt' => $old_attendee['hashSalt'],
+			];
+			$data_types         = [
+				'%s',// TXN_timestamp
+				'%f',// TXN_total
+				'%f',// TXN_paid
+				'%s',// STS_ID
+				'%s',// TXN_hash_salt
+			];
+			$success            = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $data_types);
+			if (! $success) {
+				$this->add_error(
+					$this->get_migration_script()->_create_error_message_for_db_insertion(
+						$this->_old_table,
+						$old_attendee,
+						$this->_new_transaction_table,
+						$cols_n_values,
+						$data_types
+					)
+				);
+				return 0;
+			}
+			$txn_id = $wpdb->insert_id;
+		}
+
+		return $txn_id;
+	}
+
+
+	/**
+	 * Detects if the MER tables exist
+	 *
+	 * @return boolean
+	 * @global wpdb $wpdb
+	 */
+	private function _mer_tables_exist(): ?bool
+	{
+		if ($this->_mer_tables_exist === null) {
+			global $wpdb;
+
+			if ($wpdb->get_var("SHOW TABLES LIKE '$this->_old_mer_table'") != $this->_old_mer_table) {
+				$this->_mer_tables_exist = false;
+			} else {
+				$this->_mer_tables_exist = true;
+			}
+		}
+		return $this->_mer_tables_exist;
+	}
+
+
+	/**
+	 * Gets the 4.1 registration's status given the 3.1 attendee row. We consider
+	 * whether the event required pre-approval or not,a dn the 4.1 payment status.
+	 *
+	 * @param array $old_attendee_row
+	 * @return string
+	 * @global wpdb $wpdb
+	 */
+	private function _get_reg_status_for_old_payment_status(array $old_attendee_row): string
+	{
+		// need event default reg status and if pre_approval was required
+		global $wpdb;
+		$event_required_pre_approval =
+			$wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT require_pre_approval FROM " . $wpdb->prefix . "events_detail WHERE id = %d",
+					$old_attendee_row['event_id']
+				)
+			);
+		return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
+			$old_attendee_row['payment_status'],
+			intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve'])
+		);
+	}
+
+
+	/**
+	 * Adds however many registrations are indicated by the old attendee's QUANTITY field,
+	 * and returns an array of their IDs
+	 *
+	 * @param array $old_attendee
+	 * @param int   $new_attendee_id
+	 * @param int   $new_txn_id
+	 * @return array of new registration ids
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_registrations(array $old_attendee, int $new_attendee_id, int $new_txn_id): array
+	{
+		global $wpdb;
+
+		$STS_ID       = $this->_get_reg_status_for_old_payment_status($old_attendee);
+		$new_event_id =
+			$this->get_migration_script()->get_mapping_new_pk(
+				$wpdb->prefix . 'events_detail',
+				$old_attendee['event_id'],
+				$wpdb->posts
+			);
+		if (! $new_event_id) {
+			$this->add_error(
+				sprintf(
+					esc_html__(
+						"Could not find NEW event CPT ID for old event '%d' on old attendee %s",
+						"event_espresso"
+					),
+					$old_attendee['event_id'],
+					$this->_json_encode($old_attendee)
+				)
+			);
+		}
+
+		$ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
+		if (! $ticket_id) {
+			$ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
+			$this->add_error(
+				sprintf(
+					esc_html__(
+						'Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d',
+						'event_espresso'
+					),
+					$old_attendee['id'],
+					$new_event_id,
+					$ticket_id
+				)
+			);
+		}
+		$regs_on_this_row = intval($old_attendee['quantity']);
+		$new_regs         = [];
+		// 4 cases we need to account for:
+		// 1 old attendee_details row with a quantity of X (no mer)
+		// Y old attendee_details rows with a quantity of 1 (no mer) joined by their common registration_id
+		// Y old attendee_details rows with a quantity of x (because of mer)
+		// Y old attendee_details rows with a quantity of 1 (because of mer) joined by wp_events_multi_event_registration_id_group
+		for ($count = 1; $count <= $regs_on_this_row; $count++) {
+			// sum regs on older rows
+			$regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee, true);
+			$cols_n_values              = [
+				'EVT_ID'           => $new_event_id,
+				'ATT_ID'           => $new_attendee_id,
+				'TXN_ID'           => $new_txn_id,
+				'TKT_ID'           => $ticket_id,
+				'STS_ID'           => $STS_ID,
+				'REG_date'         => $this->get_migration_script()->convert_date_string_to_utc(
+					$this,
+					$old_attendee,
+					$old_attendee['date']
+				),
+				'REG_final_price'  => $old_attendee['final_price'],
+				'REG_session'      => substr($old_attendee['attendee_session'], 0, 44),
+				'REG_code'         => sanitize_key($old_attendee['registration_id']),
+				'REG_url_link'     => sanitize_key($old_attendee['registration_id'] . '-' . $count),
+				'REG_count'        => $regs_on_this_event_and_txn + $count,
+				'REG_group_size'   => $this->_sum_old_attendees_on_old_txn($old_attendee),
+				'REG_att_is_going' => true,
+				'REG_deleted'      => false,
+			];
+			$data_types                 = [
+				'%d',// EVT_ID
+				'%d',// ATT_ID
+				'%d',// TXN_ID
+				'%d',// TKT_ID
+				'%s',// STS_ID
+				'%s',// REG_date
+				'%f',// REG_final_price
+				'%s',// REG_session
+				'%s',// REG_code
+				'%s',// REG_url_link
+				'%d',// REG_count
+				'%d',// REG_group_size
+				'%d',// REG_att_is_going
+				'%d',// REG_deleted
+			];
+			$success                    = $wpdb->insert($this->_new_reg_table, $cols_n_values, $data_types);
+			if (! $success) {
+				$this->add_error(
+					$this->get_migration_script()->_create_error_message_for_db_insertion(
+						$this->_old_table,
+						$old_attendee,
+						$this->_new_reg_table,
+						$cols_n_values,
+						$data_types
+					)
+				);
+				return [];
+			}
+			$cols_n_values['REG_ID'] = $wpdb->insert_id;
+			$new_regs[]              = $wpdb->insert_id;
+		}
+		$this->_add_regs_to_ticket_and_datetimes($ticket_id, count($new_regs), $STS_ID);
+		return $new_regs;
+	}
+
+
+	/**
+	 * Increments the sold values on the ticket and its related datetimes by the amount sold,
+	 * which should be done directly after adding the rows. Yes this means we're constantly incrementing
+	 * the sold amounts as we go, and is less efficient than a single big query,
+	 * but it's safer because we KNOW these regs have been added, rather than inferring
+	 * that they WILL be added (because the attendees stage runs nearly last during
+	 * the migration script)
+	 *
+	 * @param int    $new_ticket_id
+	 * @param int    $quantity_sold
+	 * @param string $STS_ID
+	 * @return boolean whether they were successfully updated or not
+	 */
+	protected function _add_regs_to_ticket_and_datetimes(int $new_ticket_id, int $quantity_sold, string $STS_ID): bool
+	{
+		if ($STS_ID != 'RAP') {
+			return true;
+		}
+		global $wpdb;
+		$success =
+			$wpdb->query(
+				$wpdb->prepare(
+					"UPDATE $this->_new_ticket_table SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d",
+					$quantity_sold,
+					$new_ticket_id
+				)
+			);
+		if ($success) {
+			// get the ticket's datetimes, and increment them too
+			$success_update_datetimes = $wpdb->query(
+				$wpdb->prepare(
+					"UPDATE $this->_new_ticket_table TKT
 				INNER JOIN $this->_new_ticket_datetime_table as DTK ON TKT.TKT_ID = DTK.TKT_ID
 				INNER JOIN $this->_new_datetime_table as DTT ON DTK.DTT_ID = DTT.DTT_ID
 				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d",
-                    $quantity_sold,
-                    $new_ticket_id
-                )
-            );
-            if (! $success_update_datetimes) {
-                $this->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s",
-                            "event_espresso"
-                        ),
-                        $new_ticket_id,
-                        $quantity_sold,
-                        $wpdb->last_error
-                    )
-                );
-            }
-        } else {
-            $this->add_error(
-                sprintf(
-                    esc_html__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),
-                    $new_ticket_id,
-                    $quantity_sold,
-                    $wpdb->last_error
-                )
-            );
-        }
-        return true;
-    }
-
-
-    /**
-     * Makes a guess at which ticket is the one the attendee purchased.
-     * Obviously, the old attendee's event_id narrows it down quite a bit;
-     * then the old attendee's orig_price and event_time, and price_option can uniquely identify the ticket
-     * however, if we don't find an exact match, see if any of those conditions match;
-     * and lastly if none of that works, just use the first ticket for the event we find
-     *
-     * @param array $old_attendee
-     * @param       $new_event_id
-     * @return string|null
-     */
-    private function _try_to_find_new_ticket_id(array $old_attendee, $new_event_id): ?string
-    {
-        global $wpdb;
-        $tickets_table          = $this->_new_ticket_table;
-        $datetime_tickets_table = $this->_new_ticket_datetime_table;
-        $datetime_table         = $this->_new_datetime_table;
-
-        $old_att_price_option = $old_attendee['price_option'];
-        $old_att_price        = floatval($old_attendee['orig_price']);
-
-        $old_att_start_date = $old_attendee['start_date'];
-        $old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-        $old_att_datetime   =
-            $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_attendee,
-                "$old_att_start_date $old_att_start_time:00"
-            );
-        // add all conditions to an array from which we can SHIFT conditions off in order to widen our search
-        // the most important condition should be last, as it will be array_shift'ed off last
-        $conditions           = [
-            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime),// times match?
-            $wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price),// prices match?
-            $wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option),// names match?
-            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
-        ];
-        $select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
+					$quantity_sold,
+					$new_ticket_id
+				)
+			);
+			if (! $success_update_datetimes) {
+				$this->add_error(
+					sprintf(
+						esc_html__(
+							"Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s",
+							"event_espresso"
+						),
+						$new_ticket_id,
+						$quantity_sold,
+						$wpdb->last_error
+					)
+				);
+			}
+		} else {
+			$this->add_error(
+				sprintf(
+					esc_html__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),
+					$new_ticket_id,
+					$quantity_sold,
+					$wpdb->last_error
+				)
+			);
+		}
+		return true;
+	}
+
+
+	/**
+	 * Makes a guess at which ticket is the one the attendee purchased.
+	 * Obviously, the old attendee's event_id narrows it down quite a bit;
+	 * then the old attendee's orig_price and event_time, and price_option can uniquely identify the ticket
+	 * however, if we don't find an exact match, see if any of those conditions match;
+	 * and lastly if none of that works, just use the first ticket for the event we find
+	 *
+	 * @param array $old_attendee
+	 * @param       $new_event_id
+	 * @return string|null
+	 */
+	private function _try_to_find_new_ticket_id(array $old_attendee, $new_event_id): ?string
+	{
+		global $wpdb;
+		$tickets_table          = $this->_new_ticket_table;
+		$datetime_tickets_table = $this->_new_ticket_datetime_table;
+		$datetime_table         = $this->_new_datetime_table;
+
+		$old_att_price_option = $old_attendee['price_option'];
+		$old_att_price        = floatval($old_attendee['orig_price']);
+
+		$old_att_start_date = $old_attendee['start_date'];
+		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
+		$old_att_datetime   =
+			$this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_attendee,
+				"$old_att_start_date $old_att_start_time:00"
+			);
+		// add all conditions to an array from which we can SHIFT conditions off in order to widen our search
+		// the most important condition should be last, as it will be array_shift'ed off last
+		$conditions           = [
+			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime),// times match?
+			$wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price),// prices match?
+			$wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option),// names match?
+			$wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+		];
+		$select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
 			$datetime_tickets_table ON $tickets_table.TKT_ID = $datetime_tickets_table.TKT_ID INNER JOIN
 			$datetime_table ON $datetime_tickets_table.DTT_ID = $datetime_table.DTT_ID";
-        // start running queries, widening search each time by removing a condition
-        do {
-            $full_query      = $select_and_join_part . " WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
-            $ticket_id_found = $wpdb->get_var($full_query);
-            array_shift($conditions);
-        } while (! $ticket_id_found && $conditions);
-        return $ticket_id_found;
-    }
-
-
-    /**
-     * If we couldn't find a 4.1 ticket for a 3.1 attendee row, this function creates one;
-     * and it also tries to find a datetime that works, and inserts a price, and associates
-     * the new ticket to that datetime and price.
-     *
-     * @return int ticket id
-     */
-    private function _insert_new_ticket_because_none_found($old_attendee, $new_event_id): int
-    {
-        global $wpdb;
-        $old_att_price_option = $old_attendee['price_option'];
-        $old_att_price        = floatval($old_attendee['orig_price']);
-
-        $old_att_start_date     = $old_attendee['start_date'];
-        $old_att_start_time     = $this->get_migration_script()->convertTimeFromAMPM(
-            $old_attendee['event_time']
-        );
-        $old_att_start_datetime =
-            $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_attendee,
-                "$old_att_start_date $old_att_start_time:00"
-            );
-        $old_att_end_datetime   = null;
-
-
-        // insert new datetime unless we find one
-        $datetime_id =
-            $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT DTT_ID FROM " .
-                    $this->_new_datetime_table .
-                    " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1",
-                    $old_att_start_datetime,
-                    $new_event_id
-                ),
-                ARRAY_A
-            );
-        if (! $datetime_id) {
-            $old_att_end_date     = $old_attendee['start_date'];
-            $old_att_end_time     = $this->get_migration_script()->convertTimeFromAMPM(
-                $old_attendee['event_time']
-            );
-            $old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_attendee,
-                "$old_att_end_date $old_att_end_time:00"
-            );
-            $wpdb->insert(
-                $this->_new_datetime_table,
-                [
-                    'EVT_ID'        => $new_event_id,
-                    'DTT_EVT_start' => $old_att_start_datetime,
-                    'DTT_EVT_end'   => $old_att_end_datetime,
-                    'DTT_deleted'   => true,
-                ],
-                [
-                    '%d',// EVT_ID
-                    '%s',// DTT_EVT_start
-                    '%s',// DTT_EVT_end
-                    '%d',// DTT_deleted
-                ]
-            );
-            $datetime_id = $wpdb->insert_id;
-        }
-
-        // insert new ticket
-        $wpdb->insert(
-            $wpdb->prefix . 'esp_ticket',
-            [
-                'TKT_name'       => $old_att_price_option,
-                'TKT_qty'        => -1,
-                'TKT_price'      => $old_att_price,
-                'TKT_start_date' => $old_att_start_datetime,
-                // we really have no clue what the time should be, but at least it was available when they attended
-                'TKT_end_date'   => $old_att_end_datetime,
-
-            ],
-            [
-                '%s',// name
-                '%d',// qty
-                '%d',// price
-                '%s',// start_date
-                '%s',// end_date
-            ]
-        );
-        $ticket_id = $wpdb->insert_id;
-        // associate the ticket with the datetime we found earlier
-        $wpdb->insert(
-            $this->_new_datetime_ticket_table,
-            [
-                'DTT_ID' => $datetime_id,
-                'TKT_ID' => $ticket_id,
-            ],
-            [
-                '%d',// DTT_ID
-                '%d',// TKT_ID
-            ]
-        );
-        // insert new price
-        $wpdb->insert(
-            $this->_new_price_table,
-            [
-                'PRC_amount'  => $old_att_price,
-                'PRT_ID'      => EE_DMS_4_1_0_prices::price_type_base,
-                'PRC_name'    => $old_att_price_option,
-                'PRC_deleted' => true,
-            ],
-            [
-                '%d',// PRC_amount
-                '%d',// PRT_ID
-                '%s',// PRC_name
-                '%d',// PRC_deleted
-            ]
-        );
-        $price_id = $wpdb->insert_id;
-        // associate the price to the ticket
-        $wpdb->insert(
-            $this->_new_ticket_price_table,
-            [
-                'TKT_ID' => $ticket_id,
-                'PRC_ID' => $price_id,
-            ],
-            [
-                '%d',// TKT_ID
-                '%d',// PRC_ID
-            ]
-        );
-        return $ticket_id;
-    }
-
-
-    /**
-     * Counts all the registrations on this transaction. If $count_only_older is TRUE then returns the number added SO
-     * FAR (ie, only considers attendee rows with an ID less than this one's), but if $count_only_older is FALSe
-     * returns ALL
-     *
-     * @param array   $old_attendee_row
-     * @param boolean $count_only_older true if you want the running count (ie, the total up to this row), and false if
-     *                                  you want ALL
-     * @return int
-     * @global wpdb   $wpdb
-     */
-    private function _sum_old_attendees_on_old_txn(array $old_attendee_row, bool $count_only_older = false): int
-    {
-        global $wpdb;
-        $count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
-        $count                =
-            intval(
-                $wpdb->get_var(
-                    $wpdb->prepare(
-                        "SELECT SUM(quantity) FROM " .
-                        $this->_old_table .
-                        " WHERE registration_id=%s $count_only_older_sql",
-                        $old_attendee_row['registration_id']
-                    )
-                )
-            );
-
-        if ($this->_mer_tables_exist()) {
-            // if MER exists, then it's a little tricky.
-            // when users registered by adding items to the cart, and it was a
-            // group registration requiring additional attendee INFO, then the attendee rows
-            // DO NOT have the same registration_id (although they probably should have)
-            // they are related just like MER attendee rows are related, through the MER group table
-            // BUT we want to count all the MER attendee rows for the same registration
-            $primary_attendee =
-                $this->_find_mer_primary_attendee_using_mer_tables($old_attendee_row['registration_id']);
-
-            $count_using_mer_table =
-                $wpdb->get_var(
-                    $wpdb->prepare(
-                        "SELECT SUM(quantity) FROM $this->_old_table att INNER JOIN $this->_old_mer_table mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql",
-                        $old_attendee_row['event_id'],
-                        $primary_attendee['registration_id']
-                    )
-                );
-            $count                 = max($count_using_mer_table, $count);
-        }
-        return $count;
-    }
-
-
-    private function _insert_new_payment($old_attendee, $new_txn_id): int
-    {
-        global $wpdb;
-        // Only add a payment for primary attendees. Important note: partial payments were marked as "Pending".
-        // Also, an offline payment had blank status (ie, "").
-        $old_pay_stati_indicating_no_payment = ['', 'Incomplete', 'Not Completed'];
-        // if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
-        if (
-            intval($old_attendee['is_primary']) &&
-            floatval($old_attendee['total_cost']) &&
-            ! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)
-        ) {
-            $pay_status_mapping = [
-                'Completed'        => 'PAP',
-                'Payment Declined' => 'PDC',
-                'Cancelled'        => 'PCN',
-                'Declined'         => 'PDC',
-            ];
-
-            $by_admin = $old_attendee['payment'] == 'Admin';
-
-            // IE, if we don't recognize the status, assume payment failed
-            $STS_ID = $pay_status_mapping[ $old_attendee['payment_status'] ] ?? 'PFL';
-
-            $cols_n_values = [
-                'TXN_ID'               => $new_txn_id,
-                'STS_ID'               => $STS_ID,
-                'PAY_timestamp'        => $this->get_migration_script()->convert_date_string_to_utc(
-                    $this,
-                    $old_attendee,
-                    $old_attendee['date']
-                ),
-                'PAY_method'           => 'CART',
-                'PAY_amount'           => $old_attendee['amount_pd'],
-                // 'txn_type' was used both for the gateway's name, and for other payment notes.
-                'PAY_gateway'          => $old_attendee['txn_type'],
-                'PAY_extra_accntng'    => $old_attendee['txn_type'],
-                'PAY_gateway_response' => '',
-                'PAY_txn_id_chq_nmbr'  => substr($old_attendee['txn_id'], 0, 32),
-                'PAY_via_admin'        => $by_admin,
-                'PAY_details'          => $old_attendee['transaction_details'],
-            ];
-            $data_types    = [
-                '%d',// TXN_Id
-                '%s',// STS_ID
-                '%s',// PAY_timestamp
-                '%s',// PAY_method
-                '%f',// PAY_amount
-                '%s',// PAY_gateway
-                '%s',// PAY_gateway_response
-                '%s',// PAY_txn_id_chq_nmbr
-                '%d',// PAY_via_admin
-                '%s',// PAY_details
-            ];
-            $success       = $wpdb->insert($this->_new_payment_table, $cols_n_values, $data_types);
-            if (! $success) {
-                $this->add_error(
-                    $this->get_migration_script()->_create_error_message_for_db_insertion(
-                        $this->_old_table,
-                        $old_attendee,
-                        $this->_new_attendee_cpt_table,
-                        $cols_n_values,
-                        $data_types
-                    )
-                );
-                return 0;
-            }
-            return $wpdb->insert_id;
-        }
-        return 0;
-    }
-
-
-    /**
-     * If MER is active, if you want ot find the other registrations on that attendee row
-     *
-     * @param int   $old_registration_id
-     * @return array|null
-     * @global wpdb $wpdb
-     */
-    private function _find_mer_primary_attendee_using_mer_tables(int $old_registration_id): ?array
-    {
-        if (! $this->_mer_tables_exist()) {
-            return null;
-        }
-        global $wpdb;
-        return $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT * FROM $this->_old_mer_table AS mer INNER JOIN $this->_old_table AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1",
-                $old_registration_id
-            ),
-            ARRAY_A
-        );
-    }
+		// start running queries, widening search each time by removing a condition
+		do {
+			$full_query      = $select_and_join_part . " WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
+			$ticket_id_found = $wpdb->get_var($full_query);
+			array_shift($conditions);
+		} while (! $ticket_id_found && $conditions);
+		return $ticket_id_found;
+	}
+
+
+	/**
+	 * If we couldn't find a 4.1 ticket for a 3.1 attendee row, this function creates one;
+	 * and it also tries to find a datetime that works, and inserts a price, and associates
+	 * the new ticket to that datetime and price.
+	 *
+	 * @return int ticket id
+	 */
+	private function _insert_new_ticket_because_none_found($old_attendee, $new_event_id): int
+	{
+		global $wpdb;
+		$old_att_price_option = $old_attendee['price_option'];
+		$old_att_price        = floatval($old_attendee['orig_price']);
+
+		$old_att_start_date     = $old_attendee['start_date'];
+		$old_att_start_time     = $this->get_migration_script()->convertTimeFromAMPM(
+			$old_attendee['event_time']
+		);
+		$old_att_start_datetime =
+			$this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_attendee,
+				"$old_att_start_date $old_att_start_time:00"
+			);
+		$old_att_end_datetime   = null;
+
+
+		// insert new datetime unless we find one
+		$datetime_id =
+			$wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT DTT_ID FROM " .
+					$this->_new_datetime_table .
+					" WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1",
+					$old_att_start_datetime,
+					$new_event_id
+				),
+				ARRAY_A
+			);
+		if (! $datetime_id) {
+			$old_att_end_date     = $old_attendee['start_date'];
+			$old_att_end_time     = $this->get_migration_script()->convertTimeFromAMPM(
+				$old_attendee['event_time']
+			);
+			$old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_attendee,
+				"$old_att_end_date $old_att_end_time:00"
+			);
+			$wpdb->insert(
+				$this->_new_datetime_table,
+				[
+					'EVT_ID'        => $new_event_id,
+					'DTT_EVT_start' => $old_att_start_datetime,
+					'DTT_EVT_end'   => $old_att_end_datetime,
+					'DTT_deleted'   => true,
+				],
+				[
+					'%d',// EVT_ID
+					'%s',// DTT_EVT_start
+					'%s',// DTT_EVT_end
+					'%d',// DTT_deleted
+				]
+			);
+			$datetime_id = $wpdb->insert_id;
+		}
+
+		// insert new ticket
+		$wpdb->insert(
+			$wpdb->prefix . 'esp_ticket',
+			[
+				'TKT_name'       => $old_att_price_option,
+				'TKT_qty'        => -1,
+				'TKT_price'      => $old_att_price,
+				'TKT_start_date' => $old_att_start_datetime,
+				// we really have no clue what the time should be, but at least it was available when they attended
+				'TKT_end_date'   => $old_att_end_datetime,
+
+			],
+			[
+				'%s',// name
+				'%d',// qty
+				'%d',// price
+				'%s',// start_date
+				'%s',// end_date
+			]
+		);
+		$ticket_id = $wpdb->insert_id;
+		// associate the ticket with the datetime we found earlier
+		$wpdb->insert(
+			$this->_new_datetime_ticket_table,
+			[
+				'DTT_ID' => $datetime_id,
+				'TKT_ID' => $ticket_id,
+			],
+			[
+				'%d',// DTT_ID
+				'%d',// TKT_ID
+			]
+		);
+		// insert new price
+		$wpdb->insert(
+			$this->_new_price_table,
+			[
+				'PRC_amount'  => $old_att_price,
+				'PRT_ID'      => EE_DMS_4_1_0_prices::price_type_base,
+				'PRC_name'    => $old_att_price_option,
+				'PRC_deleted' => true,
+			],
+			[
+				'%d',// PRC_amount
+				'%d',// PRT_ID
+				'%s',// PRC_name
+				'%d',// PRC_deleted
+			]
+		);
+		$price_id = $wpdb->insert_id;
+		// associate the price to the ticket
+		$wpdb->insert(
+			$this->_new_ticket_price_table,
+			[
+				'TKT_ID' => $ticket_id,
+				'PRC_ID' => $price_id,
+			],
+			[
+				'%d',// TKT_ID
+				'%d',// PRC_ID
+			]
+		);
+		return $ticket_id;
+	}
+
+
+	/**
+	 * Counts all the registrations on this transaction. If $count_only_older is TRUE then returns the number added SO
+	 * FAR (ie, only considers attendee rows with an ID less than this one's), but if $count_only_older is FALSe
+	 * returns ALL
+	 *
+	 * @param array   $old_attendee_row
+	 * @param boolean $count_only_older true if you want the running count (ie, the total up to this row), and false if
+	 *                                  you want ALL
+	 * @return int
+	 * @global wpdb   $wpdb
+	 */
+	private function _sum_old_attendees_on_old_txn(array $old_attendee_row, bool $count_only_older = false): int
+	{
+		global $wpdb;
+		$count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
+		$count                =
+			intval(
+				$wpdb->get_var(
+					$wpdb->prepare(
+						"SELECT SUM(quantity) FROM " .
+						$this->_old_table .
+						" WHERE registration_id=%s $count_only_older_sql",
+						$old_attendee_row['registration_id']
+					)
+				)
+			);
+
+		if ($this->_mer_tables_exist()) {
+			// if MER exists, then it's a little tricky.
+			// when users registered by adding items to the cart, and it was a
+			// group registration requiring additional attendee INFO, then the attendee rows
+			// DO NOT have the same registration_id (although they probably should have)
+			// they are related just like MER attendee rows are related, through the MER group table
+			// BUT we want to count all the MER attendee rows for the same registration
+			$primary_attendee =
+				$this->_find_mer_primary_attendee_using_mer_tables($old_attendee_row['registration_id']);
+
+			$count_using_mer_table =
+				$wpdb->get_var(
+					$wpdb->prepare(
+						"SELECT SUM(quantity) FROM $this->_old_table att INNER JOIN $this->_old_mer_table mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql",
+						$old_attendee_row['event_id'],
+						$primary_attendee['registration_id']
+					)
+				);
+			$count                 = max($count_using_mer_table, $count);
+		}
+		return $count;
+	}
+
+
+	private function _insert_new_payment($old_attendee, $new_txn_id): int
+	{
+		global $wpdb;
+		// Only add a payment for primary attendees. Important note: partial payments were marked as "Pending".
+		// Also, an offline payment had blank status (ie, "").
+		$old_pay_stati_indicating_no_payment = ['', 'Incomplete', 'Not Completed'];
+		// if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
+		if (
+			intval($old_attendee['is_primary']) &&
+			floatval($old_attendee['total_cost']) &&
+			! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)
+		) {
+			$pay_status_mapping = [
+				'Completed'        => 'PAP',
+				'Payment Declined' => 'PDC',
+				'Cancelled'        => 'PCN',
+				'Declined'         => 'PDC',
+			];
+
+			$by_admin = $old_attendee['payment'] == 'Admin';
+
+			// IE, if we don't recognize the status, assume payment failed
+			$STS_ID = $pay_status_mapping[ $old_attendee['payment_status'] ] ?? 'PFL';
+
+			$cols_n_values = [
+				'TXN_ID'               => $new_txn_id,
+				'STS_ID'               => $STS_ID,
+				'PAY_timestamp'        => $this->get_migration_script()->convert_date_string_to_utc(
+					$this,
+					$old_attendee,
+					$old_attendee['date']
+				),
+				'PAY_method'           => 'CART',
+				'PAY_amount'           => $old_attendee['amount_pd'],
+				// 'txn_type' was used both for the gateway's name, and for other payment notes.
+				'PAY_gateway'          => $old_attendee['txn_type'],
+				'PAY_extra_accntng'    => $old_attendee['txn_type'],
+				'PAY_gateway_response' => '',
+				'PAY_txn_id_chq_nmbr'  => substr($old_attendee['txn_id'], 0, 32),
+				'PAY_via_admin'        => $by_admin,
+				'PAY_details'          => $old_attendee['transaction_details'],
+			];
+			$data_types    = [
+				'%d',// TXN_Id
+				'%s',// STS_ID
+				'%s',// PAY_timestamp
+				'%s',// PAY_method
+				'%f',// PAY_amount
+				'%s',// PAY_gateway
+				'%s',// PAY_gateway_response
+				'%s',// PAY_txn_id_chq_nmbr
+				'%d',// PAY_via_admin
+				'%s',// PAY_details
+			];
+			$success       = $wpdb->insert($this->_new_payment_table, $cols_n_values, $data_types);
+			if (! $success) {
+				$this->add_error(
+					$this->get_migration_script()->_create_error_message_for_db_insertion(
+						$this->_old_table,
+						$old_attendee,
+						$this->_new_attendee_cpt_table,
+						$cols_n_values,
+						$data_types
+					)
+				);
+				return 0;
+			}
+			return $wpdb->insert_id;
+		}
+		return 0;
+	}
+
+
+	/**
+	 * If MER is active, if you want ot find the other registrations on that attendee row
+	 *
+	 * @param int   $old_registration_id
+	 * @return array|null
+	 * @global wpdb $wpdb
+	 */
+	private function _find_mer_primary_attendee_using_mer_tables(int $old_registration_id): ?array
+	{
+		if (! $this->_mer_tables_exist()) {
+			return null;
+		}
+		global $wpdb;
+		return $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT * FROM $this->_old_mer_table AS mer INNER JOIN $this->_old_table AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1",
+				$old_registration_id
+			),
+			ARRAY_A
+		);
+	}
 }

Spacing +141 added lines, -141 removed lines

@@ -259,25 +259,25 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__("Attendees", "event_espresso");
-        $this->_old_table   = $wpdb->prefix . "events_attendee";
+        $this->_old_table   = $wpdb->prefix."events_attendee";
         // Only select the event status column from the event table.
         $this->select_expression = 'att.*, e.event_status';
         // Only select attendees for events that aren't deleted.
         $this->_extra_where_sql           = 'AS att
-            INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id=e.id
+            INNER JOIN ' . $wpdb->prefix.'events_detail AS e ON att.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_old_mer_table             = $wpdb->prefix . "events_multi_event_registration_id_group";
+        $this->_old_mer_table             = $wpdb->prefix."events_multi_event_registration_id_group";
         $this->_new_attendee_cpt_table    = $wpdb->posts;
-        $this->_new_attendee_meta_table   = $wpdb->prefix . "esp_attendee_meta";
-        $this->_new_reg_table             = $wpdb->prefix . "esp_registration";
-        $this->_new_transaction_table     = $wpdb->prefix . "esp_transaction";
-        $this->_new_payment_table         = $wpdb->prefix . "esp_payment";
-        $this->_new_ticket_table          = $wpdb->prefix . "esp_ticket";
-        $this->_new_ticket_datetime_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_datetime_table        = $wpdb->prefix . "esp_datetime";
-        $this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_price_table           = $wpdb->prefix . "esp_price";
-        $this->_new_ticket_price_table    = $wpdb->prefix . "esp_ticket_price";
+        $this->_new_attendee_meta_table   = $wpdb->prefix."esp_attendee_meta";
+        $this->_new_reg_table             = $wpdb->prefix."esp_registration";
+        $this->_new_transaction_table     = $wpdb->prefix."esp_transaction";
+        $this->_new_payment_table         = $wpdb->prefix."esp_payment";
+        $this->_new_ticket_table          = $wpdb->prefix."esp_ticket";
+        $this->_new_ticket_datetime_table = $wpdb->prefix."esp_datetime_ticket";
+        $this->_new_datetime_table        = $wpdb->prefix."esp_datetime";
+        $this->_new_datetime_ticket_table = $wpdb->prefix."esp_datetime_ticket";
+        $this->_new_price_table           = $wpdb->prefix."esp_price";
+        $this->_new_ticket_price_table    = $wpdb->prefix."esp_ticket_price";
         parent::__construct();
     }
 
@@ -289,9 +289,9 @@ 
     {
         // first check if there's already a new attendee with similar characteristics
         $new_att_id = $this->_find_attendee_cpt_matching($old_row);
-        if (! $new_att_id) {
+        if ( ! $new_att_id) {
             $new_att_id = $this->_insert_new_attendee_cpt($old_row);
-            if (! $new_att_id) {
+            if ( ! $new_att_id) {
                 // if we couldn't even make an attendee, abandon all hope
                 return;
             }
@@ -313,7 +313,7 @@ 
         );
 
         $txn_id = $this->_insert_new_transaction($old_row);
-        if (! $txn_id) {
+        if ( ! $txn_id) {
             // if we couldn't make the transaction, also abandon all hope
             return;
         }
@@ -361,10 +361,10 @@ 
         $existing_attendee_id =
             $wpdb->get_var(
                 $wpdb->prepare(
-                    "SELECT id FROM " .
-                    $this->_new_attendee_cpt_table .
-                    " AS cpt INNER JOIN " .
-                    $this->_new_attendee_meta_table .
+                    "SELECT id FROM ".
+                    $this->_new_attendee_cpt_table.
+                    " AS cpt INNER JOIN ".
+                    $this->_new_attendee_meta_table.
                     " AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1",
                     $old_attendee['fname'],
                     $old_attendee['lname'],
@@ -379,39 +379,39 @@ 
     {
         global $wpdb;
         $cols_n_values = [
-            'post_title'    => stripslashes($old_attendee['fname'] . " " . $old_attendee['lname']),// ATT_full_name
-            'post_content'  => '',// ATT_bio
-            'post_name'     => sanitize_title($old_attendee['fname'] . "-" . $old_attendee['lname']),// ATT_slug
+            'post_title'    => stripslashes($old_attendee['fname']." ".$old_attendee['lname']), // ATT_full_name
+            'post_content'  => '', // ATT_bio
+            'post_name'     => sanitize_title($old_attendee['fname']."-".$old_attendee['lname']), // ATT_slug
             'post_date'     => $this->get_migration_script()->convert_date_string_to_utc(
                 $this,
                 $old_attendee,
                 $old_attendee['date']
-            ),// ATT_created
-            'post_excerpt'  => '',// ATT_short_bio
+            ), // ATT_created
+            'post_excerpt'  => '', // ATT_short_bio
             'post_modified' => $this->get_migration_script()->convert_date_string_to_utc(
                 $this,
                 $old_attendee,
                 $old_attendee['date']
-            ),// ATT_modified
-            'post_author'   => 0,// ATT_author
-            'post_parent'   => 0,// ATT_parent
-            'post_type'     => 'espresso_attendees',// post_type
-            'post_status'   => 'publish',// status
+            ), // ATT_modified
+            'post_author'   => 0, // ATT_author
+            'post_parent'   => 0, // ATT_parent
+            'post_type'     => 'espresso_attendees', // post_type
+            'post_status'   => 'publish', // status
         ];
-        $data_types    = [
-            '%s',// ATT_full_name
-            '%s',// ATT_bio
-            '%s',// ATT_slug
-            '%s',// ATT_created
-            '%s',// ATT_short_bio
-            '%s',// ATT_modified
-            '%d',// ATT_author
-            '%d',// ATT_parent
-            '%s',// post_type
-            '%s',// status
+        $data_types = [
+            '%s', // ATT_full_name
+            '%s', // ATT_bio
+            '%s', // ATT_slug
+            '%s', // ATT_created
+            '%s', // ATT_short_bio
+            '%s', // ATT_modified
+            '%d', // ATT_author
+            '%d', // ATT_parent
+            '%s', // post_type
+            '%s', // status
         ];
-        $success       = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -439,7 +439,7 @@ 
             $new_country_iso = $this->get_migration_script()->get_default_country_iso();
         }
         try {
-            $new_state    =
+            $new_state =
                 $this->get_migration_script()->get_or_create_state(
                     stripslashes($old_attendee['state']),
                     $new_country_iso
@@ -461,21 +461,21 @@ 
             'ATT_email'    => stripslashes($old_attendee['email']),
             'ATT_phone'    => stripslashes($old_attendee['phone']),
         ];
-        $data_types    = [
-            '%d',// ATT_ID
-            '%s',// ATT_fname
-            '%s',// ATT_lname
-            '%s',// ATT_address
-            '%s',// ATT_address2
-            '%s',// ATT_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// ATT_zip
-            '%s',// ATT_email
-            '%s',// ATT_phone
+        $data_types = [
+            '%d', // ATT_ID
+            '%s', // ATT_fname
+            '%s', // ATT_lname
+            '%s', // ATT_address
+            '%s', // ATT_address2
+            '%s', // ATT_city
+            '%d', // STA_ID
+            '%s', // CNT_ISO
+            '%s', // ATT_zip
+            '%s', // ATT_email
+            '%s', // ATT_phone
         ];
-        $success       = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -517,11 +517,11 @@ 
             $primary_attendee_old_id =
                 $wpdb->get_var(
                     $wpdb->prepare(
-                        "SELECT id FROM " . $this->_old_table . " WHERE is_primary=1 and registration_id=%s",
+                        "SELECT id FROM ".$this->_old_table." WHERE is_primary=1 and registration_id=%s",
                         $old_attendee['registration_id']
                     )
                 );
-            if (! $primary_attendee_old_id) {
+            if ( ! $primary_attendee_old_id) {
                 $primary_attendee        =
                     $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
                 $primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : null;
@@ -532,7 +532,7 @@ 
                     intval($primary_attendee_old_id),
                     $this->_new_transaction_table
                 );
-            if (! $txn_id) {
+            if ( ! $txn_id) {
                 $this->add_error(
                     sprintf(
                         esc_html__(
@@ -549,7 +549,7 @@ 
         // if there isn't yet a transaction row for this, create one
         // (so even if it was a non-primary attendee with no EE3 primary attendee,
         // it ought to have SOME transaction, so we'll make one)
-        if (! $txn_id) {
+        if ( ! $txn_id) {
             // maps 3.1 payment stati onto 4.1 transaction stati
             $txn_status_mapping = [
                 'Completed'        => 'TCM',
@@ -560,7 +560,7 @@ 
                 'Cancelled'        => 'TIN',
                 'Declined'         => 'TIN',
             ];
-            $STS_ID             = $txn_status_mapping[ $old_attendee['payment_status'] ] ?? 'TIN';
+            $STS_ID             = $txn_status_mapping[$old_attendee['payment_status']] ?? 'TIN';
             $cols_n_values      = [
                 'TXN_timestamp' => $this->get_migration_script()->convert_date_string_to_utc(
                     $this,
@@ -572,15 +572,15 @@ 
                 'STS_ID'        => $STS_ID,
                 'TXN_hash_salt' => $old_attendee['hashSalt'],
             ];
-            $data_types         = [
-                '%s',// TXN_timestamp
-                '%f',// TXN_total
-                '%f',// TXN_paid
-                '%s',// STS_ID
-                '%s',// TXN_hash_salt
+            $data_types = [
+                '%s', // TXN_timestamp
+                '%f', // TXN_total
+                '%f', // TXN_paid
+                '%s', // STS_ID
+                '%s', // TXN_hash_salt
             ];
-            $success            = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $data_types);
-            if (! $success) {
+            $success = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $data_types);
+            if ( ! $success) {
                 $this->add_error(
                     $this->get_migration_script()->_create_error_message_for_db_insertion(
                         $this->_old_table,
@@ -635,7 +635,7 @@ 
         $event_required_pre_approval =
             $wpdb->get_var(
                 $wpdb->prepare(
-                    "SELECT require_pre_approval FROM " . $wpdb->prefix . "events_detail WHERE id = %d",
+                    "SELECT require_pre_approval FROM ".$wpdb->prefix."events_detail WHERE id = %d",
                     $old_attendee_row['event_id']
                 )
             );
@@ -664,11 +664,11 @@ 
         $STS_ID       = $this->_get_reg_status_for_old_payment_status($old_attendee);
         $new_event_id =
             $this->get_migration_script()->get_mapping_new_pk(
-                $wpdb->prefix . 'events_detail',
+                $wpdb->prefix.'events_detail',
                 $old_attendee['event_id'],
                 $wpdb->posts
             );
-        if (! $new_event_id) {
+        if ( ! $new_event_id) {
             $this->add_error(
                 sprintf(
                     esc_html__(
@@ -682,7 +682,7 @@ 
         }
 
         $ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
-        if (! $ticket_id) {
+        if ( ! $ticket_id) {
             $ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
             $this->add_error(
                 sprintf(
@@ -720,30 +720,30 @@ 
                 'REG_final_price'  => $old_attendee['final_price'],
                 'REG_session'      => substr($old_attendee['attendee_session'], 0, 44),
                 'REG_code'         => sanitize_key($old_attendee['registration_id']),
-                'REG_url_link'     => sanitize_key($old_attendee['registration_id'] . '-' . $count),
+                'REG_url_link'     => sanitize_key($old_attendee['registration_id'].'-'.$count),
                 'REG_count'        => $regs_on_this_event_and_txn + $count,
                 'REG_group_size'   => $this->_sum_old_attendees_on_old_txn($old_attendee),
                 'REG_att_is_going' => true,
                 'REG_deleted'      => false,
             ];
-            $data_types                 = [
-                '%d',// EVT_ID
-                '%d',// ATT_ID
-                '%d',// TXN_ID
-                '%d',// TKT_ID
-                '%s',// STS_ID
-                '%s',// REG_date
-                '%f',// REG_final_price
-                '%s',// REG_session
-                '%s',// REG_code
-                '%s',// REG_url_link
-                '%d',// REG_count
-                '%d',// REG_group_size
-                '%d',// REG_att_is_going
-                '%d',// REG_deleted
+            $data_types = [
+                '%d', // EVT_ID
+                '%d', // ATT_ID
+                '%d', // TXN_ID
+                '%d', // TKT_ID
+                '%s', // STS_ID
+                '%s', // REG_date
+                '%f', // REG_final_price
+                '%s', // REG_session
+                '%s', // REG_code
+                '%s', // REG_url_link
+                '%d', // REG_count
+                '%d', // REG_group_size
+                '%d', // REG_att_is_going
+                '%d', // REG_deleted
             ];
-            $success                    = $wpdb->insert($this->_new_reg_table, $cols_n_values, $data_types);
-            if (! $success) {
+            $success = $wpdb->insert($this->_new_reg_table, $cols_n_values, $data_types);
+            if ( ! $success) {
                 $this->add_error(
                     $this->get_migration_script()->_create_error_message_for_db_insertion(
                         $this->_old_table,
@@ -802,7 +802,7 @@ 
                     $new_ticket_id
                 )
             );
-            if (! $success_update_datetimes) {
+            if ( ! $success_update_datetimes) {
                 $this->add_error(
                     sprintf(
                         esc_html__(
@@ -860,21 +860,21 @@ 
             );
         // add all conditions to an array from which we can SHIFT conditions off in order to widen our search
         // the most important condition should be last, as it will be array_shift'ed off last
-        $conditions           = [
-            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime),// times match?
-            $wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price),// prices match?
-            $wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option),// names match?
-            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+        $conditions = [
+            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime), // times match?
+            $wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price), // prices match?
+            $wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option), // names match?
+            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id), // events match?
         ];
         $select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
 			$datetime_tickets_table ON $tickets_table.TKT_ID = $datetime_tickets_table.TKT_ID INNER JOIN
 			$datetime_table ON $datetime_tickets_table.DTT_ID = $datetime_table.DTT_ID";
         // start running queries, widening search each time by removing a condition
         do {
-            $full_query      = $select_and_join_part . " WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
+            $full_query      = $select_and_join_part." WHERE ".implode(" AND ", $conditions)." LIMIT 1";
             $ticket_id_found = $wpdb->get_var($full_query);
             array_shift($conditions);
-        } while (! $ticket_id_found && $conditions);
+        }while ( ! $ticket_id_found && $conditions);
         return $ticket_id_found;
     }
 
@@ -902,22 +902,22 @@ 
                 $old_attendee,
                 "$old_att_start_date $old_att_start_time:00"
             );
-        $old_att_end_datetime   = null;
+        $old_att_end_datetime = null;
 
 
         // insert new datetime unless we find one
         $datetime_id =
             $wpdb->get_var(
                 $wpdb->prepare(
-                    "SELECT DTT_ID FROM " .
-                    $this->_new_datetime_table .
+                    "SELECT DTT_ID FROM ".
+                    $this->_new_datetime_table.
                     " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1",
                     $old_att_start_datetime,
                     $new_event_id
                 ),
                 ARRAY_A
             );
-        if (! $datetime_id) {
+        if ( ! $datetime_id) {
             $old_att_end_date     = $old_attendee['start_date'];
             $old_att_end_time     = $this->get_migration_script()->convertTimeFromAMPM(
                 $old_attendee['event_time']
@@ -936,10 +936,10 @@ 
                     'DTT_deleted'   => true,
                 ],
                 [
-                    '%d',// EVT_ID
-                    '%s',// DTT_EVT_start
-                    '%s',// DTT_EVT_end
-                    '%d',// DTT_deleted
+                    '%d', // EVT_ID
+                    '%s', // DTT_EVT_start
+                    '%s', // DTT_EVT_end
+                    '%d', // DTT_deleted
                 ]
             );
             $datetime_id = $wpdb->insert_id;
@@ -947,7 +947,7 @@ 
 
         // insert new ticket
         $wpdb->insert(
-            $wpdb->prefix . 'esp_ticket',
+            $wpdb->prefix.'esp_ticket',
             [
                 'TKT_name'       => $old_att_price_option,
                 'TKT_qty'        => -1,
@@ -958,11 +958,11 @@ 
 
             ],
             [
-                '%s',// name
-                '%d',// qty
-                '%d',// price
-                '%s',// start_date
-                '%s',// end_date
+                '%s', // name
+                '%d', // qty
+                '%d', // price
+                '%s', // start_date
+                '%s', // end_date
             ]
         );
         $ticket_id = $wpdb->insert_id;
@@ -974,8 +974,8 @@ 
                 'TKT_ID' => $ticket_id,
             ],
             [
-                '%d',// DTT_ID
-                '%d',// TKT_ID
+                '%d', // DTT_ID
+                '%d', // TKT_ID
             ]
         );
         // insert new price
@@ -988,10 +988,10 @@ 
                 'PRC_deleted' => true,
             ],
             [
-                '%d',// PRC_amount
-                '%d',// PRT_ID
-                '%s',// PRC_name
-                '%d',// PRC_deleted
+                '%d', // PRC_amount
+                '%d', // PRT_ID
+                '%s', // PRC_name
+                '%d', // PRC_deleted
             ]
         );
         $price_id = $wpdb->insert_id;
@@ -1003,8 +1003,8 @@ 
                 'PRC_ID' => $price_id,
             ],
             [
-                '%d',// TKT_ID
-                '%d',// PRC_ID
+                '%d', // TKT_ID
+                '%d', // PRC_ID
             ]
         );
         return $ticket_id;
@@ -1030,8 +1030,8 @@ 
             intval(
                 $wpdb->get_var(
                     $wpdb->prepare(
-                        "SELECT SUM(quantity) FROM " .
-                        $this->_old_table .
+                        "SELECT SUM(quantity) FROM ".
+                        $this->_old_table.
                         " WHERE registration_id=%s $count_only_older_sql",
                         $old_attendee_row['registration_id']
                     )
@@ -1056,7 +1056,7 @@ 
                         $primary_attendee['registration_id']
                     )
                 );
-            $count                 = max($count_using_mer_table, $count);
+            $count = max($count_using_mer_table, $count);
         }
         return $count;
     }
@@ -1084,7 +1084,7 @@ 
             $by_admin = $old_attendee['payment'] == 'Admin';
 
             // IE, if we don't recognize the status, assume payment failed
-            $STS_ID = $pay_status_mapping[ $old_attendee['payment_status'] ] ?? 'PFL';
+            $STS_ID = $pay_status_mapping[$old_attendee['payment_status']] ?? 'PFL';
 
             $cols_n_values = [
                 'TXN_ID'               => $new_txn_id,
@@ -1104,20 +1104,20 @@ 
                 'PAY_via_admin'        => $by_admin,
                 'PAY_details'          => $old_attendee['transaction_details'],
             ];
-            $data_types    = [
-                '%d',// TXN_Id
-                '%s',// STS_ID
-                '%s',// PAY_timestamp
-                '%s',// PAY_method
-                '%f',// PAY_amount
-                '%s',// PAY_gateway
-                '%s',// PAY_gateway_response
-                '%s',// PAY_txn_id_chq_nmbr
-                '%d',// PAY_via_admin
-                '%s',// PAY_details
+            $data_types = [
+                '%d', // TXN_Id
+                '%s', // STS_ID
+                '%s', // PAY_timestamp
+                '%s', // PAY_method
+                '%f', // PAY_amount
+                '%s', // PAY_gateway
+                '%s', // PAY_gateway_response
+                '%s', // PAY_txn_id_chq_nmbr
+                '%d', // PAY_via_admin
+                '%s', // PAY_details
             ];
-            $success       = $wpdb->insert($this->_new_payment_table, $cols_n_values, $data_types);
-            if (! $success) {
+            $success = $wpdb->insert($this->_new_payment_table, $cols_n_values, $data_types);
+            if ( ! $success) {
                 $this->add_error(
                     $this->get_migration_script()->_create_error_message_for_db_insertion(
                         $this->_old_table,
@@ -1144,7 +1144,7 @@ 
      */
     private function _find_mer_primary_attendee_using_mer_tables(int $old_registration_id): ?array
     {
-        if (! $this->_mer_tables_exist()) {
+        if ( ! $this->_mer_tables_exist()) {
             return null;
         }
         global $wpdb;

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

Indentation +114 added lines, -114 removed lines

@@ -27,128 +27,128 @@
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage
 {
 
-    /**
-     * @throws EE_Error
-     */
-    public function _migration_step($num_items_to_migrate = 50)
-    {
-        global $wpdb;
-        $start_at_record         = $this->count_records_migrated();
-        $rows                    = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT * FROM $this->_old_table AS ev
+	/**
+	 * @throws EE_Error
+	 */
+	public function _migration_step($num_items_to_migrate = 50)
+	{
+		global $wpdb;
+		$start_at_record         = $this->count_records_migrated();
+		$rows                    = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT * FROM $this->_old_table AS ev
                     INNER JOIN " . $wpdb->prefix . "events_detail AS e ON ev.event_id=e.id
                     WHERE e.event_status!='D' LIMIT %d,%d",
-                $start_at_record,
-                $num_items_to_migrate
-            ),
-            ARRAY_A
-        );
-        $items_actually_migrated = 0;
-        foreach ($rows as $event_venue_rel) {
-            $this->_insert_new_event_to_venue_rel($event_venue_rel);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+				$start_at_record,
+				$num_items_to_migrate
+			),
+			ARRAY_A
+		);
+		$items_actually_migrated = 0;
+		foreach ($rows as $event_venue_rel) {
+			$this->_insert_new_event_to_venue_rel($event_venue_rel);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
 
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        return $wpdb->get_var(
-            "SELECT COUNT(ev.id) FROM " . $this->_old_table . " AS ev
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		return $wpdb->get_var(
+			"SELECT COUNT(ev.id) FROM " . $this->_old_table . " AS ev
             INNER JOIN " . $wpdb->prefix . 'events_detail AS e ON ev.event_id=e.id
             WHERE e.event_status!="D"'
-        );
-    }
+		);
+	}
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table   = $wpdb->prefix . "events_venue_rel";
-        $this->_new_table   = $wpdb->prefix . "esp_event_venue";
-        $this->_pretty_name = esc_html__("Event to Venue Relations", "event_espresso");
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table   = $wpdb->prefix . "events_venue_rel";
+		$this->_new_table   = $wpdb->prefix . "esp_event_venue";
+		$this->_pretty_name = esc_html__("Event to Venue Relations", "event_espresso");
+		parent::__construct();
+	}
 
 
-    /**
-     * Attempts to insert a new question group in the new format given an old one
-     *
-     * @param array $old_event_venue_rel
-     * @return void
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_event_to_venue_rel(array $old_event_venue_rel): void
-    {
-        global $wpdb;
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_detail",
-            $old_event_venue_rel['event_id'],
-            $wpdb->prefix . "posts"
-        );
-        $new_venue_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_venue",
-            $old_event_venue_rel['venue_id'],
-            $wpdb->prefix . "posts"
-        );
-        if (! $new_event_id) {
-            $this->add_error(
-                sprintf(
-                    esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),
-                    $old_event_venue_rel['event_id']
-                )
-            );
-            return;
-        }
-        if (! $new_venue_id) {
-            $this->add_error(
-                sprintf(
-                    esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),
-                    $old_event_venue_rel['venue_id']
-                )
-            );
-            return;
-        }
-        // first ensure there are no other relation entries for this event
-        // because although EE4 supports it, EE3 didn't really
-        $wpdb->delete(
-            $this->_new_table,
-            [
-                'EVT_ID' => $new_event_id,
-            ],
-            [
-                '%d',// EVT_ID
-            ]
-        );
-        //      echo "last query". $wpdb->last_query;die;
-        $cols_n_values = [
-            'EVT_ID'      => $new_event_id,
-            'VNU_ID'      => $new_venue_id,
-            'EVV_primary' => true,
-        ];
-        $data_types    = [
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
-        ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event_venue_rel,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
+	/**
+	 * Attempts to insert a new question group in the new format given an old one
+	 *
+	 * @param array $old_event_venue_rel
+	 * @return void
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_event_to_venue_rel(array $old_event_venue_rel): void
+	{
+		global $wpdb;
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_detail",
+			$old_event_venue_rel['event_id'],
+			$wpdb->prefix . "posts"
+		);
+		$new_venue_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_venue",
+			$old_event_venue_rel['venue_id'],
+			$wpdb->prefix . "posts"
+		);
+		if (! $new_event_id) {
+			$this->add_error(
+				sprintf(
+					esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),
+					$old_event_venue_rel['event_id']
+				)
+			);
+			return;
+		}
+		if (! $new_venue_id) {
+			$this->add_error(
+				sprintf(
+					esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),
+					$old_event_venue_rel['venue_id']
+				)
+			);
+			return;
+		}
+		// first ensure there are no other relation entries for this event
+		// because although EE4 supports it, EE3 didn't really
+		$wpdb->delete(
+			$this->_new_table,
+			[
+				'EVT_ID' => $new_event_id,
+			],
+			[
+				'%d',// EVT_ID
+			]
+		);
+		//      echo "last query". $wpdb->last_query;die;
+		$cols_n_values = [
+			'EVT_ID'      => $new_event_id,
+			'VNU_ID'      => $new_venue_id,
+			'EVV_primary' => true,
+		];
+		$data_types    = [
+			'%d',// EVT_ID
+			'%d',// VNU_ID
+			'%d',// EVT_primary
+		];
+		$success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event_venue_rel,
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
         $rows                    = $wpdb->get_results(
             $wpdb->prepare(
                 "SELECT * FROM $this->_old_table AS ev
-                    INNER JOIN " . $wpdb->prefix . "events_detail AS e ON ev.event_id=e.id
+                    INNER JOIN ".$wpdb->prefix."events_detail AS e ON ev.event_id=e.id
                     WHERE e.event_status!='D' LIMIT %d,%d",
                 $start_at_record,
                 $num_items_to_migrate
@@ -60,8 +60,8 @@ 
     {
         global $wpdb;
         return $wpdb->get_var(
-            "SELECT COUNT(ev.id) FROM " . $this->_old_table . " AS ev
-            INNER JOIN " . $wpdb->prefix . 'events_detail AS e ON ev.event_id=e.id
+            "SELECT COUNT(ev.id) FROM ".$this->_old_table." AS ev
+            INNER JOIN " . $wpdb->prefix.'events_detail AS e ON ev.event_id=e.id
             WHERE e.event_status!="D"'
         );
     }
@@ -70,8 +70,8 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table   = $wpdb->prefix . "events_venue_rel";
-        $this->_new_table   = $wpdb->prefix . "esp_event_venue";
+        $this->_old_table   = $wpdb->prefix."events_venue_rel";
+        $this->_new_table   = $wpdb->prefix."esp_event_venue";
         $this->_pretty_name = esc_html__("Event to Venue Relations", "event_espresso");
         parent::__construct();
     }
@@ -89,16 +89,16 @@ 
     {
         global $wpdb;
         $new_event_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_detail",
+            $wpdb->prefix."events_detail",
             $old_event_venue_rel['event_id'],
-            $wpdb->prefix . "posts"
+            $wpdb->prefix."posts"
         );
         $new_venue_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_venue",
+            $wpdb->prefix."events_venue",
             $old_event_venue_rel['venue_id'],
-            $wpdb->prefix . "posts"
+            $wpdb->prefix."posts"
         );
-        if (! $new_event_id) {
+        if ( ! $new_event_id) {
             $this->add_error(
                 sprintf(
                     esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),
@@ -107,7 +107,7 @@ 
             );
             return;
         }
-        if (! $new_venue_id) {
+        if ( ! $new_venue_id) {
             $this->add_error(
                 sprintf(
                     esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),
@@ -124,7 +124,7 @@ 
                 'EVT_ID' => $new_event_id,
             ],
             [
-                '%d',// EVT_ID
+                '%d', // EVT_ID
             ]
         );
         //      echo "last query". $wpdb->last_query;die;
@@ -133,13 +133,13 @@ 
             'VNU_ID'      => $new_venue_id,
             'EVV_primary' => true,
         ];
-        $data_types    = [
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
+        $data_types = [
+            '%d', // EVT_ID
+            '%d', // VNU_ID
+            '%d', // EVT_primary
         ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
+        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_events.dmsstage.php

Indentation +814 added lines, -814 removed lines

@@ -175,822 +175,822 @@
 class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage
 {
 
-    private string $_old_start_end_table;
-
-    private string $_new_meta_table;
-
-    private string $_new_datetime_table;
-
-
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table           = $wpdb->prefix . "events_detail";
-        $this->_old_start_end_table = $wpdb->prefix . "events_start_end";
-        $this->_new_table           = $wpdb->prefix . "posts";
-        $this->_new_meta_table      = $wpdb->prefix . "esp_event_meta";
-        $this->_new_datetime_table  = $wpdb->prefix . "esp_datetime";
-        $this->_pretty_name         = esc_html__("Events", "event_espresso");
-        parent::__construct();
-    }
-
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @return int
-     */
-    public function _count_records_to_migrate(): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
-    }
-
-
-    /**
-     * 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
-     * @throws EE_Error
-     */
-    protected function _migration_step($num_items_to_migrate = 50)
-    {
-        global $wpdb;
-        // because the migration of each event can be a LOT more work, make each step smaller
-        $num_items_to_migrate     = max(1, $num_items_to_migrate / 5);
-        $events                   =
-            $wpdb->get_results(
-                $wpdb->prepare(
-                    "SELECT * FROM $this->_old_table WHERE event_status!='D' LIMIT %d,%d",
-                    $this->count_records_migrated(),
-                    $num_items_to_migrate
-                ),
-                ARRAY_A
-            );
-        $items_migrated_this_step = 0;
-
-        foreach ($events as $event_row) {
-            $guid = null;
-            // insert new 4.1 Attendee object using $wpdb
-            $post_id = $this->_insert_cpt($event_row);
-            if ($post_id) {
-                $this->get_migration_script()->set_mapping(
-                    $this->_old_table,
-                    $event_row['id'],
-                    $this->_new_table,
-                    $post_id
-                );
-                $meta_id = $this->_insert_event_meta($event_row, $post_id);
-                if ($meta_id) {
-                    $this->get_migration_script()->set_mapping(
-                        $this->_old_table,
-                        $event_row['id'],
-                        $this->_new_meta_table,
-                        $meta_id
-                    );
-                }
-                $this->_convert_start_end_times($event_row, $post_id);
-                $event_meta = maybe_unserialize($event_row['event_meta']);
-                $guid       = $event_meta['event_thumbnail_url'] ?? null;
-                $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
-                    $guid,
-                    $post_id,
-                    $this
-                );
-
-                // maybe create a venue from info on the event?
-                $new_venue_id = $this->_maybe_create_venue($event_row);
-                if ($new_venue_id) {
-                    $this->_insert_new_venue_to_event($post_id, $new_venue_id);
-                }
-                $this->_add_post_metas($event_row, $post_id);
-            }
-            $items_migrated_this_step++;
-            if ($guid) {
-                // if we had to check for an image attachment
-                // then let's call it a day (avoid timing out, because this took a long time)
-                break;
-            }
-        }
-        if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
-            $this->set_status(EE_Data_Migration_Manager::status_completed);
-        }
-        return $items_migrated_this_step;
-    }
-
-
-    /**
-     * Stores any extra 3.1 "event_meta" column things as post meta
-     *
-     * @param array $old_event
-     * @param int   $post_id
-     * @return void
-     */
-    private function _add_post_metas(array $old_event, int $post_id)
-    {
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (! $event_meta || ! is_array($event_meta)) {
-            return;
-        }
-        unset($event_meta['date_submitted']);              // factored into CPT
-        unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
-        unset($event_meta['default_payment_status']);      // dido
-        unset($event_meta['event_thumbnail_url']);         // used to find post featured image
-        foreach ($event_meta as $meta_key => $meta_value) {
-            if ($meta_key) {// if the meta key is just an empty string, ignore it
-                $success = add_post_meta($post_id, $meta_key, $meta_value, true);
-                if (! $success) {
-                    $this->add_error(
-                        sprintf(
-                            esc_html__(
-                                "Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s",
-                                "event_espresso"
-                            ),
-                            $post_id,
-                            $meta_key,
-                            $meta_value,
-                            implode(",", $old_event)
-                        )
-                    );
-                }
-            }
-        }
-        if ($old_event['alt_email']) {
-            add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
-        }
-        if ($old_event['recurrence_id']) {
-            add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
-        }
-    }
-
-
-    /**
-     * Finds a unique slug for this event, given its name (we could have simply used
-     * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
-     * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
-     *
-     * @param string $event_name      (the name of the event for reading by humans)
-     * @param string $old_identifier  the old EE3 identifier (a long unique string)
-     * @param string $new_post_status a post status
-     * @return string
-     */
-    private function _find_unique_slug(
-        string $event_name,
-        string $old_identifier = '',
-        string $new_post_status = 'publish'
-    ): string {
-        $original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
-        return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
-    }
-
-
-    /**
-     * returns whether there is a post that has this same slug (post_title)
-     *
-     * @param string $slug
-     * @return boolean
-     * @global wpdb  $wpdb
-     */
-    private function _other_post_exists_with_that_slug(string $slug): bool
-    {
-        global $wpdb;
-        $query =
-            $wpdb->prepare(
-                "SELECT COUNT(ID) FROM $this->_new_table WHERE event_status != 'D' AND post_name = %s",
-                $slug
-            );
-        $count = $wpdb->get_var($query);
-        return (bool) intval($count);
-    }
-
-
-    /**
-     * @param $old_event
-     * @return int
-     */
-    private function _insert_cpt($old_event): int
-    {
-        global $wpdb;
-        // convert 3.1 event status to 4.1 CPT status
-        // for reference, 3.1 event stati available for setting are:
-        //      $status = array(array('id' => 'A', 'text' => esc_html__('Public', 'event_espresso')), array('id' => 'S', 'text' => esc_html__('Waitlist', 'event_espresso')), array('id' => 'O', 'text' => esc_html__('Ongoing', 'event_espresso')), array('id' => 'R', 'text' => esc_html__('Draft', 'event_espresso')), array('id' => 'D', 'text' => esc_html__('Deleted', 'event_espresso')));
-        //      and the json api uses the following to convert from 3.1 to 4.0
-        //      'S'=>'secondary/waitlist',
-        //      'A'=>'active',
-        //      'X'=>'denied',
-        //      'IA'=>'inactive',
-        //      'O'=>'ongoing',
-        //      'P'=>'pending',
-        //      'R'=>'draft',
-        //      'D'=>'deleted');
-        //      4.1 Event Post stati are the normal post statis
-        //      (publish,future,draft,pending,private,trash,auto-draft,inherit)
-        //      and 3 custom ones: cancelled,postponed,sold_out
-        $status_conversions = [
-            'R'  => 'draft',
-            'X'  => 'draft',
-            // 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
-            'P'  => 'pending',
-            'IA' => 'draft',
-            // draft and in the past
-            // IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-            'O'  => 'publish',
-            // @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
-            'A'  => 'publish',
-            'S'  => 'draft',
-            // @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
-            'D'  => 'trash',
-        ];
-        $post_status        = $status_conversions[ $old_event['event_status'] ];
-        // check if we've sold out
-        if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
-            $post_status = 'sold_out';
-        }
-        //      FYI postponed and cancelled don't exist in 3.1
-        $cols_n_values                      = [
-            'post_title'        => stripslashes($old_event['event_name']),// EVT_name
-            'post_content'      => stripslashes($old_event['event_desc']),// EVT_desc
-            'post_name'         => $this->_find_unique_slug(
-                $old_event['event_name'],
-                $old_event['event_identifier'],
-                $post_status
-            ),// EVT_slug
-            'post_date'         => $old_event['submitted'],// EVT_created NOT
-            'post_date_gmt'     => get_gmt_from_date($old_event['submitted']),
-            'post_excerpt'      => '',// EVT_short_desc
-            'post_modified'     => $old_event['submitted'],// EVT_modified
-            'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_author'       => $old_event['wp_user'],// EVT_wp_user
-            'post_parent'       => 0,// parent maybe get this from some REM field?
-            'menu_order'        => 0,// EVT_order
-            'post_type'         => 'espresso_events',// post_type
-            'post_status'       => $post_status,// status
-        ];
-        $cols_n_values_with_no_invalid_text = [];
-        foreach ($cols_n_values as $col => $value) {
-            $value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
-            if (! is_wp_error($value_sans_invalid_chars)) {
-                $cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
-            } else {
-                // otherwise leave it as-is. It will blow everything up and stop the migration
-                $cols_n_values_with_no_invalid_text[ $col ] = $value;
-            }
-        }
-        $cols_n_values = $cols_n_values_with_no_invalid_text;
-        $data_types    = [
-            '%s',// EVT_name
-            '%s',// EVT_desc
-            '%s',// EVT_slug
-            '%s',// EVT_created
-            '%s',
-            '%s',// EVT_short_desc
-            '%s',// EVT_modified
-            '%s',
-            '%s',// EVT_wp_user
-            '%d',// post_parent
-            '%d',// EVT_order
-            '%s',// post_type
-            '%s',// status
-        ];
-        $success       = $wpdb->insert(
-            $this->_new_table,
-            $cols_n_values,
-            $data_types
-        );
-        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,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Counts all the registrations for the event in the 3.1 DB. (takes into account attendee rows which represent
-     * various registrations)
-     *
-     * @param int   $event_id
-     * @return int
-     * @global wpdb $wpdb
-     */
-    public static function count_registrations(int $event_id): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var(
-            $wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id)
-        );
-    }
-
-
-    /**
-     * @param $old_event
-     * @param $new_cpt_id
-     * @return int
-     */
-    private function _insert_event_meta($old_event, $new_cpt_id): int
-    {
-        global $wpdb;
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        //      for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
-        //  array('id' => "", 'text' => 'No Change'),
-        //  array('id' => 'Incomplete', 'text' => 'Incomplete'),
-        //  array('id' => 'Pending', 'text' => 'Pending'),
-        //  //array('id' => 'Completed', 'text' => 'Completed')
-        // );
-        $default_reg_status =
-            $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
-                $event_meta['default_payment_status'] ?? '',
-                intval($old_event['require_pre_approval'])
-            );
-        $cols_n_values      = [
-            'EVT_ID'                          => $new_cpt_id,// EVT_ID_fk
-            'EVT_display_desc'                => 'Y' == $old_event['display_desc'],
-            'EVT_display_ticket_selector'     => 'Y' == $old_event['display_reg_form'],
-            'EVT_visible_on'                  => $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_event,
-                current_time(
-                    'mysql'
-                ),
-                $old_event['timezone_string']
-            ),// don't use the old 'visible_on', as it wasn't ever used
-            'EVT_additional_limit'            => $old_event['allow_multiple'] == 'N' ? 1
-                : $old_event['additional_limit'],
-            'EVT_default_registration_status' => $default_reg_status,
-            'EVT_member_only'                 => $old_event['member_only'],
-            'EVT_phone'                       => $old_event['phone'],
-            'EVT_allow_overflow'              => 'Y' == $old_event['allow_overflow'],
-            'EVT_timezone_string'             => $old_event['timezone_string'],
-            'EVT_external_URL'                => $old_event['externalURL'],
-            'EVT_donations'                   => false,// doesn't exist in 3.1
-
-        ];
-        $data_types         = [
-            '%s',// EVT_ID
-            '%d',// EVT_display_desc
-            '%d',// EVT_display_ticket_selector
-            '%s',// EVT_visible_on
-            '%d',// EVT_additional_limit
-            '%s',// EVT_default_registration_status
-            '%d',// EVT_member_only
-            '%s',// EVT_phone
-            '%d',// EVT_allow_overflow
-            '%s',// EVT_timezone_string
-            '%s',// EVT_external_URL
-            '%d',// EVT_donations
-        ];
-        $success            = $wpdb->insert(
-            $this->_new_meta_table,
-            $cols_n_values,
-            $data_types
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_meta_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * @param $old_event
-     * @return int
-     */
-    private function _maybe_create_venue($old_event): int
-    {
-        if (
-            $old_event['address'] ||
-            $old_event['address2'] ||
-            $old_event['city'] ||
-            $old_event['state'] ||
-            $old_event['zip'] ||
-            $old_event['venue_title'] ||
-            $old_event['venue_url'] ||
-            $old_event['venue_image'] ||
-            $old_event['venue_phone'] ||
-            $old_event['virtual_url'] ||
-            $old_event['virtual_phone']
-        ) {
-            $old_id = $this->_duplicate_venue_exists($old_event);
-            if ($old_id) {
-                return $old_id;
-            }
-            $new_id = $this->_insert_venue_into_posts($old_event);
-            if ($new_id) {
-                $this->_insert_venue_into_meta_table($new_id, $old_event);
-                $guid = $old_event['venue_image'] ?? null;
-                $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
-                    $guid,
-                    $new_id,
-                    $this
-                );
-            }
-            // we don't bother recording the conversion from old events to venues as that
-            // will complicate finding the conversion from old venues to new events
-            return $new_id;
-        }
-        return 0;
-    }
-
-
-    /**
-     * Assuming there is venue data on this event, check if there is a duplicate venue already in the system for it.
-     * If so, return it. Otherwise, return NULL.
-     *
-     * @param array $old_event
-     * @return int duplicate venue id
-     */
-    private function _duplicate_venue_exists(array $old_event): int
-    {
-        global $wpdb;
-        $conditions     = [
-            'VNU_address'       => $old_event ['address'],
-            'VNU_address2'      => $old_event['address2'],
-            'VNU_city'          => $old_event['city'],
-            'VNU_zip'           => $old_event['zip'],
-            'post_title'        => $this->_get_venue_title_for_event($old_event),
-            'VNU_phone'         => $old_event['venue_phone'],// VNU_phone
-            'VNU_url'           => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'   => $old_event['virtual_url'],// VNU_virtual_url
-        ];
-        $sql_conditions = [];
-        foreach ($conditions as $column => $value) {
-            $sql_conditions [] = $wpdb->prepare("$column = %s", $value);
-        }
-        $query = "SELECT VNU_ID
+	private string $_old_start_end_table;
+
+	private string $_new_meta_table;
+
+	private string $_new_datetime_table;
+
+
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table           = $wpdb->prefix . "events_detail";
+		$this->_old_start_end_table = $wpdb->prefix . "events_start_end";
+		$this->_new_table           = $wpdb->prefix . "posts";
+		$this->_new_meta_table      = $wpdb->prefix . "esp_event_meta";
+		$this->_new_datetime_table  = $wpdb->prefix . "esp_datetime";
+		$this->_pretty_name         = esc_html__("Events", "event_espresso");
+		parent::__construct();
+	}
+
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @return int
+	 */
+	public function _count_records_to_migrate(): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
+	}
+
+
+	/**
+	 * 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
+	 * @throws EE_Error
+	 */
+	protected function _migration_step($num_items_to_migrate = 50)
+	{
+		global $wpdb;
+		// because the migration of each event can be a LOT more work, make each step smaller
+		$num_items_to_migrate     = max(1, $num_items_to_migrate / 5);
+		$events                   =
+			$wpdb->get_results(
+				$wpdb->prepare(
+					"SELECT * FROM $this->_old_table WHERE event_status!='D' LIMIT %d,%d",
+					$this->count_records_migrated(),
+					$num_items_to_migrate
+				),
+				ARRAY_A
+			);
+		$items_migrated_this_step = 0;
+
+		foreach ($events as $event_row) {
+			$guid = null;
+			// insert new 4.1 Attendee object using $wpdb
+			$post_id = $this->_insert_cpt($event_row);
+			if ($post_id) {
+				$this->get_migration_script()->set_mapping(
+					$this->_old_table,
+					$event_row['id'],
+					$this->_new_table,
+					$post_id
+				);
+				$meta_id = $this->_insert_event_meta($event_row, $post_id);
+				if ($meta_id) {
+					$this->get_migration_script()->set_mapping(
+						$this->_old_table,
+						$event_row['id'],
+						$this->_new_meta_table,
+						$meta_id
+					);
+				}
+				$this->_convert_start_end_times($event_row, $post_id);
+				$event_meta = maybe_unserialize($event_row['event_meta']);
+				$guid       = $event_meta['event_thumbnail_url'] ?? null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
+					$guid,
+					$post_id,
+					$this
+				);
+
+				// maybe create a venue from info on the event?
+				$new_venue_id = $this->_maybe_create_venue($event_row);
+				if ($new_venue_id) {
+					$this->_insert_new_venue_to_event($post_id, $new_venue_id);
+				}
+				$this->_add_post_metas($event_row, $post_id);
+			}
+			$items_migrated_this_step++;
+			if ($guid) {
+				// if we had to check for an image attachment
+				// then let's call it a day (avoid timing out, because this took a long time)
+				break;
+			}
+		}
+		if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
+			$this->set_status(EE_Data_Migration_Manager::status_completed);
+		}
+		return $items_migrated_this_step;
+	}
+
+
+	/**
+	 * Stores any extra 3.1 "event_meta" column things as post meta
+	 *
+	 * @param array $old_event
+	 * @param int   $post_id
+	 * @return void
+	 */
+	private function _add_post_metas(array $old_event, int $post_id)
+	{
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		if (! $event_meta || ! is_array($event_meta)) {
+			return;
+		}
+		unset($event_meta['date_submitted']);              // factored into CPT
+		unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
+		unset($event_meta['default_payment_status']);      // dido
+		unset($event_meta['event_thumbnail_url']);         // used to find post featured image
+		foreach ($event_meta as $meta_key => $meta_value) {
+			if ($meta_key) {// if the meta key is just an empty string, ignore it
+				$success = add_post_meta($post_id, $meta_key, $meta_value, true);
+				if (! $success) {
+					$this->add_error(
+						sprintf(
+							esc_html__(
+								"Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s",
+								"event_espresso"
+							),
+							$post_id,
+							$meta_key,
+							$meta_value,
+							implode(",", $old_event)
+						)
+					);
+				}
+			}
+		}
+		if ($old_event['alt_email']) {
+			add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
+		}
+		if ($old_event['recurrence_id']) {
+			add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
+		}
+	}
+
+
+	/**
+	 * Finds a unique slug for this event, given its name (we could have simply used
+	 * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
+	 * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
+	 *
+	 * @param string $event_name      (the name of the event for reading by humans)
+	 * @param string $old_identifier  the old EE3 identifier (a long unique string)
+	 * @param string $new_post_status a post status
+	 * @return string
+	 */
+	private function _find_unique_slug(
+		string $event_name,
+		string $old_identifier = '',
+		string $new_post_status = 'publish'
+	): string {
+		$original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
+		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
+	}
+
+
+	/**
+	 * returns whether there is a post that has this same slug (post_title)
+	 *
+	 * @param string $slug
+	 * @return boolean
+	 * @global wpdb  $wpdb
+	 */
+	private function _other_post_exists_with_that_slug(string $slug): bool
+	{
+		global $wpdb;
+		$query =
+			$wpdb->prepare(
+				"SELECT COUNT(ID) FROM $this->_new_table WHERE event_status != 'D' AND post_name = %s",
+				$slug
+			);
+		$count = $wpdb->get_var($query);
+		return (bool) intval($count);
+	}
+
+
+	/**
+	 * @param $old_event
+	 * @return int
+	 */
+	private function _insert_cpt($old_event): int
+	{
+		global $wpdb;
+		// convert 3.1 event status to 4.1 CPT status
+		// for reference, 3.1 event stati available for setting are:
+		//      $status = array(array('id' => 'A', 'text' => esc_html__('Public', 'event_espresso')), array('id' => 'S', 'text' => esc_html__('Waitlist', 'event_espresso')), array('id' => 'O', 'text' => esc_html__('Ongoing', 'event_espresso')), array('id' => 'R', 'text' => esc_html__('Draft', 'event_espresso')), array('id' => 'D', 'text' => esc_html__('Deleted', 'event_espresso')));
+		//      and the json api uses the following to convert from 3.1 to 4.0
+		//      'S'=>'secondary/waitlist',
+		//      'A'=>'active',
+		//      'X'=>'denied',
+		//      'IA'=>'inactive',
+		//      'O'=>'ongoing',
+		//      'P'=>'pending',
+		//      'R'=>'draft',
+		//      'D'=>'deleted');
+		//      4.1 Event Post stati are the normal post statis
+		//      (publish,future,draft,pending,private,trash,auto-draft,inherit)
+		//      and 3 custom ones: cancelled,postponed,sold_out
+		$status_conversions = [
+			'R'  => 'draft',
+			'X'  => 'draft',
+			// 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+			'P'  => 'pending',
+			'IA' => 'draft',
+			// draft and in the past
+			// IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
+			'O'  => 'publish',
+			// @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+			'A'  => 'publish',
+			'S'  => 'draft',
+			// @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+			'D'  => 'trash',
+		];
+		$post_status        = $status_conversions[ $old_event['event_status'] ];
+		// check if we've sold out
+		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
+			$post_status = 'sold_out';
+		}
+		//      FYI postponed and cancelled don't exist in 3.1
+		$cols_n_values                      = [
+			'post_title'        => stripslashes($old_event['event_name']),// EVT_name
+			'post_content'      => stripslashes($old_event['event_desc']),// EVT_desc
+			'post_name'         => $this->_find_unique_slug(
+				$old_event['event_name'],
+				$old_event['event_identifier'],
+				$post_status
+			),// EVT_slug
+			'post_date'         => $old_event['submitted'],// EVT_created NOT
+			'post_date_gmt'     => get_gmt_from_date($old_event['submitted']),
+			'post_excerpt'      => '',// EVT_short_desc
+			'post_modified'     => $old_event['submitted'],// EVT_modified
+			'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
+			'post_author'       => $old_event['wp_user'],// EVT_wp_user
+			'post_parent'       => 0,// parent maybe get this from some REM field?
+			'menu_order'        => 0,// EVT_order
+			'post_type'         => 'espresso_events',// post_type
+			'post_status'       => $post_status,// status
+		];
+		$cols_n_values_with_no_invalid_text = [];
+		foreach ($cols_n_values as $col => $value) {
+			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
+			if (! is_wp_error($value_sans_invalid_chars)) {
+				$cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+			} else {
+				// otherwise leave it as-is. It will blow everything up and stop the migration
+				$cols_n_values_with_no_invalid_text[ $col ] = $value;
+			}
+		}
+		$cols_n_values = $cols_n_values_with_no_invalid_text;
+		$data_types    = [
+			'%s',// EVT_name
+			'%s',// EVT_desc
+			'%s',// EVT_slug
+			'%s',// EVT_created
+			'%s',
+			'%s',// EVT_short_desc
+			'%s',// EVT_modified
+			'%s',
+			'%s',// EVT_wp_user
+			'%d',// post_parent
+			'%d',// EVT_order
+			'%s',// post_type
+			'%s',// status
+		];
+		$success       = $wpdb->insert(
+			$this->_new_table,
+			$cols_n_values,
+			$data_types
+		);
+		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,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Counts all the registrations for the event in the 3.1 DB. (takes into account attendee rows which represent
+	 * various registrations)
+	 *
+	 * @param int   $event_id
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	public static function count_registrations(int $event_id): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var(
+			$wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id)
+		);
+	}
+
+
+	/**
+	 * @param $old_event
+	 * @param $new_cpt_id
+	 * @return int
+	 */
+	private function _insert_event_meta($old_event, $new_cpt_id): int
+	{
+		global $wpdb;
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		//      for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
+		//  array('id' => "", 'text' => 'No Change'),
+		//  array('id' => 'Incomplete', 'text' => 'Incomplete'),
+		//  array('id' => 'Pending', 'text' => 'Pending'),
+		//  //array('id' => 'Completed', 'text' => 'Completed')
+		// );
+		$default_reg_status =
+			$this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
+				$event_meta['default_payment_status'] ?? '',
+				intval($old_event['require_pre_approval'])
+			);
+		$cols_n_values      = [
+			'EVT_ID'                          => $new_cpt_id,// EVT_ID_fk
+			'EVT_display_desc'                => 'Y' == $old_event['display_desc'],
+			'EVT_display_ticket_selector'     => 'Y' == $old_event['display_reg_form'],
+			'EVT_visible_on'                  => $this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_event,
+				current_time(
+					'mysql'
+				),
+				$old_event['timezone_string']
+			),// don't use the old 'visible_on', as it wasn't ever used
+			'EVT_additional_limit'            => $old_event['allow_multiple'] == 'N' ? 1
+				: $old_event['additional_limit'],
+			'EVT_default_registration_status' => $default_reg_status,
+			'EVT_member_only'                 => $old_event['member_only'],
+			'EVT_phone'                       => $old_event['phone'],
+			'EVT_allow_overflow'              => 'Y' == $old_event['allow_overflow'],
+			'EVT_timezone_string'             => $old_event['timezone_string'],
+			'EVT_external_URL'                => $old_event['externalURL'],
+			'EVT_donations'                   => false,// doesn't exist in 3.1
+
+		];
+		$data_types         = [
+			'%s',// EVT_ID
+			'%d',// EVT_display_desc
+			'%d',// EVT_display_ticket_selector
+			'%s',// EVT_visible_on
+			'%d',// EVT_additional_limit
+			'%s',// EVT_default_registration_status
+			'%d',// EVT_member_only
+			'%s',// EVT_phone
+			'%d',// EVT_allow_overflow
+			'%s',// EVT_timezone_string
+			'%s',// EVT_external_URL
+			'%d',// EVT_donations
+		];
+		$success            = $wpdb->insert(
+			$this->_new_meta_table,
+			$cols_n_values,
+			$data_types
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_meta_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * @param $old_event
+	 * @return int
+	 */
+	private function _maybe_create_venue($old_event): int
+	{
+		if (
+			$old_event['address'] ||
+			$old_event['address2'] ||
+			$old_event['city'] ||
+			$old_event['state'] ||
+			$old_event['zip'] ||
+			$old_event['venue_title'] ||
+			$old_event['venue_url'] ||
+			$old_event['venue_image'] ||
+			$old_event['venue_phone'] ||
+			$old_event['virtual_url'] ||
+			$old_event['virtual_phone']
+		) {
+			$old_id = $this->_duplicate_venue_exists($old_event);
+			if ($old_id) {
+				return $old_id;
+			}
+			$new_id = $this->_insert_venue_into_posts($old_event);
+			if ($new_id) {
+				$this->_insert_venue_into_meta_table($new_id, $old_event);
+				$guid = $old_event['venue_image'] ?? null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
+					$guid,
+					$new_id,
+					$this
+				);
+			}
+			// we don't bother recording the conversion from old events to venues as that
+			// will complicate finding the conversion from old venues to new events
+			return $new_id;
+		}
+		return 0;
+	}
+
+
+	/**
+	 * Assuming there is venue data on this event, check if there is a duplicate venue already in the system for it.
+	 * If so, return it. Otherwise, return NULL.
+	 *
+	 * @param array $old_event
+	 * @return int duplicate venue id
+	 */
+	private function _duplicate_venue_exists(array $old_event): int
+	{
+		global $wpdb;
+		$conditions     = [
+			'VNU_address'       => $old_event ['address'],
+			'VNU_address2'      => $old_event['address2'],
+			'VNU_city'          => $old_event['city'],
+			'VNU_zip'           => $old_event['zip'],
+			'post_title'        => $this->_get_venue_title_for_event($old_event),
+			'VNU_phone'         => $old_event['venue_phone'],// VNU_phone
+			'VNU_url'           => $old_event['venue_url'],// VNU_url
+			'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
+			'VNU_virtual_url'   => $old_event['virtual_url'],// VNU_virtual_url
+		];
+		$sql_conditions = [];
+		foreach ($conditions as $column => $value) {
+			$sql_conditions [] = $wpdb->prepare("$column = %s", $value);
+		}
+		$query = "SELECT VNU_ID
 					FROM
 		$wpdb->posts as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
 			WHERE " . implode(" AND ", $sql_conditions) . " LIMIT 1";
-        return (int) $wpdb->get_var($query);
-    }
-
-
-    /**
-     * Gets teh venue's title or makes one up if there is none
-     *
-     * @param array $event_data_array keys are events_details columns and values are their values
-     * @return string
-     */
-    protected function _get_venue_title_for_event(array $event_data_array): string
-    {
-        return $event_data_array['venue_title']
-            ? stripslashes($event_data_array['venue_title'])
-            : stripslashes(
-                sprintf(
-                    esc_html__('Venue of %s', 'event_espresso'),
-                    $event_data_array['event_name']
-                )
-            );
-    }
-
-
-    /**
-     * Inserts the CPT
-     *
-     * @param array $old_event keys are cols, values are col values
-     * @return int
-     */
-    private function _insert_venue_into_posts(array $old_event): int
-    {
-        global $wpdb;
-        $insertion_array  = [
-            'post_title'        => $this->_get_venue_title_for_event($old_event),// VNU_name
-            'post_content'      => '',// VNU_desc
-            'post_name'         => $this->_find_unique_slug(
-                $old_event['venue_title'],
-                sanitize_title('venue-of-' . $old_event['event_name'])
-            ),// VNU_identifier
-            'post_date'         => current_time('mysql'),// VNU_created
-            'post_date_gmt'     => get_gmt_from_date(current_time('mysql')),
-            'post_excerpt'      => '',// VNU_short_desc arbitrary only 50 characters
-            'post_modified'     => current_time('mysql'),// VNU_modified
-            'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
-            'post_author'       => $old_event['wp_user'],// VNU_wp_user
-            'post_parent'       => 0,// parent
-            'menu_order'        => 0,// VNU_order
-            'post_type'         => 'espresso_venues',// post_type
-        ];
-        $data_types_array = [
-            '%s',// VNU_name
-            '%s',// VNU_desc
-            '%s',// VNU_identifier
-            '%s',// VNU_created
-            '%s',
-            '%s',// VNU_short_desc
-            '%s',// VNU_modified
-            '%s',
-            '%d',// VNU_wp_user
-            '%d',// parent
-            '%d',// VNU_order
-            '%s',// post_type
-        ];
-        $success          = $wpdb->insert(
-            $wpdb->posts,
-            $insertion_array,
-            $data_types_array
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_table,
-                    $insertion_array,
-                    $data_types_array
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Inserts into the venue_meta table
-     *
-     * @param int   $cpt_id
-     * @param array $old_event
-     * @return void
-     */
-    private function _insert_venue_into_meta_table(int $cpt_id, array $old_event): void
-    {
-        global $wpdb;
-
-        // assume the country is the same as the organization's old settings
-        $country_iso = $this->get_migration_script()->get_default_country_iso();
-        // find the state from the venue, or the organization, or just guess california
-        if (! $old_event['state']) {
-            $old_org_options = get_option('events_organization_settings');
-            $state_name      = stripslashes($old_org_options['organization_state']);
-        } else {
-            $state_name = $old_event['state'];
-        }
-        if (! $state_name) {
-            $state_name = 'CA';
-        }
-        // get a state ID with the same name, if possible
-        try {
-            $state    = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
-            $state_id = $state['STA_ID'];
-        } catch (EE_Error $e) {
-            $this->add_error($e->getMessage());
-            $state_id = 0;
-        }
-        // now insert into meta table
-        $insertion_array = [
-            'VNU_ID'              => $cpt_id,// VNU_ID_fk
-            'VNU_address'         => stripslashes($old_event['address']),// VNU_address
-            'VNU_address2'        => stripslashes($old_event['address2']),// VNU_address2
-            'VNU_city'            => stripslashes($old_event['city']),// VNU_city
-            'STA_ID'              => $state_id,// STA_ID
-            'CNT_ISO'             => $country_iso,// CNT_ISO
-            'VNU_zip'             => $old_event['zip'],// VNU_zip
-            'VNU_phone'           => $old_event['venue_phone'],// VNU_phone
-            'VNU_capacity'        => -1,// VNU_capacity
-            'VNU_url'             => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone'   => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'     => $old_event['virtual_url'],// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
-            'VNU_enable_for_gmap' => true, // VNU_enable_for_gmap
-        ];
-        $data_types      = [
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
-        ];
-        $success         = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_meta_table,
-                    $insertion_array,
-                    $data_types
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @param $new_event_id
-     * @param $new_venue_id
-     * @return void
-     */
-    private function _insert_new_venue_to_event($new_event_id, $new_venue_id): void
-    {
-        global $wpdb;
-        if (! $new_event_id) {
-            $this->add_error(
-                sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)
-            );
-            return;
-        }
-        if (! $new_venue_id) {
-            $this->add_error(
-                sprintf(esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)
-            );
-            return;
-        }
-        $cols_n_values = [
-            'EVT_ID'      => $new_event_id,
-            'VNU_ID'      => $new_venue_id,
-            'EVV_primary' => true,
-        ];
-        $data_types    = [
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
-        ];
-        $success       = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    [],
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Converts all the 3.1 start-end times for the event to 4.1 datetimes
-     *
-     * @param array $old_event  results of get_results(...,ARRAY_A)
-     * @param int   $new_cpt_id new post ID
-     * @return void (if there are errors though, adds them to the stage's error list
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _convert_start_end_times(array $old_event, int $new_cpt_id)
-    {
-        $start_end_times = $this->_get_old_start_end_times($old_event['id']);
-        foreach ($start_end_times as $start_end_time) {
-            $datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
-            if ($datetime_id) {
-                $this->get_migration_script()->set_mapping(
-                    $this->_old_start_end_table,
-                    $start_end_time['id'],
-                    $this->_new_datetime_table,
-                    $datetime_id
-                );
-            }
-        }
-    }
-
-
-    /**
-     * Queries the 3.1 wp_events_start_end table to get all the start and end times for the event
-     *
-     * @param int   $old_event_id
-     * @return array
-     * @global wpdb $wpdb
-     */
-    private function _get_old_start_end_times(int $old_event_id): array
-    {
-        global $wpdb;
-        return $wpdb->get_results(
-            $wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id),
-            ARRAY_A
-        );
-    }
-
-
-    /**
-     * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
-     *
-     * @param array $start_end_time_row
-     * @param array $old_event_row
-     * @param int   $new_cpt_id
-     * @return int ID of new datetime
-     */
-    private function _insert_new_datetime(array $start_end_time_row, array $old_event_row, int $new_cpt_id): int
-    {
-        global $wpdb;
-        $start_date         = $old_event_row['start_date'];
-        $start_time         = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
-        $end_date           = $old_event_row['end_date'];
-        $end_time           = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
-        $existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
-        $start_datetime_utc =
-            $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $start_end_time_row,
-                "$start_date $start_time:00",
-                $old_event_row['timezone_string']
-            );
-        $end_datetime_utc   =
-            $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $start_end_time_row,
-                "$end_date $end_time:00",
-                $old_event_row['timezone_string']
-            );
-        $cols_n_values      = [
-            'EVT_ID'        => $new_cpt_id,
-            // EVT_ID
-            'DTT_EVT_start' => $start_datetime_utc,
-            // DTT_EVT_start
-            'DTT_EVT_end'   => $end_datetime_utc,
-            // DTT_EVT_end
-            'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit']
-                : $old_event_row['reg_limit'],
-            // DTT_reg_limit
-            'DTT_sold'      => 0,
-            // note: we will increment this as registrations are added during the migration
-            //          'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-            'DTT_order'     => $existing_datetimes,
-            // DTT_order, just give it the same order as the count of how many datetimes already exist
-            'DTT_parent'    => 0,
-            'DTT_deleted'   => false,
-        ];
-        $data_types         = [
-            '%d',// EVT_Id
-            '%s',// DTT_EVT_start
-            '%s',// DTT_EVT_end
-            '%d',// DTT_reg_limit
-            '%d',// DTT_sold
-            //          '%d',//DTT_is_primary
-            '%d',// DTT_order
-            '%d',// DTT_parent
-            '%d',// DTT_deleted
-        ];
-        $success            = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_start_end_table,
-                    array_merge($old_event_row, $start_end_time_row),
-                    $this->_new_datetime_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Checks if there's a 4.1 datetime for this event already. This is mostly only handy
-     * when deciding whether a datetime we're about ot insert should be the 'primary' or not
-     *
-     * @param int   $cpt_event_id
-     * @return int
-     * @global wpdb $wpdb
-     */
-    private function _count_other_datetimes_exist_for_new_event(int $cpt_event_id): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",
-                $cpt_event_id
-            )
-        );
-    }
+		return (int) $wpdb->get_var($query);
+	}
+
+
+	/**
+	 * Gets teh venue's title or makes one up if there is none
+	 *
+	 * @param array $event_data_array keys are events_details columns and values are their values
+	 * @return string
+	 */
+	protected function _get_venue_title_for_event(array $event_data_array): string
+	{
+		return $event_data_array['venue_title']
+			? stripslashes($event_data_array['venue_title'])
+			: stripslashes(
+				sprintf(
+					esc_html__('Venue of %s', 'event_espresso'),
+					$event_data_array['event_name']
+				)
+			);
+	}
+
+
+	/**
+	 * Inserts the CPT
+	 *
+	 * @param array $old_event keys are cols, values are col values
+	 * @return int
+	 */
+	private function _insert_venue_into_posts(array $old_event): int
+	{
+		global $wpdb;
+		$insertion_array  = [
+			'post_title'        => $this->_get_venue_title_for_event($old_event),// VNU_name
+			'post_content'      => '',// VNU_desc
+			'post_name'         => $this->_find_unique_slug(
+				$old_event['venue_title'],
+				sanitize_title('venue-of-' . $old_event['event_name'])
+			),// VNU_identifier
+			'post_date'         => current_time('mysql'),// VNU_created
+			'post_date_gmt'     => get_gmt_from_date(current_time('mysql')),
+			'post_excerpt'      => '',// VNU_short_desc arbitrary only 50 characters
+			'post_modified'     => current_time('mysql'),// VNU_modified
+			'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
+			'post_author'       => $old_event['wp_user'],// VNU_wp_user
+			'post_parent'       => 0,// parent
+			'menu_order'        => 0,// VNU_order
+			'post_type'         => 'espresso_venues',// post_type
+		];
+		$data_types_array = [
+			'%s',// VNU_name
+			'%s',// VNU_desc
+			'%s',// VNU_identifier
+			'%s',// VNU_created
+			'%s',
+			'%s',// VNU_short_desc
+			'%s',// VNU_modified
+			'%s',
+			'%d',// VNU_wp_user
+			'%d',// parent
+			'%d',// VNU_order
+			'%s',// post_type
+		];
+		$success          = $wpdb->insert(
+			$wpdb->posts,
+			$insertion_array,
+			$data_types_array
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_table,
+					$insertion_array,
+					$data_types_array
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Inserts into the venue_meta table
+	 *
+	 * @param int   $cpt_id
+	 * @param array $old_event
+	 * @return void
+	 */
+	private function _insert_venue_into_meta_table(int $cpt_id, array $old_event): void
+	{
+		global $wpdb;
+
+		// assume the country is the same as the organization's old settings
+		$country_iso = $this->get_migration_script()->get_default_country_iso();
+		// find the state from the venue, or the organization, or just guess california
+		if (! $old_event['state']) {
+			$old_org_options = get_option('events_organization_settings');
+			$state_name      = stripslashes($old_org_options['organization_state']);
+		} else {
+			$state_name = $old_event['state'];
+		}
+		if (! $state_name) {
+			$state_name = 'CA';
+		}
+		// get a state ID with the same name, if possible
+		try {
+			$state    = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
+			$state_id = $state['STA_ID'];
+		} catch (EE_Error $e) {
+			$this->add_error($e->getMessage());
+			$state_id = 0;
+		}
+		// now insert into meta table
+		$insertion_array = [
+			'VNU_ID'              => $cpt_id,// VNU_ID_fk
+			'VNU_address'         => stripslashes($old_event['address']),// VNU_address
+			'VNU_address2'        => stripslashes($old_event['address2']),// VNU_address2
+			'VNU_city'            => stripslashes($old_event['city']),// VNU_city
+			'STA_ID'              => $state_id,// STA_ID
+			'CNT_ISO'             => $country_iso,// CNT_ISO
+			'VNU_zip'             => $old_event['zip'],// VNU_zip
+			'VNU_phone'           => $old_event['venue_phone'],// VNU_phone
+			'VNU_capacity'        => -1,// VNU_capacity
+			'VNU_url'             => $old_event['venue_url'],// VNU_url
+			'VNU_virtual_phone'   => $old_event['virtual_phone'],// VNU_virtual_phone
+			'VNU_virtual_url'     => $old_event['virtual_url'],// VNU_virtual_url
+			'VNU_google_map_link' => '',// VNU_google_map_link
+			'VNU_enable_for_gmap' => true, // VNU_enable_for_gmap
+		];
+		$data_types      = [
+			'%d',// VNU_ID_fk
+			'%s',// VNU_address
+			'%s',// VNU_address2
+			'%s',// VNU_city
+			'%d',// STA_ID
+			'%s',// CNT_ISO
+			'%s',// VNU_zip
+			'%s',// VNU_phone
+			'%d',// VNU_capacity
+			'%s',// VNU_url
+			'%s',// VNU_virtual_phone
+			'%s',// VNU_virtual_url
+			'%s',// VNU_google_map_link
+			'%d',// VNU_enable_for_gmap
+		];
+		$success         = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_meta_table,
+					$insertion_array,
+					$data_types
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @param $new_event_id
+	 * @param $new_venue_id
+	 * @return void
+	 */
+	private function _insert_new_venue_to_event($new_event_id, $new_venue_id): void
+	{
+		global $wpdb;
+		if (! $new_event_id) {
+			$this->add_error(
+				sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)
+			);
+			return;
+		}
+		if (! $new_venue_id) {
+			$this->add_error(
+				sprintf(esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)
+			);
+			return;
+		}
+		$cols_n_values = [
+			'EVT_ID'      => $new_event_id,
+			'VNU_ID'      => $new_venue_id,
+			'EVV_primary' => true,
+		];
+		$data_types    = [
+			'%d',// EVT_ID
+			'%d',// VNU_ID
+			'%d',// EVT_primary
+		];
+		$success       = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					[],
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Converts all the 3.1 start-end times for the event to 4.1 datetimes
+	 *
+	 * @param array $old_event  results of get_results(...,ARRAY_A)
+	 * @param int   $new_cpt_id new post ID
+	 * @return void (if there are errors though, adds them to the stage's error list
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _convert_start_end_times(array $old_event, int $new_cpt_id)
+	{
+		$start_end_times = $this->_get_old_start_end_times($old_event['id']);
+		foreach ($start_end_times as $start_end_time) {
+			$datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
+			if ($datetime_id) {
+				$this->get_migration_script()->set_mapping(
+					$this->_old_start_end_table,
+					$start_end_time['id'],
+					$this->_new_datetime_table,
+					$datetime_id
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * Queries the 3.1 wp_events_start_end table to get all the start and end times for the event
+	 *
+	 * @param int   $old_event_id
+	 * @return array
+	 * @global wpdb $wpdb
+	 */
+	private function _get_old_start_end_times(int $old_event_id): array
+	{
+		global $wpdb;
+		return $wpdb->get_results(
+			$wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id),
+			ARRAY_A
+		);
+	}
+
+
+	/**
+	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
+	 *
+	 * @param array $start_end_time_row
+	 * @param array $old_event_row
+	 * @param int   $new_cpt_id
+	 * @return int ID of new datetime
+	 */
+	private function _insert_new_datetime(array $start_end_time_row, array $old_event_row, int $new_cpt_id): int
+	{
+		global $wpdb;
+		$start_date         = $old_event_row['start_date'];
+		$start_time         = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
+		$end_date           = $old_event_row['end_date'];
+		$end_time           = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
+		$existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
+		$start_datetime_utc =
+			$this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$start_end_time_row,
+				"$start_date $start_time:00",
+				$old_event_row['timezone_string']
+			);
+		$end_datetime_utc   =
+			$this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$start_end_time_row,
+				"$end_date $end_time:00",
+				$old_event_row['timezone_string']
+			);
+		$cols_n_values      = [
+			'EVT_ID'        => $new_cpt_id,
+			// EVT_ID
+			'DTT_EVT_start' => $start_datetime_utc,
+			// DTT_EVT_start
+			'DTT_EVT_end'   => $end_datetime_utc,
+			// DTT_EVT_end
+			'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit']
+				: $old_event_row['reg_limit'],
+			// DTT_reg_limit
+			'DTT_sold'      => 0,
+			// note: we will increment this as registrations are added during the migration
+			//          'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
+			'DTT_order'     => $existing_datetimes,
+			// DTT_order, just give it the same order as the count of how many datetimes already exist
+			'DTT_parent'    => 0,
+			'DTT_deleted'   => false,
+		];
+		$data_types         = [
+			'%d',// EVT_Id
+			'%s',// DTT_EVT_start
+			'%s',// DTT_EVT_end
+			'%d',// DTT_reg_limit
+			'%d',// DTT_sold
+			//          '%d',//DTT_is_primary
+			'%d',// DTT_order
+			'%d',// DTT_parent
+			'%d',// DTT_deleted
+		];
+		$success            = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_start_end_table,
+					array_merge($old_event_row, $start_end_time_row),
+					$this->_new_datetime_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Checks if there's a 4.1 datetime for this event already. This is mostly only handy
+	 * when deciding whether a datetime we're about ot insert should be the 'primary' or not
+	 *
+	 * @param int   $cpt_event_id
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	private function _count_other_datetimes_exist_for_new_event(int $cpt_event_id): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",
+				$cpt_event_id
+			)
+		);
+	}
 }

Spacing +143 added lines, -143 removed lines

@@ -188,11 +188,11 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table           = $wpdb->prefix . "events_detail";
-        $this->_old_start_end_table = $wpdb->prefix . "events_start_end";
-        $this->_new_table           = $wpdb->prefix . "posts";
-        $this->_new_meta_table      = $wpdb->prefix . "esp_event_meta";
-        $this->_new_datetime_table  = $wpdb->prefix . "esp_datetime";
+        $this->_old_table           = $wpdb->prefix."events_detail";
+        $this->_old_start_end_table = $wpdb->prefix."events_start_end";
+        $this->_new_table           = $wpdb->prefix."posts";
+        $this->_new_meta_table      = $wpdb->prefix."esp_event_meta";
+        $this->_new_datetime_table  = $wpdb->prefix."esp_datetime";
         $this->_pretty_name         = esc_html__("Events", "event_espresso");
         parent::__construct();
     }
@@ -206,7 +206,7 @@ 
     public function _count_records_to_migrate(): int
     {
         global $wpdb;
-        return (int) $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
+        return (int) $wpdb->get_var("SELECT COUNT(*) FROM ".$this->_old_table.' WHERE event_status !="D"');
     }
 
 
@@ -298,17 +298,17 @@ 
     private function _add_post_metas(array $old_event, int $post_id)
     {
         $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (! $event_meta || ! is_array($event_meta)) {
+        if ( ! $event_meta || ! is_array($event_meta)) {
             return;
         }
-        unset($event_meta['date_submitted']);              // factored into CPT
-        unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
-        unset($event_meta['default_payment_status']);      // dido
-        unset($event_meta['event_thumbnail_url']);         // used to find post featured image
+        unset($event_meta['date_submitted']); // factored into CPT
+        unset($event_meta['additional_attendee_reg_info']); // factored into event meta table
+        unset($event_meta['default_payment_status']); // dido
+        unset($event_meta['event_thumbnail_url']); // used to find post featured image
         foreach ($event_meta as $meta_key => $meta_value) {
             if ($meta_key) {// if the meta key is just an empty string, ignore it
                 $success = add_post_meta($post_id, $meta_key, $meta_value, true);
-                if (! $success) {
+                if ( ! $success) {
                     $this->add_error(
                         sprintf(
                             esc_html__(
@@ -410,63 +410,63 @@ 
             // @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
             'D'  => 'trash',
         ];
-        $post_status        = $status_conversions[ $old_event['event_status'] ];
+        $post_status = $status_conversions[$old_event['event_status']];
         // check if we've sold out
         if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
             $post_status = 'sold_out';
         }
         //      FYI postponed and cancelled don't exist in 3.1
-        $cols_n_values                      = [
-            'post_title'        => stripslashes($old_event['event_name']),// EVT_name
-            'post_content'      => stripslashes($old_event['event_desc']),// EVT_desc
+        $cols_n_values = [
+            'post_title'        => stripslashes($old_event['event_name']), // EVT_name
+            'post_content'      => stripslashes($old_event['event_desc']), // EVT_desc
             'post_name'         => $this->_find_unique_slug(
                 $old_event['event_name'],
                 $old_event['event_identifier'],
                 $post_status
-            ),// EVT_slug
-            'post_date'         => $old_event['submitted'],// EVT_created NOT
+            ), // EVT_slug
+            'post_date'         => $old_event['submitted'], // EVT_created NOT
             'post_date_gmt'     => get_gmt_from_date($old_event['submitted']),
-            'post_excerpt'      => '',// EVT_short_desc
-            'post_modified'     => $old_event['submitted'],// EVT_modified
+            'post_excerpt'      => '', // EVT_short_desc
+            'post_modified'     => $old_event['submitted'], // EVT_modified
             'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_author'       => $old_event['wp_user'],// EVT_wp_user
-            'post_parent'       => 0,// parent maybe get this from some REM field?
-            'menu_order'        => 0,// EVT_order
-            'post_type'         => 'espresso_events',// post_type
-            'post_status'       => $post_status,// status
+            'post_author'       => $old_event['wp_user'], // EVT_wp_user
+            'post_parent'       => 0, // parent maybe get this from some REM field?
+            'menu_order'        => 0, // EVT_order
+            'post_type'         => 'espresso_events', // post_type
+            'post_status'       => $post_status, // status
         ];
         $cols_n_values_with_no_invalid_text = [];
         foreach ($cols_n_values as $col => $value) {
             $value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
-            if (! is_wp_error($value_sans_invalid_chars)) {
-                $cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+            if ( ! is_wp_error($value_sans_invalid_chars)) {
+                $cols_n_values_with_no_invalid_text[$col] = $value_sans_invalid_chars;
             } else {
                 // otherwise leave it as-is. It will blow everything up and stop the migration
-                $cols_n_values_with_no_invalid_text[ $col ] = $value;
+                $cols_n_values_with_no_invalid_text[$col] = $value;
             }
         }
         $cols_n_values = $cols_n_values_with_no_invalid_text;
         $data_types    = [
-            '%s',// EVT_name
-            '%s',// EVT_desc
-            '%s',// EVT_slug
-            '%s',// EVT_created
+            '%s', // EVT_name
+            '%s', // EVT_desc
+            '%s', // EVT_slug
+            '%s', // EVT_created
             '%s',
-            '%s',// EVT_short_desc
-            '%s',// EVT_modified
+            '%s', // EVT_short_desc
+            '%s', // EVT_modified
             '%s',
-            '%s',// EVT_wp_user
-            '%d',// post_parent
-            '%d',// EVT_order
-            '%s',// post_type
-            '%s',// status
+            '%s', // EVT_wp_user
+            '%d', // post_parent
+            '%d', // EVT_order
+            '%s', // post_type
+            '%s', // status
         ];
-        $success       = $wpdb->insert(
+        $success = $wpdb->insert(
             $this->_new_table,
             $cols_n_values,
             $data_types
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -519,8 +519,8 @@ 
                 $event_meta['default_payment_status'] ?? '',
                 intval($old_event['require_pre_approval'])
             );
-        $cols_n_values      = [
-            'EVT_ID'                          => $new_cpt_id,// EVT_ID_fk
+        $cols_n_values = [
+            'EVT_ID'                          => $new_cpt_id, // EVT_ID_fk
             'EVT_display_desc'                => 'Y' == $old_event['display_desc'],
             'EVT_display_ticket_selector'     => 'Y' == $old_event['display_reg_form'],
             'EVT_visible_on'                  => $this->get_migration_script()->convert_date_string_to_utc(
@@ -530,7 +530,7 @@ 
                     'mysql'
                 ),
                 $old_event['timezone_string']
-            ),// don't use the old 'visible_on', as it wasn't ever used
+            ), // don't use the old 'visible_on', as it wasn't ever used
             'EVT_additional_limit'            => $old_event['allow_multiple'] == 'N' ? 1
                 : $old_event['additional_limit'],
             'EVT_default_registration_status' => $default_reg_status,
@@ -539,29 +539,29 @@ 
             'EVT_allow_overflow'              => 'Y' == $old_event['allow_overflow'],
             'EVT_timezone_string'             => $old_event['timezone_string'],
             'EVT_external_URL'                => $old_event['externalURL'],
-            'EVT_donations'                   => false,// doesn't exist in 3.1
+            'EVT_donations'                   => false, // doesn't exist in 3.1
 
         ];
-        $data_types         = [
-            '%s',// EVT_ID
-            '%d',// EVT_display_desc
-            '%d',// EVT_display_ticket_selector
-            '%s',// EVT_visible_on
-            '%d',// EVT_additional_limit
-            '%s',// EVT_default_registration_status
-            '%d',// EVT_member_only
-            '%s',// EVT_phone
-            '%d',// EVT_allow_overflow
-            '%s',// EVT_timezone_string
-            '%s',// EVT_external_URL
-            '%d',// EVT_donations
+        $data_types = [
+            '%s', // EVT_ID
+            '%d', // EVT_display_desc
+            '%d', // EVT_display_ticket_selector
+            '%s', // EVT_visible_on
+            '%d', // EVT_additional_limit
+            '%s', // EVT_default_registration_status
+            '%d', // EVT_member_only
+            '%s', // EVT_phone
+            '%d', // EVT_allow_overflow
+            '%s', // EVT_timezone_string
+            '%s', // EVT_external_URL
+            '%d', // EVT_donations
         ];
-        $success            = $wpdb->insert(
+        $success = $wpdb->insert(
             $this->_new_meta_table,
             $cols_n_values,
             $data_types
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -628,16 +628,16 @@ 
     private function _duplicate_venue_exists(array $old_event): int
     {
         global $wpdb;
-        $conditions     = [
+        $conditions = [
             'VNU_address'       => $old_event ['address'],
             'VNU_address2'      => $old_event['address2'],
             'VNU_city'          => $old_event['city'],
             'VNU_zip'           => $old_event['zip'],
             'post_title'        => $this->_get_venue_title_for_event($old_event),
-            'VNU_phone'         => $old_event['venue_phone'],// VNU_phone
-            'VNU_url'           => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'   => $old_event['virtual_url'],// VNU_virtual_url
+            'VNU_phone'         => $old_event['venue_phone'], // VNU_phone
+            'VNU_url'           => $old_event['venue_url'], // VNU_url
+            'VNU_virtual_phone' => $old_event['virtual_phone'], // VNU_virtual_phone
+            'VNU_virtual_url'   => $old_event['virtual_url'], // VNU_virtual_url
         ];
         $sql_conditions = [];
         foreach ($conditions as $column => $value) {
@@ -647,7 +647,7 @@ 
 					FROM
 		$wpdb->posts as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
-			WHERE " . implode(" AND ", $sql_conditions) . " LIMIT 1";
+			WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1";
         return (int) $wpdb->get_var($query);
     }
 
@@ -680,43 +680,43 @@ 
     private function _insert_venue_into_posts(array $old_event): int
     {
         global $wpdb;
-        $insertion_array  = [
-            'post_title'        => $this->_get_venue_title_for_event($old_event),// VNU_name
-            'post_content'      => '',// VNU_desc
+        $insertion_array = [
+            'post_title'        => $this->_get_venue_title_for_event($old_event), // VNU_name
+            'post_content'      => '', // VNU_desc
             'post_name'         => $this->_find_unique_slug(
                 $old_event['venue_title'],
-                sanitize_title('venue-of-' . $old_event['event_name'])
-            ),// VNU_identifier
-            'post_date'         => current_time('mysql'),// VNU_created
+                sanitize_title('venue-of-'.$old_event['event_name'])
+            ), // VNU_identifier
+            'post_date'         => current_time('mysql'), // VNU_created
             'post_date_gmt'     => get_gmt_from_date(current_time('mysql')),
-            'post_excerpt'      => '',// VNU_short_desc arbitrary only 50 characters
-            'post_modified'     => current_time('mysql'),// VNU_modified
+            'post_excerpt'      => '', // VNU_short_desc arbitrary only 50 characters
+            'post_modified'     => current_time('mysql'), // VNU_modified
             'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
-            'post_author'       => $old_event['wp_user'],// VNU_wp_user
-            'post_parent'       => 0,// parent
-            'menu_order'        => 0,// VNU_order
-            'post_type'         => 'espresso_venues',// post_type
+            'post_author'       => $old_event['wp_user'], // VNU_wp_user
+            'post_parent'       => 0, // parent
+            'menu_order'        => 0, // VNU_order
+            'post_type'         => 'espresso_venues', // post_type
         ];
         $data_types_array = [
-            '%s',// VNU_name
-            '%s',// VNU_desc
-            '%s',// VNU_identifier
-            '%s',// VNU_created
+            '%s', // VNU_name
+            '%s', // VNU_desc
+            '%s', // VNU_identifier
+            '%s', // VNU_created
             '%s',
-            '%s',// VNU_short_desc
-            '%s',// VNU_modified
+            '%s', // VNU_short_desc
+            '%s', // VNU_modified
             '%s',
-            '%d',// VNU_wp_user
-            '%d',// parent
-            '%d',// VNU_order
-            '%s',// post_type
+            '%d', // VNU_wp_user
+            '%d', // parent
+            '%d', // VNU_order
+            '%s', // post_type
         ];
-        $success          = $wpdb->insert(
+        $success = $wpdb->insert(
             $wpdb->posts,
             $insertion_array,
             $data_types_array
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -746,13 +746,13 @@ 
         // assume the country is the same as the organization's old settings
         $country_iso = $this->get_migration_script()->get_default_country_iso();
         // find the state from the venue, or the organization, or just guess california
-        if (! $old_event['state']) {
+        if ( ! $old_event['state']) {
             $old_org_options = get_option('events_organization_settings');
             $state_name      = stripslashes($old_org_options['organization_state']);
         } else {
             $state_name = $old_event['state'];
         }
-        if (! $state_name) {
+        if ( ! $state_name) {
             $state_name = 'CA';
         }
         // get a state ID with the same name, if possible
@@ -765,39 +765,39 @@ 
         }
         // now insert into meta table
         $insertion_array = [
-            'VNU_ID'              => $cpt_id,// VNU_ID_fk
-            'VNU_address'         => stripslashes($old_event['address']),// VNU_address
-            'VNU_address2'        => stripslashes($old_event['address2']),// VNU_address2
-            'VNU_city'            => stripslashes($old_event['city']),// VNU_city
-            'STA_ID'              => $state_id,// STA_ID
-            'CNT_ISO'             => $country_iso,// CNT_ISO
-            'VNU_zip'             => $old_event['zip'],// VNU_zip
-            'VNU_phone'           => $old_event['venue_phone'],// VNU_phone
-            'VNU_capacity'        => -1,// VNU_capacity
-            'VNU_url'             => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone'   => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'     => $old_event['virtual_url'],// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
+            'VNU_ID'              => $cpt_id, // VNU_ID_fk
+            'VNU_address'         => stripslashes($old_event['address']), // VNU_address
+            'VNU_address2'        => stripslashes($old_event['address2']), // VNU_address2
+            'VNU_city'            => stripslashes($old_event['city']), // VNU_city
+            'STA_ID'              => $state_id, // STA_ID
+            'CNT_ISO'             => $country_iso, // CNT_ISO
+            'VNU_zip'             => $old_event['zip'], // VNU_zip
+            'VNU_phone'           => $old_event['venue_phone'], // VNU_phone
+            'VNU_capacity'        => -1, // VNU_capacity
+            'VNU_url'             => $old_event['venue_url'], // VNU_url
+            'VNU_virtual_phone'   => $old_event['virtual_phone'], // VNU_virtual_phone
+            'VNU_virtual_url'     => $old_event['virtual_url'], // VNU_virtual_url
+            'VNU_google_map_link' => '', // VNU_google_map_link
             'VNU_enable_for_gmap' => true, // VNU_enable_for_gmap
         ];
-        $data_types      = [
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
+        $data_types = [
+            '%d', // VNU_ID_fk
+            '%s', // VNU_address
+            '%s', // VNU_address2
+            '%s', // VNU_city
+            '%d', // STA_ID
+            '%s', // CNT_ISO
+            '%s', // VNU_zip
+            '%s', // VNU_phone
+            '%d', // VNU_capacity
+            '%s', // VNU_url
+            '%s', // VNU_virtual_phone
+            '%s', // VNU_virtual_url
+            '%s', // VNU_google_map_link
+            '%d', // VNU_enable_for_gmap
         ];
-        $success         = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -819,13 +819,13 @@ 
     private function _insert_new_venue_to_event($new_event_id, $new_venue_id): void
     {
         global $wpdb;
-        if (! $new_event_id) {
+        if ( ! $new_event_id) {
             $this->add_error(
                 sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)
             );
             return;
         }
-        if (! $new_venue_id) {
+        if ( ! $new_venue_id) {
             $this->add_error(
                 sprintf(esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)
             );
@@ -836,13 +836,13 @@ 
             'VNU_ID'      => $new_venue_id,
             'EVV_primary' => true,
         ];
-        $data_types    = [
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
+        $data_types = [
+            '%d', // EVT_ID
+            '%d', // VNU_ID
+            '%d', // EVT_primary
         ];
-        $success       = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -922,14 +922,14 @@ 
                 "$start_date $start_time:00",
                 $old_event_row['timezone_string']
             );
-        $end_datetime_utc   =
+        $end_datetime_utc =
             $this->get_migration_script()->convert_date_string_to_utc(
                 $this,
                 $start_end_time_row,
                 "$end_date $end_time:00",
                 $old_event_row['timezone_string']
             );
-        $cols_n_values      = [
+        $cols_n_values = [
             'EVT_ID'        => $new_cpt_id,
             // EVT_ID
             'DTT_EVT_start' => $start_datetime_utc,
@@ -947,19 +947,19 @@ 
             'DTT_parent'    => 0,
             'DTT_deleted'   => false,
         ];
-        $data_types         = [
-            '%d',// EVT_Id
-            '%s',// DTT_EVT_start
-            '%s',// DTT_EVT_end
-            '%d',// DTT_reg_limit
-            '%d',// DTT_sold
+        $data_types = [
+            '%d', // EVT_Id
+            '%s', // DTT_EVT_start
+            '%s', // DTT_EVT_end
+            '%d', // DTT_reg_limit
+            '%d', // DTT_sold
             //          '%d',//DTT_is_primary
-            '%d',// DTT_order
-            '%d',// DTT_parent
-            '%d',// DTT_deleted
+            '%d', // DTT_order
+            '%d', // DTT_parent
+            '%d', // DTT_deleted
         ];
-        $success            = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_start_end_table,

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

Indentation +144 added lines, -144 removed lines

@@ -67,159 +67,159 @@
 class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage
 {
 
-    private string $_option_table;
+	private string $_option_table;
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name  = esc_html__("Questions", "event_espresso");
-        $this->_old_table    = $wpdb->prefix . "events_question";
-        $this->_new_table    = $wpdb->prefix . "esp_question";
-        $this->_option_table = $wpdb->prefix . "esp_question_option";
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name  = esc_html__("Questions", "event_espresso");
+		$this->_old_table    = $wpdb->prefix . "events_question";
+		$this->_new_table    = $wpdb->prefix . "esp_question";
+		$this->_option_table = $wpdb->prefix . "esp_question_option";
+		parent::__construct();
+	}
 
 
-    /**
-     * @throws EE_Error
-     */
-    public function _migration_step($num_items_to_migrate = 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_to_migrate),
-            ARRAY_A
-        );
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_row) {
-            $new_id = $this->_insert_new_question($question_row);
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $question_row['id'],
-                $this->_new_table,
-                $new_id
-            );
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	/**
+	 * @throws EE_Error
+	 */
+	public function _migration_step($num_items_to_migrate = 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_to_migrate),
+			ARRAY_A
+		);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_row) {
+			$new_id = $this->_insert_new_question($question_row);
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$question_row['id'],
+				$this->_new_table,
+				$new_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;
-        return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
-    }
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+	}
 
 
-    private function _insert_new_question($old_question): int
-    {
-        global $wpdb;
-        // if this pretends to be a 'system' question, check if we already have a
-        // system question for that string. If so, pretend THAT new question
-        // is what we just inserted
-        if ($old_question['system_name']) {
-            $id_of_new_system_question = intval(
-                $wpdb->get_var(
-                    $wpdb->prepare(
-                        "SELECT QST_ID FROM $this->_new_table WHERE QST_system = %s",
-                        $old_question['system_name']
-                    )
-                )
-            );
-            if ($id_of_new_system_question) {
-                return $id_of_new_system_question;
-            }
-            // ok so this must be the first one. Carry on.
-        }
+	private function _insert_new_question($old_question): int
+	{
+		global $wpdb;
+		// if this pretends to be a 'system' question, check if we already have a
+		// system question for that string. If so, pretend THAT new question
+		// is what we just inserted
+		if ($old_question['system_name']) {
+			$id_of_new_system_question = intval(
+				$wpdb->get_var(
+					$wpdb->prepare(
+						"SELECT QST_ID FROM $this->_new_table WHERE QST_system = %s",
+						$old_question['system_name']
+					)
+				)
+			);
+			if ($id_of_new_system_question) {
+				return $id_of_new_system_question;
+			}
+			// ok so this must be the first one. Carry on.
+		}
 
-        $cols_n_values = [
-            'QST_display_text'  => stripslashes($old_question['question']),
-            'QST_admin_label'   => $old_question['system_name'] ?: sanitize_title($old_question['question']),
-            'QST_system'        => (string) $old_question['system_name'],
-            'QST_type'          => $old_question['question_type'],
-            'QST_required'      => 'Y' == $old_question['required'],
-            'QST_required_text' => stripslashes($old_question['required_text']),
-            'QST_order'         => $old_question['sequence'],
-            'QST_admin_only'    => 'Y' == $old_question['admin_only'],
-            'QST_wp_user'       => $old_question['wp_user'],
-            'QST_deleted'       => false,
-        ];
-        $data_types    = [
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
-        ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_question,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        // now take care of possibly adding question options
-        if (in_array($old_question['question_type'], ['DROPDOWN', 'SINGLE', 'MULTIPLE'])) {
-            $options = explode(",", $old_question['response']);
-            foreach ($options as $option) {
-                $this->_insert_question_option($option, $new_id);
-            }
-        }
-        return $new_id;
-    }
+		$cols_n_values = [
+			'QST_display_text'  => stripslashes($old_question['question']),
+			'QST_admin_label'   => $old_question['system_name'] ?: sanitize_title($old_question['question']),
+			'QST_system'        => (string) $old_question['system_name'],
+			'QST_type'          => $old_question['question_type'],
+			'QST_required'      => 'Y' == $old_question['required'],
+			'QST_required_text' => stripslashes($old_question['required_text']),
+			'QST_order'         => $old_question['sequence'],
+			'QST_admin_only'    => 'Y' == $old_question['admin_only'],
+			'QST_wp_user'       => $old_question['wp_user'],
+			'QST_deleted'       => false,
+		];
+		$data_types    = [
+			'%s',// QST_display_text
+			'%s',// QST-admin_label
+			'%s',// QST_system
+			'%s',// QST_type
+			'%d',// QST_required
+			'%s',// QST_required_text
+			'%d',// QST_order
+			'%d',// QST_admin_only
+			'%d',// QST_wp_user
+			'%d',// QST_deleted
+		];
+		$success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_question,
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		// now take care of possibly adding question options
+		if (in_array($old_question['question_type'], ['DROPDOWN', 'SINGLE', 'MULTIPLE'])) {
+			$options = explode(",", $old_question['response']);
+			foreach ($options as $option) {
+				$this->_insert_question_option($option, $new_id);
+			}
+		}
+		return $new_id;
+	}
 
 
-    /**
-     * Adds a question option to the db
-     *
-     * @param string $option
-     * @param int    $question_id
-     * @return void
-     * @global wpdb  $wpdb
-     */
-    private function _insert_question_option(string $option, int $question_id): void
-    {
-        $option = trim($option);
-        global $wpdb;
-        $cols_n_values = [
-            'QST_ID'      => $question_id,
-            'QSO_value'   => $option,
-            'QSO_deleted' => false,
-        ];
-        $data_types    = [
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
-        ];
-        $success       = $wpdb->insert($this->_option_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    ['option' => $option, 'new_question_id' => $question_id],
-                    $this->_option_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
+	/**
+	 * Adds a question option to the db
+	 *
+	 * @param string $option
+	 * @param int    $question_id
+	 * @return void
+	 * @global wpdb  $wpdb
+	 */
+	private function _insert_question_option(string $option, int $question_id): void
+	{
+		$option = trim($option);
+		global $wpdb;
+		$cols_n_values = [
+			'QST_ID'      => $question_id,
+			'QSO_value'   => $option,
+			'QSO_deleted' => false,
+		];
+		$data_types    = [
+			'%d',// QST_ID
+			'%s',// QSO_value
+			'%d',// QSO_deleted
+		];
+		$success       = $wpdb->insert($this->_option_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					['option' => $option, 'new_question_id' => $question_id],
+					$this->_option_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -74,9 +74,9 @@ 
     {
         global $wpdb;
         $this->_pretty_name  = esc_html__("Questions", "event_espresso");
-        $this->_old_table    = $wpdb->prefix . "events_question";
-        $this->_new_table    = $wpdb->prefix . "esp_question";
-        $this->_option_table = $wpdb->prefix . "esp_question_option";
+        $this->_old_table    = $wpdb->prefix."events_question";
+        $this->_new_table    = $wpdb->prefix."esp_question";
+        $this->_option_table = $wpdb->prefix."esp_question_option";
         parent::__construct();
     }
 
@@ -113,7 +113,7 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        return $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
     }
 
 
@@ -150,20 +150,20 @@ 
             'QST_wp_user'       => $old_question['wp_user'],
             'QST_deleted'       => false,
         ];
-        $data_types    = [
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
+        $data_types = [
+            '%s', // QST_display_text
+            '%s', // QST-admin_label
+            '%s', // QST_system
+            '%s', // QST_type
+            '%d', // QST_required
+            '%s', // QST_required_text
+            '%d', // QST_order
+            '%d', // QST_admin_only
+            '%d', // QST_wp_user
+            '%d', // QST_deleted
         ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -204,13 +204,13 @@ 
             'QSO_value'   => $option,
             'QSO_deleted' => false,
         ];
-        $data_types    = [
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
+        $data_types = [
+            '%d', // QST_ID
+            '%s', // QSO_value
+            '%d', // QSO_deleted
         ];
-        $success       = $wpdb->insert($this->_option_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_option_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,