eventespresso / event-espresso-core

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

Indentation +231 added lines, -231 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -84,13 +84,13 @@ 
             $gateways_to_deal_with,
             $this->count_records_migrated(),
             $num_items_to_migrate
-        );// $this->_gateways_we_know_how_to_migrate;
+        ); // $this->_gateways_we_know_how_to_migrate;
         foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
             $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if (isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 // determine the old option's name
                 $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
+                if ( ! $old_gateway_settings) {
                     // no settings existed for this gateway anyways... weird...
                     $items_actually_migrated++;
                     continue;
@@ -101,7 +101,7 @@ 
                     $new_gateway_slug
                 );
 
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+                $new_gateway_config_obj->payment_settings[$new_gateway_slug] = $new_gateway_settings;
                 // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
                 // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
                 delete_option($old_gateway_wp_option_name);
@@ -111,7 +111,7 @@ 
                 // only be saving users 50 milliseconds the one time this runs...
                 $wpdb->query(
                     $wpdb->prepare(
-                        "UPDATE " . $wpdb->options . " SET autoload='no' WHERE option_name=%s",
+                        "UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s",
                         $old_gateway_wp_option_name
                     )
                 );
@@ -210,38 +210,38 @@ 
                 $this->_gateways_we_leave_alone
             )
         );
-        $old_gateway_slug         = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+        $old_gateway_slug         = $new_gateway_slugs_to_new[$new_gateway_slug];
         $normal_option_prefix     = 'event_espresso_';
         $normal_option_postfix    = '_settings';
         switch ($new_gateway_slug) {
             case 'Bank':
-                $option_name = $normal_option_prefix . 'bank_deposit' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
                 break;
             case 'Aim':
-                $option_name = $normal_option_prefix . 'authnet_aim' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
                 break;
             case 'Check':
-                $option_name = $normal_option_prefix . 'check_payment' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
                 break;
             case 'Ideal':
-                $option_name = $normal_option_prefix . 'ideal_mollie' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
                 break;
             case 'Invoice':
-                $option_name = $normal_option_prefix . 'invoice_payment' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
                 break;
             case 'Purchase_Order':
-                $option_name = $normal_option_prefix . 'purchase_order_payment' . $normal_option_postfix;
+                $option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
                 break;
             case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite' . $normal_option_postfix;
+                $option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
                 break;
             case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite' . $normal_option_postfix;
+                $option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
                 break;
             default:
                 $option_name = apply_filters(
                     'FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option',
-                    $normal_option_prefix . $old_gateway_slug . $normal_option_postfix
+                    $normal_option_prefix.$old_gateway_slug.$normal_option_postfix
                 );
         }
         return $option_name;
@@ -254,16 +254,16 @@ 
         $old_active_gateways = get_option('event_espresso_active_gateways');
         $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
         foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if ( ! isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 $this->add_error(
                     sprintf(esc_html__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug)
                 );
                 continue;
             }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[$old_gateway_slug];
 
             // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
+            $new_active_gateways[$new_gateway_slug] = false;
         }
         EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
     }

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

Indentation +76 added lines, -76 removed lines

@@ -8,86 +8,86 @@
 class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage
 {
 
-    private string $_new_term_table;
+	private string $_new_term_table;
 
 
-    /**
-     * @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 $category_detail_row) {
-            $term_and_taxonomy_ids = wp_insert_term(
-                stripslashes($category_detail_row['category_name']),
-                'espresso_event_categories',
-                [
-                    'description' => stripslashes($category_detail_row['category_desc']),
-                    'slug'        => $category_detail_row['category_identifier'],
-                ]
-            );
-            if ($term_and_taxonomy_ids instanceof WP_Error) {
-                $this->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not create WP Term_Taxonomy from old category: %s. The Error was: %s",
-                            "event_espresso"
-                        ),
-                        $this->_json_encode($category_detail_row),
-                        $term_and_taxonomy_ids->get_error_message()
-                    )
-                );
-                $items_actually_migrated++;
-                continue;
-            }
-            $term_id          = $term_and_taxonomy_ids['term_id'];
-            $term_taxonomy_id = $term_and_taxonomy_ids['term_taxonomy_id'];
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $category_detail_row['id'],
-                $this->_new_term_table,
-                $term_id
-            );
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $category_detail_row['id'],
-                $this->_new_table,
-                $term_taxonomy_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 $category_detail_row) {
+			$term_and_taxonomy_ids = wp_insert_term(
+				stripslashes($category_detail_row['category_name']),
+				'espresso_event_categories',
+				[
+					'description' => stripslashes($category_detail_row['category_desc']),
+					'slug'        => $category_detail_row['category_identifier'],
+				]
+			);
+			if ($term_and_taxonomy_ids instanceof WP_Error) {
+				$this->add_error(
+					sprintf(
+						esc_html__(
+							"Could not create WP Term_Taxonomy from old category: %s. The Error was: %s",
+							"event_espresso"
+						),
+						$this->_json_encode($category_detail_row),
+						$term_and_taxonomy_ids->get_error_message()
+					)
+				);
+				$items_actually_migrated++;
+				continue;
+			}
+			$term_id          = $term_and_taxonomy_ids['term_id'];
+			$term_taxonomy_id = $term_and_taxonomy_ids['term_taxonomy_id'];
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$category_detail_row['id'],
+				$this->_new_term_table,
+				$term_id
+			);
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$category_detail_row['id'],
+				$this->_new_table,
+				$term_taxonomy_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");
+	}
 
 
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__("Category Details", "event_espresso");
-        global $wpdb;
-        $this->_old_table      = $wpdb->prefix . "events_category_detail";
-        $this->_new_table      = $wpdb->prefix . "term_taxonomy";
-        $this->_new_term_table = $wpdb->prefix . "terms";
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__("Category Details", "event_espresso");
+		global $wpdb;
+		$this->_old_table      = $wpdb->prefix . "events_category_detail";
+		$this->_new_table      = $wpdb->prefix . "term_taxonomy";
+		$this->_new_term_table = $wpdb->prefix . "terms";
+		parent::__construct();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -85,9 +85,9 @@
     {
         $this->_pretty_name = esc_html__("Category Details", "event_espresso");
         global $wpdb;
-        $this->_old_table      = $wpdb->prefix . "events_category_detail";
-        $this->_new_table      = $wpdb->prefix . "term_taxonomy";
-        $this->_new_term_table = $wpdb->prefix . "terms";
+        $this->_old_table      = $wpdb->prefix."events_category_detail";
+        $this->_new_table      = $wpdb->prefix."term_taxonomy";
+        $this->_new_term_table = $wpdb->prefix."terms";
         parent::__construct();
     }
 }

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

Indentation +226 added lines, -226 removed lines

@@ -45,251 +45,251 @@
 class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table
 {
 
-    private string $_new_line_table;
+	private string $_new_line_table;
 
-    private string $_new_transaction_table;
+	private string $_new_transaction_table;
 
-    private string $_new_reg_table;
+	private string $_new_reg_table;
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name           = esc_html__("Line Items", "event_espresso");
-        $this->_old_table             = $wpdb->prefix . "events_attendee";
-        $this->select_expression      = 'att.*, e.event_status';
-        $this->_extra_where_sql       = ' AS att
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name           = esc_html__("Line Items", "event_espresso");
+		$this->_old_table             = $wpdb->prefix . "events_attendee";
+		$this->select_expression      = 'att.*, e.event_status';
+		$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->_new_transaction_table = $wpdb->prefix . "esp_transaction";
-        $this->_new_line_table        = $wpdb->prefix . "esp_line_item";
-        $this->_new_reg_table         = $wpdb->prefix . "esp_registration";
-        parent::__construct();
-    }
+		$this->_new_transaction_table = $wpdb->prefix . "esp_transaction";
+		$this->_new_line_table        = $wpdb->prefix . "esp_line_item";
+		$this->_new_reg_table         = $wpdb->prefix . "esp_registration";
+		parent::__construct();
+	}
 
 
-    /**
-     * @throws EE_Error
-     */
-    protected function _migrate_old_row($old_row)
-    {
-        // insert line items if its a primary id
-        if ((int) $old_row['is_primary']) {
-            $txn_id = (int) $this->get_migration_script()->get_mapping_new_pk(
-                $this->_old_table,
-                $old_row['id'],
-                $this->_new_transaction_table
-            );
-            if (! $txn_id) {
-                $this->add_error(
-                    sprintf(
-                        esc_html__(
-                            "Could not find the transaction for the 3.1 attendee %d from row %s",
-                            "event_espresso"
-                        ),
-                        $old_row['id'],
-                        $this->_json_encode($old_row)
-                    )
-                );
-                return;
-            }
-            $txn            = $this->_get_txn($txn_id);
-            $new_line_items = $this->_insert_new_line_items($txn, $old_row);
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $old_row['id'],
-                $this->_new_line_table,
-                $new_line_items
-            );
-        }
-    }
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _migrate_old_row($old_row)
+	{
+		// insert line items if its a primary id
+		if ((int) $old_row['is_primary']) {
+			$txn_id = (int) $this->get_migration_script()->get_mapping_new_pk(
+				$this->_old_table,
+				$old_row['id'],
+				$this->_new_transaction_table
+			);
+			if (! $txn_id) {
+				$this->add_error(
+					sprintf(
+						esc_html__(
+							"Could not find the transaction for the 3.1 attendee %d from row %s",
+							"event_espresso"
+						),
+						$old_row['id'],
+						$this->_json_encode($old_row)
+					)
+				);
+				return;
+			}
+			$txn            = $this->_get_txn($txn_id);
+			$new_line_items = $this->_insert_new_line_items($txn, $old_row);
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$old_row['id'],
+				$this->_new_line_table,
+				$new_line_items
+			);
+		}
+	}
 
 
-    private function _get_txn(int $txn_id)
-    {
-        global $wpdb;
-        return $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d",
-                $txn_id
-            ),
-            ARRAY_A
-        );
-    }
+	private function _get_txn(int $txn_id)
+	{
+		global $wpdb;
+		return $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d",
+				$txn_id
+			),
+			ARRAY_A
+		);
+	}
 
 
-    /**
-     * In 4.1, we'd normally need more info than just the registrations to make the line items. Ie, we'd need
-     * the transaction, and tax prices at the time of registration. (And probably promotions and other price factors).
-     * But seeing how these are REGs created from 3.1 attendee data, which have
-     *
-     * @param array $transaction
-     * @param array $old_attendee
-     * @return array new line item ids
-     */
-    private function _insert_new_line_items(array $transaction, array $old_attendee): array
-    {
-        global $wpdb;
-        $regs_on_this_transaction = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT * FROM $this->_new_reg_table WHERE TXN_ID=%d",
-                $transaction['TXN_ID']
-            ),
-            ARRAY_A
-        );
-        $new_line_item_ids        = [];
-        // create a total ine item
-        $total_line_item_id  = $this->_insert_new_line_item(
-            [
-                'LIN_code'  => 'total',
-                'TXN_ID'    => $transaction['TXN_ID'],
-                'LIN_name'  => esc_html__(
-                    "Total",
-                    "event_espresso"
-                ),
-                'LIN_total' => $transaction['TXN_total'],
-                'LIN_type'  => 'total',
-                'OBJ_ID'    => $transaction['TXN_ID'],
-                'OBJ_type'  => 'Transaction',
-            ],
-            $old_attendee
-        );
-        $new_line_item_ids[] = $total_line_item_id;
-        // create a subtotal line item
-        $reg_total = 0;
-        foreach ($regs_on_this_transaction as $new_reg) {
-            $reg_total += floatval($new_reg['REG_final_price']);
-        }
-        $subtotal_line_item_id = $this->_insert_new_line_item(
-            [
-                'LIN_code'   => 'sub-total',
-                'TXN_ID'     => $transaction['TXN_ID'],
-                'LIN_name'   => esc_html__(
-                    "Subtotal",
-                    "event_espresso"
-                ),
-                'LIN_total'  => $reg_total,
-                'LIN_parent' => $total_line_item_id,
-                'LIN_type'   => 'sub-total',
-            ],
-            $old_attendee
-        );
-        $new_line_item_ids[]   = $subtotal_line_item_id;
-        // group REGs by TKT_ID
-        $regs_by_tkt = [];
-        foreach ($regs_on_this_transaction as $new_reg) {
-            $regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
-        }
+	/**
+	 * In 4.1, we'd normally need more info than just the registrations to make the line items. Ie, we'd need
+	 * the transaction, and tax prices at the time of registration. (And probably promotions and other price factors).
+	 * But seeing how these are REGs created from 3.1 attendee data, which have
+	 *
+	 * @param array $transaction
+	 * @param array $old_attendee
+	 * @return array new line item ids
+	 */
+	private function _insert_new_line_items(array $transaction, array $old_attendee): array
+	{
+		global $wpdb;
+		$regs_on_this_transaction = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT * FROM $this->_new_reg_table WHERE TXN_ID=%d",
+				$transaction['TXN_ID']
+			),
+			ARRAY_A
+		);
+		$new_line_item_ids        = [];
+		// create a total ine item
+		$total_line_item_id  = $this->_insert_new_line_item(
+			[
+				'LIN_code'  => 'total',
+				'TXN_ID'    => $transaction['TXN_ID'],
+				'LIN_name'  => esc_html__(
+					"Total",
+					"event_espresso"
+				),
+				'LIN_total' => $transaction['TXN_total'],
+				'LIN_type'  => 'total',
+				'OBJ_ID'    => $transaction['TXN_ID'],
+				'OBJ_type'  => 'Transaction',
+			],
+			$old_attendee
+		);
+		$new_line_item_ids[] = $total_line_item_id;
+		// create a subtotal line item
+		$reg_total = 0;
+		foreach ($regs_on_this_transaction as $new_reg) {
+			$reg_total += floatval($new_reg['REG_final_price']);
+		}
+		$subtotal_line_item_id = $this->_insert_new_line_item(
+			[
+				'LIN_code'   => 'sub-total',
+				'TXN_ID'     => $transaction['TXN_ID'],
+				'LIN_name'   => esc_html__(
+					"Subtotal",
+					"event_espresso"
+				),
+				'LIN_total'  => $reg_total,
+				'LIN_parent' => $total_line_item_id,
+				'LIN_type'   => 'sub-total',
+			],
+			$old_attendee
+		);
+		$new_line_item_ids[]   = $subtotal_line_item_id;
+		// group REGs by TKT_ID
+		$regs_by_tkt = [];
+		foreach ($regs_on_this_transaction as $new_reg) {
+			$regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
+		}
 
-        // create individual line items
+		// create individual line items
 
-        foreach ($regs_by_tkt as $ticket_id => $regs) {
-            $count      = count($regs);
-            $line_total = 0;
-            foreach ($regs as $new_reg) {
-                $line_total += $new_reg['REG_final_price'];
-            }
-            $a_reg               = reset($regs);
-            $new_ticket          = $this->_get_new_ticket_row($a_reg['TKT_ID']);
-            $reg_line_item_id    = $this->_insert_new_line_item(
-                [
-                    'LIN_code'       => md5(
-                        'Ticket' . $ticket_id . time()
-                    ),
-                    'TXN_ID'         => $transaction['TXN_ID'],
-                    'LIN_name'       => $new_ticket['TKT_name'],
-                    'LIN_unit_price' => $a_reg['REG_final_price'],
-                    'LIN_is_taxable' => false,
-                    'LIN_total'      => $line_total,
-                    'LIN_quantity'   => $count,
-                    'LIN_parent'     => $subtotal_line_item_id,
-                    'OBJ_ID'         => $ticket_id,
-                    'OBJ_type'       => 'Ticket',
-                ],
-                $old_attendee
-            );
-            $new_line_item_ids[] = $reg_line_item_id;
-        }
+		foreach ($regs_by_tkt as $ticket_id => $regs) {
+			$count      = count($regs);
+			$line_total = 0;
+			foreach ($regs as $new_reg) {
+				$line_total += $new_reg['REG_final_price'];
+			}
+			$a_reg               = reset($regs);
+			$new_ticket          = $this->_get_new_ticket_row($a_reg['TKT_ID']);
+			$reg_line_item_id    = $this->_insert_new_line_item(
+				[
+					'LIN_code'       => md5(
+						'Ticket' . $ticket_id . time()
+					),
+					'TXN_ID'         => $transaction['TXN_ID'],
+					'LIN_name'       => $new_ticket['TKT_name'],
+					'LIN_unit_price' => $a_reg['REG_final_price'],
+					'LIN_is_taxable' => false,
+					'LIN_total'      => $line_total,
+					'LIN_quantity'   => $count,
+					'LIN_parent'     => $subtotal_line_item_id,
+					'OBJ_ID'         => $ticket_id,
+					'OBJ_type'       => 'Ticket',
+				],
+				$old_attendee
+			);
+			$new_line_item_ids[] = $reg_line_item_id;
+		}
 
 
-        return $new_line_item_ids;
-    }
+		return $new_line_item_ids;
+	}
 
 
-    /**
-     * Gets the full ticket by ID
-     *
-     * @param int   $new_ticket_id
-     * @return array
-     * @global wpdb $wpdb
-     */
-    private function _get_new_ticket_row(int $new_ticket_id): array
-    {
-        global $wpdb;
-        return $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT * FROM {$wpdb->prefix}esp_ticket WHERE TKT_ID=%d",
-                $new_ticket_id
-            ),
-            ARRAY_A
-        );
-    }
+	/**
+	 * Gets the full ticket by ID
+	 *
+	 * @param int   $new_ticket_id
+	 * @return array
+	 * @global wpdb $wpdb
+	 */
+	private function _get_new_ticket_row(int $new_ticket_id): array
+	{
+		global $wpdb;
+		return $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT * FROM {$wpdb->prefix}esp_ticket WHERE TKT_ID=%d",
+				$new_ticket_id
+			),
+			ARRAY_A
+		);
+	}
 
 
-    private function _insert_new_line_item(array $cols_n_values, array $old_attendee): int
-    {
-        global $wpdb;
-        $default_cols_n_values = [
-            'LIN_code'       => '',
-            'TXN_ID'         => 0,
-            'LIN_name'       => '',
-            'LIN_desc'       => '',
-            'LIN_unit_price' => 0,
-            'LIN_percent'    => 0,
-            'LIN_is_taxable' => false,
-            'LIN_order'      => 0,
-            'LIN_total'      => 0,
-            'LIN_quantity'   => null,
-            'LIN_parent'     => 0,
-            'LIN_type'       => 'line-item',
-            'OBJ_ID'         => null,
-            'OBJ_type'       => null,
-        ];
-        $cols_n_values         = array_merge($default_cols_n_values, $cols_n_values);
-        $data_types            = [
-            '%s',// LIN_code
-            '%d',// TXN_ID
-            '%s',// LIN_name
-            '%s',// LIN_desc
-            '%f',// LIN_unit_price
-            '%f',// LIN_percent
-            '%d',// LIN_is_taxable
-            '%d',// LIN_order
-            '%f',// LIN_total
-            '%d',// LIN_quantity
-            '%d',// LIN_parent
-            '%s',// LIN_type
-            '%d',// OBJ_ID
-            '%s',// OBJ_type
-        ];
+	private function _insert_new_line_item(array $cols_n_values, array $old_attendee): int
+	{
+		global $wpdb;
+		$default_cols_n_values = [
+			'LIN_code'       => '',
+			'TXN_ID'         => 0,
+			'LIN_name'       => '',
+			'LIN_desc'       => '',
+			'LIN_unit_price' => 0,
+			'LIN_percent'    => 0,
+			'LIN_is_taxable' => false,
+			'LIN_order'      => 0,
+			'LIN_total'      => 0,
+			'LIN_quantity'   => null,
+			'LIN_parent'     => 0,
+			'LIN_type'       => 'line-item',
+			'OBJ_ID'         => null,
+			'OBJ_type'       => null,
+		];
+		$cols_n_values         = array_merge($default_cols_n_values, $cols_n_values);
+		$data_types            = [
+			'%s',// LIN_code
+			'%d',// TXN_ID
+			'%s',// LIN_name
+			'%s',// LIN_desc
+			'%f',// LIN_unit_price
+			'%f',// LIN_percent
+			'%d',// LIN_is_taxable
+			'%d',// LIN_order
+			'%f',// LIN_total
+			'%d',// LIN_quantity
+			'%d',// LIN_parent
+			'%s',// LIN_type
+			'%d',// OBJ_ID
+			'%s',// OBJ_type
+		];
 
-        $success = $wpdb->insert(
-            $this->_new_line_table,
-            $cols_n_values,
-            $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 0;
-        }
-        return $wpdb->insert_id;
-    }
+		$success = $wpdb->insert(
+			$this->_new_line_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 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +26 added lines, -26 removed lines

@@ -56,14 +56,14 @@ 
     {
         global $wpdb;
         $this->_pretty_name           = esc_html__("Line Items", "event_espresso");
-        $this->_old_table             = $wpdb->prefix . "events_attendee";
+        $this->_old_table             = $wpdb->prefix."events_attendee";
         $this->select_expression      = 'att.*, e.event_status';
         $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->_new_transaction_table = $wpdb->prefix . "esp_transaction";
-        $this->_new_line_table        = $wpdb->prefix . "esp_line_item";
-        $this->_new_reg_table         = $wpdb->prefix . "esp_registration";
+        $this->_new_transaction_table = $wpdb->prefix."esp_transaction";
+        $this->_new_line_table        = $wpdb->prefix."esp_line_item";
+        $this->_new_reg_table         = $wpdb->prefix."esp_registration";
         parent::__construct();
     }
 
@@ -80,7 +80,7 @@ 
                 $old_row['id'],
                 $this->_new_transaction_table
             );
-            if (! $txn_id) {
+            if ( ! $txn_id) {
                 $this->add_error(
                     sprintf(
                         esc_html__(
@@ -137,9 +137,9 @@ 
             ),
             ARRAY_A
         );
-        $new_line_item_ids        = [];
+        $new_line_item_ids = [];
         // create a total ine item
-        $total_line_item_id  = $this->_insert_new_line_item(
+        $total_line_item_id = $this->_insert_new_line_item(
             [
                 'LIN_code'  => 'total',
                 'TXN_ID'    => $transaction['TXN_ID'],
@@ -174,11 +174,11 @@ 
             ],
             $old_attendee
         );
-        $new_line_item_ids[]   = $subtotal_line_item_id;
+        $new_line_item_ids[] = $subtotal_line_item_id;
         // group REGs by TKT_ID
         $regs_by_tkt = [];
         foreach ($regs_on_this_transaction as $new_reg) {
-            $regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
+            $regs_by_tkt[$new_reg['TKT_ID']][] = $new_reg;
         }
 
         // create individual line items
@@ -194,7 +194,7 @@ 
             $reg_line_item_id    = $this->_insert_new_line_item(
                 [
                     'LIN_code'       => md5(
-                        'Ticket' . $ticket_id . time()
+                        'Ticket'.$ticket_id.time()
                     ),
                     'TXN_ID'         => $transaction['TXN_ID'],
                     'LIN_name'       => $new_ticket['TKT_name'],
@@ -257,20 +257,20 @@ 
         ];
         $cols_n_values         = array_merge($default_cols_n_values, $cols_n_values);
         $data_types            = [
-            '%s',// LIN_code
-            '%d',// TXN_ID
-            '%s',// LIN_name
-            '%s',// LIN_desc
-            '%f',// LIN_unit_price
-            '%f',// LIN_percent
-            '%d',// LIN_is_taxable
-            '%d',// LIN_order
-            '%f',// LIN_total
-            '%d',// LIN_quantity
-            '%d',// LIN_parent
-            '%s',// LIN_type
-            '%d',// OBJ_ID
-            '%s',// OBJ_type
+            '%s', // LIN_code
+            '%d', // TXN_ID
+            '%s', // LIN_name
+            '%s', // LIN_desc
+            '%f', // LIN_unit_price
+            '%f', // LIN_percent
+            '%d', // LIN_is_taxable
+            '%d', // LIN_order
+            '%f', // LIN_total
+            '%d', // LIN_quantity
+            '%d', // LIN_parent
+            '%s', // LIN_type
+            '%d', // OBJ_ID
+            '%s', // OBJ_type
         ];
 
         $success = $wpdb->insert(
@@ -278,7 +278,7 @@ 
             $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,

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

Indentation +140 added lines, -140 removed lines

@@ -46,155 +46,155 @@
 class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage
 {
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table   = $wpdb->prefix . "events_qst_group";
-        $this->_new_table   = $wpdb->prefix . "esp_question_group";
-        $this->_pretty_name = esc_html__("Question Groups", "event_espresso");
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table   = $wpdb->prefix . "events_qst_group";
+		$this->_new_table   = $wpdb->prefix . "esp_question_group";
+		$this->_pretty_name = esc_html__("Question Groups", "event_espresso");
+		parent::__construct();
+	}
 
 
-    /**
-     * Keeps track of whether we've already added a system question group,
-     * in order to avoid adding more than 1 (basically, in 3.1 this would happen
-     * with the Roles & Permissions addon, because each user had their own set of
-     * question groups and questions),
-     *
-     * @var boolean
-     */
-    private bool $_already_got_system_question_group_1 = false;
+	/**
+	 * Keeps track of whether we've already added a system question group,
+	 * in order to avoid adding more than 1 (basically, in 3.1 this would happen
+	 * with the Roles & Permissions addon, because each user had their own set of
+	 * question groups and questions),
+	 *
+	 * @var boolean
+	 */
+	private bool $_already_got_system_question_group_1 = false;
 
 
-    /**
-     * @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_group) {
-            $new_id = $this->_insert_new_question_group($question_group);
+	/**
+	 * @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_group) {
+			$new_id = $this->_insert_new_question_group($question_group);
 
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $question_group['id'],
-                $this->_new_table,
-                $new_id
-            );
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$question_group['id'],
+				$this->_new_table,
+				$new_id
+			);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$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);
+	}
 
 
-    /**
-     * Attempts to insert a new question group in the new format given an old one
-     *
-     * @param array $old_question_group
-     * @return int
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_question_group(array $old_question_group): int
-    {
-        global $wpdb;
-        // try to guess what the QST_system int should be...
-        // finding the Personal info system question group is quite easy.
-        // But in 3.1 address info WASN'T a system group,
-        // it just existed by default but could be easily removed.
-        if (
-            $old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()
-        ) {
-            $guess_at_system_number = 1;
-        } elseif (
-            $old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== false
-        ) {
-            $guess_at_system_number = 2;
-        } else {
-            $guess_at_system_number = 0;
-        }
-        // if the question group wasn't made by the normal admin,
-        // we'd like to keep track of who made it
-        if ((int) $old_question_group['wp_user'] !== 1) {
-            $username   = $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT user_nicename FROM " . $wpdb->users . " WHERE ID = %d",
-                    $old_question_group['wp_user']
-                )
-            );
-            $identifier = $old_question_group['group_identifier'] . "-by-" . $username;
-        } else {
-            $identifier = $old_question_group['group_identifier'];
-        }
-        $cols_n_values = [
-            'QSG_name'            => stripslashes($old_question_group['group_name']),
-            'QSG_identifier'      => $identifier,
-            'QSG_desc'            => stripslashes($old_question_group['group_description']),
-            'QSG_order'           => $old_question_group['group_order'],
-            'QSG_show_group_name' => $old_question_group['show_group_name'],
-            'QSG_show_group_desc' => $old_question_group['show_group_description'],
-            'QSG_system'          => $guess_at_system_number,
-            'QSG_deleted'         => false,
-        ];
-        $data_types    = [
-            '%s',// QSG_name
-            '%s',// QSG_identifier
-            '%s',// QSG_desc
-            '%d',// QSG_order
-            '%d',// QSG_show_group_name
-            '%d',// QSG_show_group_desc
-            '%d',// QSG_system
-            '%d',// QSG_deleted
-        ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_question_group,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Attempts to insert a new question group in the new format given an old one
+	 *
+	 * @param array $old_question_group
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_question_group(array $old_question_group): int
+	{
+		global $wpdb;
+		// try to guess what the QST_system int should be...
+		// finding the Personal info system question group is quite easy.
+		// But in 3.1 address info WASN'T a system group,
+		// it just existed by default but could be easily removed.
+		if (
+			$old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()
+		) {
+			$guess_at_system_number = 1;
+		} elseif (
+			$old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== false
+		) {
+			$guess_at_system_number = 2;
+		} else {
+			$guess_at_system_number = 0;
+		}
+		// if the question group wasn't made by the normal admin,
+		// we'd like to keep track of who made it
+		if ((int) $old_question_group['wp_user'] !== 1) {
+			$username   = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT user_nicename FROM " . $wpdb->users . " WHERE ID = %d",
+					$old_question_group['wp_user']
+				)
+			);
+			$identifier = $old_question_group['group_identifier'] . "-by-" . $username;
+		} else {
+			$identifier = $old_question_group['group_identifier'];
+		}
+		$cols_n_values = [
+			'QSG_name'            => stripslashes($old_question_group['group_name']),
+			'QSG_identifier'      => $identifier,
+			'QSG_desc'            => stripslashes($old_question_group['group_description']),
+			'QSG_order'           => $old_question_group['group_order'],
+			'QSG_show_group_name' => $old_question_group['show_group_name'],
+			'QSG_show_group_desc' => $old_question_group['show_group_description'],
+			'QSG_system'          => $guess_at_system_number,
+			'QSG_deleted'         => false,
+		];
+		$data_types    = [
+			'%s',// QSG_name
+			'%s',// QSG_identifier
+			'%s',// QSG_desc
+			'%d',// QSG_order
+			'%d',// QSG_show_group_name
+			'%d',// QSG_show_group_desc
+			'%d',// QSG_system
+			'%d',// QSG_deleted
+		];
+		$success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_question_group,
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 
 
-    /**
-     * Checks if we've already added a system question 1 to the new question groups table
-     *
-     * @return boolean
-     * @global wpdb $wpdb
-     */
-    private function _already_got_system_question_group_1(): bool
-    {
-        if (! $this->_already_got_system_question_group_1) {
-            // check the db
-            global $wpdb;
-            $exists = $wpdb->get_var("SELECT COUNT(*) FROM $this->_new_table WHERE QSG_system=1");
-            if (intval($exists) > 0) {
-                $this->_already_got_system_question_group_1 = true;
-            }
-        }
-        return $this->_already_got_system_question_group_1;
-    }
+	/**
+	 * Checks if we've already added a system question 1 to the new question groups table
+	 *
+	 * @return boolean
+	 * @global wpdb $wpdb
+	 */
+	private function _already_got_system_question_group_1(): bool
+	{
+		if (! $this->_already_got_system_question_group_1) {
+			// check the db
+			global $wpdb;
+			$exists = $wpdb->get_var("SELECT COUNT(*) FROM $this->_new_table WHERE QSG_system=1");
+			if (intval($exists) > 0) {
+				$this->_already_got_system_question_group_1 = true;
+			}
+		}
+		return $this->_already_got_system_question_group_1;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -49,8 +49,8 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table   = $wpdb->prefix . "events_qst_group";
-        $this->_new_table   = $wpdb->prefix . "esp_question_group";
+        $this->_old_table   = $wpdb->prefix."events_qst_group";
+        $this->_new_table   = $wpdb->prefix."esp_question_group";
         $this->_pretty_name = esc_html__("Question Groups", "event_espresso");
         parent::__construct();
     }
@@ -100,7 +100,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);
     }
 
 
@@ -132,13 +132,13 @@ 
         // if the question group wasn't made by the normal admin,
         // we'd like to keep track of who made it
         if ((int) $old_question_group['wp_user'] !== 1) {
-            $username   = $wpdb->get_var(
+            $username = $wpdb->get_var(
                 $wpdb->prepare(
-                    "SELECT user_nicename FROM " . $wpdb->users . " WHERE ID = %d",
+                    "SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",
                     $old_question_group['wp_user']
                 )
             );
-            $identifier = $old_question_group['group_identifier'] . "-by-" . $username;
+            $identifier = $old_question_group['group_identifier']."-by-".$username;
         } else {
             $identifier = $old_question_group['group_identifier'];
         }
@@ -152,18 +152,18 @@ 
             'QSG_system'          => $guess_at_system_number,
             'QSG_deleted'         => false,
         ];
-        $data_types    = [
-            '%s',// QSG_name
-            '%s',// QSG_identifier
-            '%s',// QSG_desc
-            '%d',// QSG_order
-            '%d',// QSG_show_group_name
-            '%d',// QSG_show_group_desc
-            '%d',// QSG_system
-            '%d',// QSG_deleted
+        $data_types = [
+            '%s', // QSG_name
+            '%s', // QSG_identifier
+            '%s', // QSG_desc
+            '%d', // QSG_order
+            '%d', // QSG_show_group_name
+            '%d', // QSG_show_group_desc
+            '%d', // QSG_system
+            '%d', // QSG_deleted
         ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $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,
@@ -187,7 +187,7 @@ 
      */
     private function _already_got_system_question_group_1(): bool
     {
-        if (! $this->_already_got_system_question_group_1) {
+        if ( ! $this->_already_got_system_question_group_1) {
             // check the db
             global $wpdb;
             $exists = $wpdb->get_var("SELECT COUNT(*) FROM $this->_new_table WHERE QSG_system=1");

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

Indentation +305 added lines, -305 removed lines

@@ -90,322 +90,322 @@
 class EE_DMS_4_1_0_org_options extends EE_Data_Migration_Script_Stage
 {
 
-    public function __construct()
-    {
-        $this->_pretty_name                        = esc_html__("Organization Options/Config", "event_espresso");
-        $this->_org_options_we_know_how_to_migrate = apply_filters(
-            'FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate',
-            $this->_org_options_we_know_how_to_migrate
-        );
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->_pretty_name                        = esc_html__("Organization Options/Config", "event_espresso");
+		$this->_org_options_we_know_how_to_migrate = apply_filters(
+			'FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate',
+			$this->_org_options_we_know_how_to_migrate
+		);
+		parent::__construct();
+	}
 
 
-    public function _migration_step($num_items_to_migrate = 50)
-    {
-        $items_actually_migrated = 0;
-        $old_org_options         = get_option('events_organization_settings');
-        foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
-            // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
-            }
-            if ($option_name == 'surcharge') {
-                $this->_insert_new_global_surcharge_price($old_org_options);
-            }
-            $items_actually_migrated++;
-        }
+	public function _migration_step($num_items_to_migrate = 50)
+	{
+		$items_actually_migrated = 0;
+		$old_org_options         = get_option('events_organization_settings');
+		foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
+			// only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
+			if (isset($old_org_options[ $option_name ])) {
+				$this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+			}
+			if ($option_name == 'surcharge') {
+				$this->_insert_new_global_surcharge_price($old_org_options);
+			}
+			$items_actually_migrated++;
+		}
 
-        $success = EE_Config::instance()->update_espresso_config();
-        if (! $success) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'),
-                    EE_Error::get_notices(false)
-                )
-            );
-            EE_Error::overwrite_errors();
-        }
-        EE_Network_Config::instance()->update_config(false, false);
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            // we may have added new pages and this might be necessary
-            flush_rewrite_rules();
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+		$success = EE_Config::instance()->update_espresso_config();
+		if (! $success) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'),
+					EE_Error::get_notices(false)
+				)
+			);
+			EE_Error::overwrite_errors();
+		}
+		EE_Network_Config::instance()->update_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			// we may have added new pages and this might be necessary
+			flush_rewrite_rules();
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
 
-    public function _count_records_to_migrate(): int
-    {
-        return (int) count($this->_org_options_we_know_how_to_migrate);
-    }
+	public function _count_records_to_migrate(): int
+	{
+		return (int) count($this->_org_options_we_know_how_to_migrate);
+	}
 
 
-    private function _handle_org_option($option_name, $value)
-    {
-        $c  = EE_Config::instance();
-        $cn = EE_Network_Config::instance();
-        switch ($option_name) {
-            case 'organization':
-                $c->organization->name = $value;
-                break;
-            case 'organization_street1':
-                $c->organization->address_1 = $value;
-                break;
-            case 'organization_street2':
-                $c->organization->address_2 = $value;
-                break;
-            case 'organization_city':
-                $c->organization->city = $value;
-                break;
-            case 'organization_state':
-                try {
-                    $state                   = $this->get_migration_script()->get_or_create_state($value);
-                    $state_id                = $state['STA_ID'];
-                    $c->organization->STA_ID = $state_id;
-                } catch (EE_Error $e) {
-                }
-                break;
-            case 'organization_zip':
-                $c->organization->zip = $value;
-                break;
-            case 'contact_email':
-                $c->organization->email = $value;
-                break;
-            case 'default_payment_status':
-                $c->registration->default_STS_ID =
-                    $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
-                break;
-            case 'organization_country':
-                $iso                      = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
-                $c->organization->CNT_ISO = $iso;
-                $country_row              = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
-                    $this->add_error(
-                        sprintf(
-                            esc_html__(
-                                "Could not set country's currency config because no country exists for ISO %s",
-                                "event_espresso"
-                            ),
-                            $iso
-                        )
-                    );
-                }
-                // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code    = $country_row['CNT_cur_code'];             // currency code: USD, CAD, EUR
-                $c->currency->name    = $country_row['CNT_cur_single'];           // Dollar
-                $c->currency->plural  = $country_row['CNT_cur_plural'];           // Dollars
-                $c->currency->sign    = $country_row['CNT_cur_sign'];             // currency sign: $
-                $c->currency->sign_b4 = filter_var(
-                    $country_row['CNT_cur_sign_b4'],
-                    FILTER_VALIDATE_BOOLEAN
-                );                                                                // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
-                $c->currency->dec_mrk =
-                    $country_row['CNT_cur_dec_mrk'];                              // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-                $c->currency->thsnds  = $country_row['CNT_cur_thsnds'];
-                break;  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
-            //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
-            //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
-            //            $c->currency->sign = $value;break;
-            case 'show_pending_payment_options':
-                $c->registration->show_pending_payment_options = ($value == 'Y');
-                break;
-            case 'display_address_in_regform':
-                $c->template_settings->display_address_in_regform = ($value == 'Y');
-                break;
-            case 'default_logo_url':
-                $c->organization->logo_url = $value;
-                break;
-            case 'event_page_id':
-                // also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
-                // to ESPRESSO_THANK_YOU
-                $reg_page_post               = get_post($value);
-                $reg_page_post->post_content = str_replace(
-                    "[ESPRESSO_EVENTS]",
-                    "[ESPRESSO_CHECKOUT]",
-                    $reg_page_post->post_content
-                );
-                wp_update_post($reg_page_post);
-                $c->core->reg_page_id = $value;
-                break;
-            case 'return_url':
-                // also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
-                // to ESPRESSO_THANK_YOU
-                $thank_you_page_post               = get_post($value);
-                $thank_you_page_post->post_content = str_replace(
-                    "[ESPRESSO_PAYMENTS]",
-                    "[ESPRESSO_THANK_YOU]",
-                    $thank_you_page_post->post_content
-                );
-                wp_update_post($thank_you_page_post);
-                $c->core->thank_you_page_id = $value;
-                break;
-            case 'cancel_return':
-                $c->core->cancel_page_id = $value;
+	private function _handle_org_option($option_name, $value)
+	{
+		$c  = EE_Config::instance();
+		$cn = EE_Network_Config::instance();
+		switch ($option_name) {
+			case 'organization':
+				$c->organization->name = $value;
+				break;
+			case 'organization_street1':
+				$c->organization->address_1 = $value;
+				break;
+			case 'organization_street2':
+				$c->organization->address_2 = $value;
+				break;
+			case 'organization_city':
+				$c->organization->city = $value;
+				break;
+			case 'organization_state':
+				try {
+					$state                   = $this->get_migration_script()->get_or_create_state($value);
+					$state_id                = $state['STA_ID'];
+					$c->organization->STA_ID = $state_id;
+				} catch (EE_Error $e) {
+				}
+				break;
+			case 'organization_zip':
+				$c->organization->zip = $value;
+				break;
+			case 'contact_email':
+				$c->organization->email = $value;
+				break;
+			case 'default_payment_status':
+				$c->registration->default_STS_ID =
+					$this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
+				break;
+			case 'organization_country':
+				$iso                      = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
+				$c->organization->CNT_ISO = $iso;
+				$country_row              = $this->get_migration_script()->get_or_create_country($iso);
+				if (! $country_row) {
+					$this->add_error(
+						sprintf(
+							esc_html__(
+								"Could not set country's currency config because no country exists for ISO %s",
+								"event_espresso"
+							),
+							$iso
+						)
+					);
+				}
+				// can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
+				$c->currency->code    = $country_row['CNT_cur_code'];             // currency code: USD, CAD, EUR
+				$c->currency->name    = $country_row['CNT_cur_single'];           // Dollar
+				$c->currency->plural  = $country_row['CNT_cur_plural'];           // Dollars
+				$c->currency->sign    = $country_row['CNT_cur_sign'];             // currency sign: $
+				$c->currency->sign_b4 = filter_var(
+					$country_row['CNT_cur_sign_b4'],
+					FILTER_VALIDATE_BOOLEAN
+				);                                                                // currency sign before or after: $TRUE  or  FALSE$
+				$c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
+				$c->currency->dec_mrk =
+					$country_row['CNT_cur_dec_mrk'];                              // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$c->currency->thsnds  = $country_row['CNT_cur_thsnds'];
+				break;  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			//            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
+			//        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
+			//            $c->currency->sign = $value;break;
+			case 'show_pending_payment_options':
+				$c->registration->show_pending_payment_options = ($value == 'Y');
+				break;
+			case 'display_address_in_regform':
+				$c->template_settings->display_address_in_regform = ($value == 'Y');
+				break;
+			case 'default_logo_url':
+				$c->organization->logo_url = $value;
+				break;
+			case 'event_page_id':
+				// also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				// to ESPRESSO_THANK_YOU
+				$reg_page_post               = get_post($value);
+				$reg_page_post->post_content = str_replace(
+					"[ESPRESSO_EVENTS]",
+					"[ESPRESSO_CHECKOUT]",
+					$reg_page_post->post_content
+				);
+				wp_update_post($reg_page_post);
+				$c->core->reg_page_id = $value;
+				break;
+			case 'return_url':
+				// also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				// to ESPRESSO_THANK_YOU
+				$thank_you_page_post               = get_post($value);
+				$thank_you_page_post->post_content = str_replace(
+					"[ESPRESSO_PAYMENTS]",
+					"[ESPRESSO_THANK_YOU]",
+					$thank_you_page_post->post_content
+				);
+				wp_update_post($thank_you_page_post);
+				$c->core->thank_you_page_id = $value;
+				break;
+			case 'cancel_return':
+				$c->core->cancel_page_id = $value;
 
-                break;
-            case 'notify_url':
-                $c->core->txn_page_id = $value;
-                break;
-            case 'use_captcha':
-                $c->registration->use_captcha = ($value == 'Y');
-                break;
-            case 'recaptcha_publickey':
-                $c->registration->recaptcha_publickey = $value;
-                break;
-            case 'recaptcha_privatekey':
-                $c->registration->recaptcha_privatekey = $value;
-                break;
-            case 'recaptcha_theme':
-                $c->registration->recaptcha_theme = $value;
-                break;
-            case 'recaptcha_width':
-                $c->registration->recaptcha_width = $value;
-                break;
-            case 'recaptcha_language':
-                $c->registration->recaptcha_language = $value;
-                break;
-            case 'espresso_dashboard_widget':
-                $c->admin->use_dashboard_widget = ($value == 'Y');
-                break;
-            case 'use_personnel_manager':
-                $c->admin->use_personnel_manager = ($value == 'Y');
-                break;
-            case 'use_event_timezones':
-                $c->admin->use_event_timezones = ($value == 'Y');
-                break;
-            case 'affiliate_id':
-                $c->admin->affiliate_id = $value;
-                break;
-            case 'site_license_key':
-                $cn->core->site_license_key = $value;
-                break;
-            default:
-                do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
-        }
-    }
+				break;
+			case 'notify_url':
+				$c->core->txn_page_id = $value;
+				break;
+			case 'use_captcha':
+				$c->registration->use_captcha = ($value == 'Y');
+				break;
+			case 'recaptcha_publickey':
+				$c->registration->recaptcha_publickey = $value;
+				break;
+			case 'recaptcha_privatekey':
+				$c->registration->recaptcha_privatekey = $value;
+				break;
+			case 'recaptcha_theme':
+				$c->registration->recaptcha_theme = $value;
+				break;
+			case 'recaptcha_width':
+				$c->registration->recaptcha_width = $value;
+				break;
+			case 'recaptcha_language':
+				$c->registration->recaptcha_language = $value;
+				break;
+			case 'espresso_dashboard_widget':
+				$c->admin->use_dashboard_widget = ($value == 'Y');
+				break;
+			case 'use_personnel_manager':
+				$c->admin->use_personnel_manager = ($value == 'Y');
+				break;
+			case 'use_event_timezones':
+				$c->admin->use_event_timezones = ($value == 'Y');
+				break;
+			case 'affiliate_id':
+				$c->admin->affiliate_id = $value;
+				break;
+			case 'site_license_key':
+				$cn->core->site_license_key = $value;
+				break;
+			default:
+				do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
+		}
+	}
 
 
-    /**
-     * Creates a 4.1 member price discount
-     *
-     * @param array $org_options
-     * @return void
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_global_surcharge_price(array $org_options): void
-    {
-        $amount = (float) $org_options['surcharge'];
-        // dont create a price if the surcharge is 0
-        if ($amount <= .01) {
-            return;
-        }
-        if ($org_options['surcharge_type'] == 'flat_rate') {
-            $price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
-        } else {
-            $price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
-        }
-        global $wpdb;
-        $cols_n_values = [
-            'PRT_ID'         => $price_type,
-            'PRC_amount'     => $amount,
-            'PRC_name'       => $org_options['surcharge_text'],
-            'PRC_is_default' => true,
-            'PRC_overrides'  => false,
-            'PRC_order'      => 100,
-            'PRC_deleted'    => false,
-            'PRC_parent'     => null,
+	/**
+	 * Creates a 4.1 member price discount
+	 *
+	 * @param array $org_options
+	 * @return void
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_global_surcharge_price(array $org_options): void
+	{
+		$amount = (float) $org_options['surcharge'];
+		// dont create a price if the surcharge is 0
+		if ($amount <= .01) {
+			return;
+		}
+		if ($org_options['surcharge_type'] == 'flat_rate') {
+			$price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
+		} else {
+			$price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
+		}
+		global $wpdb;
+		$cols_n_values = [
+			'PRT_ID'         => $price_type,
+			'PRC_amount'     => $amount,
+			'PRC_name'       => $org_options['surcharge_text'],
+			'PRC_is_default' => true,
+			'PRC_overrides'  => false,
+			'PRC_order'      => 100,
+			'PRC_deleted'    => false,
+			'PRC_parent'     => null,
 
-        ];
-        $data_types    = [
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
-        ];
-        $price_table   = $wpdb->prefix . "esp_price";
-        $success       = $wpdb->insert($price_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    'org_options',
-                    [
-                        'surcharge'      => $org_options['surcharge'],
-                        'surcharge_type' => $org_options['surcharge_type'],
-                        'surcharge_text' => $org_options['surcharge_text'],
-                    ],
-                    $price_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
+		];
+		$data_types    = [
+			'%d',// PRT_ID
+			'%f',// PRT_amount
+			'%s',// PRC_name
+			'%d',// PRC_is_default
+			'%d',// PRC_overrides
+			'%d',// PRC_order
+			'%d',// PRC_deleted
+			'%d',// PRC_parent
+		];
+		$price_table   = $wpdb->prefix . "esp_price";
+		$success       = $wpdb->insert($price_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					'org_options',
+					[
+						'surcharge'      => $org_options['surcharge'],
+						'surcharge_type' => $org_options['surcharge_type'],
+						'surcharge_text' => $org_options['surcharge_text'],
+					],
+					$price_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
 
 
-    protected $_org_options_we_know_how_to_migrate = [
-        'organization',
-        'organization_street1',
-        'organization_street2',
-        'organization_city',
-        'organization_state',
-        'organization_zip',
-        'contact_email',
-        'default_mail',
-        'payment_subject',
-        'payment_message',
-        'message',
-        'default_payment_status',
-        'surcharge',// unused?
-        'country_id',// unused?
-        'organization_country',
-        //    'currency_symbol',
-        'expire_on_registration_end',
-        'email_before_payment',
-        'email_fancy_headers',
-        'enable_default_style',
-        'event_ssl_active',
-        'selected_style',
-        'show_pending_payment_options',
-        'show_reg_footer',
-        'skip_confirmation_page',
-        'allow_mer_discounts',// no equiv
-        'allow_mer_vouchers',// no equiv
-        'display_short_description_in_event_list',
-        'display_description_on_multi_reg_page',
-        'display_address_in_event_list',
-        'display_address_in_regform',
-        'use_custom_post_types',// no equiv
-        'display_ical_download',
-        'display_featured_image',
-        'themeroller',
-        'default_logo_url',
-        'event_page_id',
-        'return_url',
-        'cancel_return',
-        'notify_url',
-        'events_in_dashboard',
-        'use_captcha',
-        'recaptcha_publickey',
-        'recaptcha_privatekey',
-        'recaptcha_theme',
-        'recaptcha_width',
-        'recaptcha_language',
-        'espresso_dashboard_widget',
-        'time_reg_limit',
-        //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-        'use_personnel_manager',// no equiv
-        'use_event_timezones',
-        'full_logging',
-        'surcharge_type',// unused
-        'surcharge_text',// unused
-        'affiliate_id',
-        'site_license_key',
-    ];
+	protected $_org_options_we_know_how_to_migrate = [
+		'organization',
+		'organization_street1',
+		'organization_street2',
+		'organization_city',
+		'organization_state',
+		'organization_zip',
+		'contact_email',
+		'default_mail',
+		'payment_subject',
+		'payment_message',
+		'message',
+		'default_payment_status',
+		'surcharge',// unused?
+		'country_id',// unused?
+		'organization_country',
+		//    'currency_symbol',
+		'expire_on_registration_end',
+		'email_before_payment',
+		'email_fancy_headers',
+		'enable_default_style',
+		'event_ssl_active',
+		'selected_style',
+		'show_pending_payment_options',
+		'show_reg_footer',
+		'skip_confirmation_page',
+		'allow_mer_discounts',// no equiv
+		'allow_mer_vouchers',// no equiv
+		'display_short_description_in_event_list',
+		'display_description_on_multi_reg_page',
+		'display_address_in_event_list',
+		'display_address_in_regform',
+		'use_custom_post_types',// no equiv
+		'display_ical_download',
+		'display_featured_image',
+		'themeroller',
+		'default_logo_url',
+		'event_page_id',
+		'return_url',
+		'cancel_return',
+		'notify_url',
+		'events_in_dashboard',
+		'use_captcha',
+		'recaptcha_publickey',
+		'recaptcha_privatekey',
+		'recaptcha_theme',
+		'recaptcha_width',
+		'recaptcha_language',
+		'espresso_dashboard_widget',
+		'time_reg_limit',
+		//    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
+		'use_personnel_manager',// no equiv
+		'use_event_timezones',
+		'full_logging',
+		'surcharge_type',// unused
+		'surcharge_text',// unused
+		'affiliate_id',
+		'site_license_key',
+	];
 }

Spacing +31 added lines, -31 removed lines

@@ -107,8 +107,8 @@ 
         $old_org_options         = get_option('events_organization_settings');
         foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
             // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+            if (isset($old_org_options[$option_name])) {
+                $this->_handle_org_option($option_name, $old_org_options[$option_name]);
             }
             if ($option_name == 'surcharge') {
                 $this->_insert_new_global_surcharge_price($old_org_options);
@@ -117,7 +117,7 @@ 
         }
 
         $success = EE_Config::instance()->update_espresso_config();
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 sprintf(
                     esc_html__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'),
@@ -181,7 +181,7 @@ 
                 $iso                      = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
                 $c->organization->CNT_ISO = $iso;
                 $country_row              = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
+                if ( ! $country_row) {
                     $this->add_error(
                         sprintf(
                             esc_html__(
@@ -193,19 +193,19 @@ 
                     );
                 }
                 // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code    = $country_row['CNT_cur_code'];             // currency code: USD, CAD, EUR
-                $c->currency->name    = $country_row['CNT_cur_single'];           // Dollar
-                $c->currency->plural  = $country_row['CNT_cur_plural'];           // Dollars
-                $c->currency->sign    = $country_row['CNT_cur_sign'];             // currency sign: $
+                $c->currency->code    = $country_row['CNT_cur_code']; // currency code: USD, CAD, EUR
+                $c->currency->name    = $country_row['CNT_cur_single']; // Dollar
+                $c->currency->plural  = $country_row['CNT_cur_plural']; // Dollars
+                $c->currency->sign    = $country_row['CNT_cur_sign']; // currency sign: $
                 $c->currency->sign_b4 = filter_var(
                     $country_row['CNT_cur_sign_b4'],
                     FILTER_VALIDATE_BOOLEAN
-                );                                                                // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
+                ); // currency sign before or after: $TRUE  or  FALSE$
+                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc']; // decimal places: 2 = 0.00  3 = 0.000
                 $c->currency->dec_mrk =
-                    $country_row['CNT_cur_dec_mrk'];                              // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+                    $country_row['CNT_cur_dec_mrk']; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
                 $c->currency->thsnds  = $country_row['CNT_cur_thsnds'];
-                break;  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+                break; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
             //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
             //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
             //            $c->currency->sign = $value;break;
@@ -319,19 +319,19 @@ 
             'PRC_parent'     => null,
 
         ];
-        $data_types    = [
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
+        $data_types = [
+            '%d', // PRT_ID
+            '%f', // PRT_amount
+            '%s', // PRC_name
+            '%d', // PRC_is_default
+            '%d', // PRC_overrides
+            '%d', // PRC_order
+            '%d', // PRC_deleted
+            '%d', // PRC_parent
         ];
-        $price_table   = $wpdb->prefix . "esp_price";
+        $price_table   = $wpdb->prefix."esp_price";
         $success       = $wpdb->insert($price_table, $cols_n_values, $data_types);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     'org_options',
@@ -362,8 +362,8 @@ 
         'payment_message',
         'message',
         'default_payment_status',
-        'surcharge',// unused?
-        'country_id',// unused?
+        'surcharge', // unused?
+        'country_id', // unused?
         'organization_country',
         //    'currency_symbol',
         'expire_on_registration_end',
@@ -375,13 +375,13 @@ 
         'show_pending_payment_options',
         'show_reg_footer',
         'skip_confirmation_page',
-        'allow_mer_discounts',// no equiv
-        'allow_mer_vouchers',// no equiv
+        'allow_mer_discounts', // no equiv
+        'allow_mer_vouchers', // no equiv
         'display_short_description_in_event_list',
         'display_description_on_multi_reg_page',
         'display_address_in_event_list',
         'display_address_in_regform',
-        'use_custom_post_types',// no equiv
+        'use_custom_post_types', // no equiv
         'display_ical_download',
         'display_featured_image',
         'themeroller',
@@ -400,11 +400,11 @@ 
         'espresso_dashboard_widget',
         'time_reg_limit',
         //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-        'use_personnel_manager',// no equiv
+        'use_personnel_manager', // no equiv
         'use_event_timezones',
         'full_logging',
-        'surcharge_type',// unused
-        'surcharge_text',// unused
+        'surcharge_type', // unused
+        'surcharge_text', // unused
         'affiliate_id',
         'site_license_key',
     ];

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

Indentation +60 added lines, -60 removed lines

@@ -7,74 +7,74 @@
 class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage
 {
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Shortcodes", "event_espresso");
-        $this->_old_table   = $wpdb->posts;
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Shortcodes", "event_espresso");
+		$this->_old_table   = $wpdb->posts;
+		parent::__construct();
+	}
 
 
-    protected function _migrate_old_row($old_row)
-    {
-        $new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
-        global $wpdb;
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . $this->_old_table . " SET post_content=%s WHERE ID=%d",
-                $new_post_content,
-                $old_row['ID']
-            )
-        );
-    }
+	protected function _migrate_old_row($old_row)
+	{
+		$new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
+		global $wpdb;
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . $this->_old_table . " SET post_content=%s WHERE ID=%d",
+				$new_post_content,
+				$old_row['ID']
+			)
+		);
+	}
 
 
-    /**
-     * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
-     *
-     * @param string $old_content
-     * @return array|string|string[]
-     */
-    private function _change_event_list_shortcode(string $old_content)
-    {
-        return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
-    }
+	/**
+	 * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
+	 *
+	 * @param string $old_content
+	 * @return array|string|string[]
+	 */
+	private function _change_event_list_shortcode(string $old_content)
+	{
+		return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
+	}
 
 
-    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 {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d",
-                $start_at_record,
-                $num_items_to_migrate
-            ),
-            ARRAY_A
-        );
-        $items_actually_migrated = 0;
-        foreach ($rows as $old_row) {
-            $this->_migrate_old_row($old_row);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	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 {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d",
+				$start_at_record,
+				$num_items_to_migrate
+			),
+			ARRAY_A
+		);
+		$items_actually_migrated = 0;
+		foreach ($rows as $old_row) {
+			$this->_migrate_old_row($old_row);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$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 . $this->_sql_to_only_select_non_drafts());
-    }
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table . $this->_sql_to_only_select_non_drafts());
+	}
 
 
-    private function _sql_to_only_select_non_drafts(): string
-    {
-        return " WHERE post_type NOT IN ('revision','auto-draft','attachment','nav_menu_item') ";
-    }
+	private function _sql_to_only_select_non_drafts(): string
+	{
+		return " WHERE post_type NOT IN ('revision','auto-draft','attachment','nav_menu_item') ";
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
         global $wpdb;
         $wpdb->query(
             $wpdb->prepare(
-                "UPDATE " . $this->_old_table . " SET post_content=%s WHERE ID=%d",
+                "UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d",
                 $new_post_content,
                 $old_row['ID']
             )
@@ -69,7 +69,7 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table . $this->_sql_to_only_select_non_drafts());
+        return $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table.$this->_sql_to_only_select_non_drafts());
     }
 
 

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

Indentation +269 added lines, -269 removed lines

@@ -86,287 +86,287 @@
  */
 class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage
 {
-    private string $_new_meta_table;
+	private string $_new_meta_table;
 
 
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__("Venues", "event_espresso");
-        global $wpdb;
-        $this->_old_table      = $wpdb->prefix . "events_venue";
-        $this->_new_table      = $wpdb->posts;
-        $this->_new_meta_table = $wpdb->prefix . "esp_venue_meta";
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__("Venues", "event_espresso");
+		global $wpdb;
+		$this->_old_table      = $wpdb->prefix . "events_venue";
+		$this->_new_table      = $wpdb->posts;
+		$this->_new_meta_table = $wpdb->prefix . "esp_venue_meta";
+		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 $old_venue) {
-            if (! $new_id = $this->_insert_into_posts($old_venue)) {
-                $items_actually_migrated++;
-                continue;
-            }
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
-            if (! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
-                $items_actually_migrated++;
-                continue;
-            }
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $old_venue['id'],
-                $this->_new_meta_table,
-                $new_meta_id
-            );
-            // lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it
-            $venue_meta = maybe_unserialize($old_venue['meta']);
-            if (isset($venue_meta['contact']) && $venue_meta['contact']) {
-                add_post_meta($new_id, 'contact', $venue_meta['contact']);
-            }
-            // is there an image on this venue?
-            $guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : null;
-            if ($guid) {
-                $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
-                    $guid,
-                    $new_id,
-                    $this
-                );
-            }
-            $items_actually_migrated++;
-            if ($guid) {
-                // if there was an image, we may have had to download it etc and it may have taken
-                // longer, then let's not bother migrating anymore on this step
-                break;
-            }
-        }
-        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 $old_venue) {
+			if (! $new_id = $this->_insert_into_posts($old_venue)) {
+				$items_actually_migrated++;
+				continue;
+			}
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
+			if (! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
+				$items_actually_migrated++;
+				continue;
+			}
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$old_venue['id'],
+				$this->_new_meta_table,
+				$new_meta_id
+			);
+			// lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it
+			$venue_meta = maybe_unserialize($old_venue['meta']);
+			if (isset($venue_meta['contact']) && $venue_meta['contact']) {
+				add_post_meta($new_id, 'contact', $venue_meta['contact']);
+			}
+			// is there an image on this venue?
+			$guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : null;
+			if ($guid) {
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
+					$guid,
+					$new_id,
+					$this
+				);
+			}
+			$items_actually_migrated++;
+			if ($guid) {
+				// if there was an image, we may have had to download it etc and it may have taken
+				// longer, then let's not bother migrating anymore on this step
+				break;
+			}
+		}
+		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);
+	}
 
 
-    /**
-     * Inserts the CPT
-     *
-     * @param array $old_venue keys are cols, values are col values
-     * @return int
-     */
-    private function _insert_into_posts(array $old_venue): int
-    {
-        global $wpdb;
-        $meta             = maybe_unserialize($old_venue['meta']);
-        $slug             = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
-        $insertion_array  = [
-            'post_title'        => stripslashes($old_venue['name']),
-            // VNU_name
-            'post_content'      => isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',
-            // VNU_desc
-            'post_name'         => $slug,
-            // VNU_identifier
-            'post_date'         => current_time('mysql'),
-            // VNU_created
-            'post_date_gmt'     => current_time('mysql', true),
-            'post_excerpt'      => '',
-            // wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitrary only 50 characters
-            'post_modified'     => current_time('mysql'),
-            // VNU_modified
-            'post_modified_gmt' => current_time('mysql', true),
-            'post_author'       => $old_venue['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(
-            $this->_new_table,
-            $insertion_array,
-            $data_types_array
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_venue,
-                    $this->_new_table,
-                    $insertion_array,
-                    $data_types_array
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Inserts the CPT
+	 *
+	 * @param array $old_venue keys are cols, values are col values
+	 * @return int
+	 */
+	private function _insert_into_posts(array $old_venue): int
+	{
+		global $wpdb;
+		$meta             = maybe_unserialize($old_venue['meta']);
+		$slug             = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
+		$insertion_array  = [
+			'post_title'        => stripslashes($old_venue['name']),
+			// VNU_name
+			'post_content'      => isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',
+			// VNU_desc
+			'post_name'         => $slug,
+			// VNU_identifier
+			'post_date'         => current_time('mysql'),
+			// VNU_created
+			'post_date_gmt'     => current_time('mysql', true),
+			'post_excerpt'      => '',
+			// wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitrary only 50 characters
+			'post_modified'     => current_time('mysql'),
+			// VNU_modified
+			'post_modified_gmt' => current_time('mysql', true),
+			'post_author'       => $old_venue['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(
+			$this->_new_table,
+			$insertion_array,
+			$data_types_array
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_venue,
+					$this->_new_table,
+					$insertion_array,
+					$data_types_array
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 
 
-    /**
-     * Finds a unique slug for this venue, 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 $post_name
-     * @param string $old_identifier
-     * @return string
-     */
-    private function _find_unique_slug(string $post_name, string $old_identifier = ''): string
-    {
-        $count         = 0;
-        $original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
-        $event_slug    = $original_name;
-        while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
-            $event_slug = sanitize_title($original_name . "-" . ++$count);
-        }
-        return $event_slug;
-    }
+	/**
+	 * Finds a unique slug for this venue, 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 $post_name
+	 * @param string $old_identifier
+	 * @return string
+	 */
+	private function _find_unique_slug(string $post_name, string $old_identifier = ''): string
+	{
+		$count         = 0;
+		$original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
+		$event_slug    = $original_name;
+		while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
+			$event_slug = sanitize_title($original_name . "-" . ++$count);
+		}
+		return $event_slug;
+	}
 
 
-    /**
-     * 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;
-        return (bool) $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT COUNT(ID) FROM " . $this->_new_table . " WHERE post_name = %s",
-                $slug
-            )
-        );
-    }
+	/**
+	 * 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;
+		return (bool) $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT COUNT(ID) FROM " . $this->_new_table . " WHERE post_name = %s",
+				$slug
+			)
+		);
+	}
 
 
-    /**
-     * Inserts into the venue_meta table
-     *
-     * @param int   $VNU_ID
-     * @param array $old_venue
-     * @return int
-     */
-    private function _insert_into_meta_table(int $VNU_ID, array $old_venue): int
-    {
-        global $wpdb;
-        // get a country with the same name, or insert one
-        try {
-            $country     = $this->get_migration_script()->get_or_create_country(
-                stripslashes($old_venue['country'])
-            );
-            $country_iso = $country['CNT_ISO'];
-        } catch (EE_Error $e) {
-            $this->add_error(
-                sprintf(
-                    esc_html__("%s for venue %s", "event_espresso"),
-                    $e->getMessage(),
-                    $this->_json_encode($old_venue)
-                )
-            );
-            $country_iso = null;
-        }
-        // get a state with the same name, if possible
-        try {
-            $state    = $this->get_migration_script()->get_or_create_state(
-                stripslashes($old_venue['state']),
-                $country['CNT_name'] ?? strip_tags((string) $old_venue['country'])
-            );
-            $state_id = $state['STA_ID'];
-        } catch (EE_Error $e) {
-            $this->add_error(
-                sprintf(
-                    esc_html__("%s for venue %s", "event_espresso"),
-                    $e->getMessage(),
-                    $this->_json_encode($old_venue)
-                )
-            );
-            $state_id = 0;
-        }
-        $meta = maybe_unserialize($old_venue['meta']);
-        // now insert into meta table
-        $insertion_array = [
-            'VNU_ID'              => $VNU_ID,// VNU_ID_fk
-            'VNU_address'         => stripslashes($old_venue['address']),// VNU_address
-            'VNU_address2'        => stripslashes($old_venue['address2']),// VNU_address2
-            'VNU_city'            => stripslashes($old_venue['city']),// VNU_city
-            'STA_ID'              => $state_id,// STA_ID
-            'CNT_ISO'             => $country_iso,// CNT_ISO
-            'VNU_zip'             => stripslashes($old_venue['zip']),// VNU_zip
-            'VNU_phone'           => isset($meta['phone']) ? stripslashes($meta['phone']) : '',// VNU_phone
-            'VNU_capacity'        => -1,// VNU_capacity
-            'VNU_url'             => isset($meta['website']) ? stripslashes($meta['website']) : '',// VNU_url
-            'VNU_virtual_phone'   => '',// VNU_virtual_phone
-            'VNU_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($this->_new_meta_table, $insertion_array, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_venue,
-                    $this->_new_meta_table,
-                    $insertion_array,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Inserts into the venue_meta table
+	 *
+	 * @param int   $VNU_ID
+	 * @param array $old_venue
+	 * @return int
+	 */
+	private function _insert_into_meta_table(int $VNU_ID, array $old_venue): int
+	{
+		global $wpdb;
+		// get a country with the same name, or insert one
+		try {
+			$country     = $this->get_migration_script()->get_or_create_country(
+				stripslashes($old_venue['country'])
+			);
+			$country_iso = $country['CNT_ISO'];
+		} catch (EE_Error $e) {
+			$this->add_error(
+				sprintf(
+					esc_html__("%s for venue %s", "event_espresso"),
+					$e->getMessage(),
+					$this->_json_encode($old_venue)
+				)
+			);
+			$country_iso = null;
+		}
+		// get a state with the same name, if possible
+		try {
+			$state    = $this->get_migration_script()->get_or_create_state(
+				stripslashes($old_venue['state']),
+				$country['CNT_name'] ?? strip_tags((string) $old_venue['country'])
+			);
+			$state_id = $state['STA_ID'];
+		} catch (EE_Error $e) {
+			$this->add_error(
+				sprintf(
+					esc_html__("%s for venue %s", "event_espresso"),
+					$e->getMessage(),
+					$this->_json_encode($old_venue)
+				)
+			);
+			$state_id = 0;
+		}
+		$meta = maybe_unserialize($old_venue['meta']);
+		// now insert into meta table
+		$insertion_array = [
+			'VNU_ID'              => $VNU_ID,// VNU_ID_fk
+			'VNU_address'         => stripslashes($old_venue['address']),// VNU_address
+			'VNU_address2'        => stripslashes($old_venue['address2']),// VNU_address2
+			'VNU_city'            => stripslashes($old_venue['city']),// VNU_city
+			'STA_ID'              => $state_id,// STA_ID
+			'CNT_ISO'             => $country_iso,// CNT_ISO
+			'VNU_zip'             => stripslashes($old_venue['zip']),// VNU_zip
+			'VNU_phone'           => isset($meta['phone']) ? stripslashes($meta['phone']) : '',// VNU_phone
+			'VNU_capacity'        => -1,// VNU_capacity
+			'VNU_url'             => isset($meta['website']) ? stripslashes($meta['website']) : '',// VNU_url
+			'VNU_virtual_phone'   => '',// VNU_virtual_phone
+			'VNU_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($this->_new_meta_table, $insertion_array, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_venue,
+					$this->_new_meta_table,
+					$insertion_array,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -93,9 +93,9 @@ 
     {
         $this->_pretty_name = esc_html__("Venues", "event_espresso");
         global $wpdb;
-        $this->_old_table      = $wpdb->prefix . "events_venue";
+        $this->_old_table      = $wpdb->prefix."events_venue";
         $this->_new_table      = $wpdb->posts;
-        $this->_new_meta_table = $wpdb->prefix . "esp_venue_meta";
+        $this->_new_meta_table = $wpdb->prefix."esp_venue_meta";
         parent::__construct();
     }
 
@@ -109,7 +109,7 @@ 
         $start_at_record         = $this->count_records_migrated();
         $rows                    = $wpdb->get_results(
             $wpdb->prepare(
-                "SELECT * FROM " . $this->_old_table . " LIMIT %d,%d",
+                "SELECT * FROM ".$this->_old_table." LIMIT %d,%d",
                 $start_at_record,
                 $num_items_to_migrate
             ),
@@ -117,12 +117,12 @@ 
         );
         $items_actually_migrated = 0;
         foreach ($rows as $old_venue) {
-            if (! $new_id = $this->_insert_into_posts($old_venue)) {
+            if ( ! $new_id = $this->_insert_into_posts($old_venue)) {
                 $items_actually_migrated++;
                 continue;
             }
             $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
-            if (! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
+            if ( ! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
                 $items_actually_migrated++;
                 continue;
             }
@@ -163,7 +163,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);
     }
 
 
@@ -203,25 +203,25 @@ 
             // 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(
             $this->_new_table,
             $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,
@@ -252,7 +252,7 @@ 
         $original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
         $event_slug    = $original_name;
         while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
-            $event_slug = sanitize_title($original_name . "-" . ++$count);
+            $event_slug = sanitize_title($original_name."-".++$count);
         }
         return $event_slug;
     }
@@ -270,7 +270,7 @@ 
         global $wpdb;
         return (bool) $wpdb->get_var(
             $wpdb->prepare(
-                "SELECT COUNT(ID) FROM " . $this->_new_table . " WHERE post_name = %s",
+                "SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s",
                 $slug
             )
         );
@@ -305,7 +305,7 @@ 
         }
         // get a state with the same name, if possible
         try {
-            $state    = $this->get_migration_script()->get_or_create_state(
+            $state = $this->get_migration_script()->get_or_create_state(
                 stripslashes($old_venue['state']),
                 $country['CNT_name'] ?? strip_tags((string) $old_venue['country'])
             );
@@ -323,39 +323,39 @@ 
         $meta = maybe_unserialize($old_venue['meta']);
         // now insert into meta table
         $insertion_array = [
-            'VNU_ID'              => $VNU_ID,// VNU_ID_fk
-            'VNU_address'         => stripslashes($old_venue['address']),// VNU_address
-            'VNU_address2'        => stripslashes($old_venue['address2']),// VNU_address2
-            'VNU_city'            => stripslashes($old_venue['city']),// VNU_city
-            'STA_ID'              => $state_id,// STA_ID
-            'CNT_ISO'             => $country_iso,// CNT_ISO
-            'VNU_zip'             => stripslashes($old_venue['zip']),// VNU_zip
-            'VNU_phone'           => isset($meta['phone']) ? stripslashes($meta['phone']) : '',// VNU_phone
-            'VNU_capacity'        => -1,// VNU_capacity
-            'VNU_url'             => isset($meta['website']) ? stripslashes($meta['website']) : '',// VNU_url
-            'VNU_virtual_phone'   => '',// VNU_virtual_phone
-            'VNU_virtual_url'     => '',// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
+            'VNU_ID'              => $VNU_ID, // VNU_ID_fk
+            'VNU_address'         => stripslashes($old_venue['address']), // VNU_address
+            'VNU_address2'        => stripslashes($old_venue['address2']), // VNU_address2
+            'VNU_city'            => stripslashes($old_venue['city']), // VNU_city
+            'STA_ID'              => $state_id, // STA_ID
+            'CNT_ISO'             => $country_iso, // CNT_ISO
+            'VNU_zip'             => stripslashes($old_venue['zip']), // VNU_zip
+            'VNU_phone'           => isset($meta['phone']) ? stripslashes($meta['phone']) : '', // VNU_phone
+            'VNU_capacity'        => -1, // VNU_capacity
+            'VNU_url'             => isset($meta['website']) ? stripslashes($meta['website']) : '', // VNU_url
+            'VNU_virtual_phone'   => '', // VNU_virtual_phone
+            'VNU_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($this->_new_meta_table, $insertion_array, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_meta_table, $insertion_array, $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_checkins.dmsstage.php

Indentation +178 added lines, -178 removed lines

@@ -27,186 +27,186 @@
 class EE_DMS_4_1_0_checkins extends EE_Data_Migration_Script_Stage_Table
 {
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name      = esc_html__('Checkins', 'event_espresso');
-        $this->_old_table        = $wpdb->prefix . "events_attendee";
-        $this->select_expression = 'att.*, e.event_status';
-        $this->_extra_where_sql  = 'AS att
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name      = esc_html__('Checkins', 'event_espresso');
+		$this->_old_table        = $wpdb->prefix . "events_attendee";
+		$this->select_expression = 'att.*, e.event_status';
+		$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->_new_table        = $wpdb->prefix . "esp_checkin";
-        parent::__construct();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _migrate_old_row($old_row)
-    {
-        global $wpdb;
-        $new_reg_table = $wpdb->prefix . "esp_registration";
-
-        $num_to_checkin_at_this_time = max([intval($old_row['checked_in_quantity']), intval($old_row['checked_in'])]);
-
-        $new_registrations_for_attendee =
-            $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
-        if (! $new_registrations_for_attendee) {
-            $new_registrations_for_attendee = [];
-        }
-        $new_datetime = $this->_try_to_find_datetime($old_row);
-
-        // make sure registrations array is numerically indexed starting at 0 (it probably already is)
-        $new_registrations_for_attendee = array_values($new_registrations_for_attendee);
-        $new_checkin_ids                = [];
-        for ($i = 0; $i < abs($num_to_checkin_at_this_time); $i++) {
-            $new_reg_id = $new_registrations_for_attendee[ $i ];
-            if (! $new_reg_id) {
-                $this->add_error(
-                    sprintf(
-                        esc_html__(
-                        /* translators: %1$s database row represented in JSON, %2$s number of registrations to check in
+		$this->_new_table        = $wpdb->prefix . "esp_checkin";
+		parent::__construct();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _migrate_old_row($old_row)
+	{
+		global $wpdb;
+		$new_reg_table = $wpdb->prefix . "esp_registration";
+
+		$num_to_checkin_at_this_time = max([intval($old_row['checked_in_quantity']), intval($old_row['checked_in'])]);
+
+		$new_registrations_for_attendee =
+			$this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
+		if (! $new_registrations_for_attendee) {
+			$new_registrations_for_attendee = [];
+		}
+		$new_datetime = $this->_try_to_find_datetime($old_row);
+
+		// make sure registrations array is numerically indexed starting at 0 (it probably already is)
+		$new_registrations_for_attendee = array_values($new_registrations_for_attendee);
+		$new_checkin_ids                = [];
+		for ($i = 0; $i < abs($num_to_checkin_at_this_time); $i++) {
+			$new_reg_id = $new_registrations_for_attendee[ $i ];
+			if (! $new_reg_id) {
+				$this->add_error(
+					sprintf(
+						esc_html__(
+						/* translators: %1$s database row represented in JSON, %2$s number of registrations to check in
                         *  %3$s number of registrations for the attendee, %4$s new registration rows represented in JSON
                         */
-                        // @codingStandardsIgnoreStart
-                            'It appears we wanted to check-in more registrations than actually exist. The old attendee record (%1$s) indicated we should check-in %2$d registrations, but there are only %3$d registrations for that attendee (%4$s)',
-                            // @codingStandardsIgnoreEnd
-                            'event_espresso'
-                        ),
-                        $this->_json_encode($old_row),
-                        abs($num_to_checkin_at_this_time),
-                        count($new_registrations_for_attendee),
-                        $this->_json_encode($new_registrations_for_attendee)
-                    )
-                );
-                break;
-            }
-            $existing_checkin_record = $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT CHK_ID FROM $this->_new_table WHERE REG_ID = %d ORDER BY CHK_ID DESC LIMIT 1",
-                    $new_reg_id
-                )
-            );
-            if (! $existing_checkin_record) {
-                $new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
-                if ($new_id) {
-                    $new_checkin_ids[] = $new_id;
-                }
-            }
-        }
-        if ($new_checkin_ids) {
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $old_row['id'],
-                $this->_new_table,
-                $new_checkin_ids
-            );
-        }
-    }
-
-
-    /**
-     * Tries to find the new datetime the Check-in was for, based on the attendee row
-     * (because we know the attendee was for an event as a specific time, and we know
-     * the event's OLD ID...)
-     *
-     * @param array $old_attendee
-     * @return array row of datetime from DB
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _try_to_find_datetime(array $old_attendee): array
-    {
-        global $wpdb;
-
-        $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__(
-                    /* translators: 1: original event ID, 2: original attendee database row */
-                    // @codingStandardsIgnoreStart
-                        'Could not find new event ID with old event ID %1$d, on attendee row %2$s; and because of that couldn\'t find the correct datetime for Check-in',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    $old_attendee['event_id'],
-                    $this->_json_encode($old_attendee)
-                )
-            );
-            return [];
-        }
-        $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"
-            );
-
-        $datetime_table = $wpdb->prefix . "esp_datetime";
-        // 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("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
-        ];
-        // start running queries, widening search each time by removing a condition
-        do {
-            $full_query     = "SELECT * FROM $datetime_table WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
-            $datetime_found = $wpdb->get_row($full_query, ARRAY_A);
-            array_shift($conditions);
-        } while (! $datetime_found && $conditions);
-        return $datetime_found;
-    }
-
-
-    /**
-     * Adds a new Check-in/checkout record according to $new_reg_id,$new_datetime_id,$checking_in, and $timestamp
-     *
-     * @param int   $new_reg_id
-     * @param array $new_datetime
-     * @return int new Check-in id
-     */
-    private function _insert_checkin_record(int $new_reg_id, array $new_datetime): int
-    {
-        global $wpdb;
-
-
-        // ok we can actually do what we set out to do: add a checkin/checkout record
-        $cols_n_values = [
-            'REG_ID'        => $new_reg_id,
-            'DTT_ID'        => $new_datetime['DTT_ID'] ?? 0,
-            'CHK_in'        => true,
-            'CHK_timestamp' => $new_datetime['DTT_EVT_start'] ?? null,
-        ];
-        $data_types    = [
-            '%d',// REG_ID
-            '%d',// DTT_ID
-            '%d',// CHK_in
-            '%s',// CHK_timestamp
-        ];
-        $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,
-                    [],
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+						// @codingStandardsIgnoreStart
+							'It appears we wanted to check-in more registrations than actually exist. The old attendee record (%1$s) indicated we should check-in %2$d registrations, but there are only %3$d registrations for that attendee (%4$s)',
+							// @codingStandardsIgnoreEnd
+							'event_espresso'
+						),
+						$this->_json_encode($old_row),
+						abs($num_to_checkin_at_this_time),
+						count($new_registrations_for_attendee),
+						$this->_json_encode($new_registrations_for_attendee)
+					)
+				);
+				break;
+			}
+			$existing_checkin_record = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT CHK_ID FROM $this->_new_table WHERE REG_ID = %d ORDER BY CHK_ID DESC LIMIT 1",
+					$new_reg_id
+				)
+			);
+			if (! $existing_checkin_record) {
+				$new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
+				if ($new_id) {
+					$new_checkin_ids[] = $new_id;
+				}
+			}
+		}
+		if ($new_checkin_ids) {
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$old_row['id'],
+				$this->_new_table,
+				$new_checkin_ids
+			);
+		}
+	}
+
+
+	/**
+	 * Tries to find the new datetime the Check-in was for, based on the attendee row
+	 * (because we know the attendee was for an event as a specific time, and we know
+	 * the event's OLD ID...)
+	 *
+	 * @param array $old_attendee
+	 * @return array row of datetime from DB
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _try_to_find_datetime(array $old_attendee): array
+	{
+		global $wpdb;
+
+		$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__(
+					/* translators: 1: original event ID, 2: original attendee database row */
+					// @codingStandardsIgnoreStart
+						'Could not find new event ID with old event ID %1$d, on attendee row %2$s; and because of that couldn\'t find the correct datetime for Check-in',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					$old_attendee['event_id'],
+					$this->_json_encode($old_attendee)
+				)
+			);
+			return [];
+		}
+		$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"
+			);
+
+		$datetime_table = $wpdb->prefix . "esp_datetime";
+		// 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("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+		];
+		// start running queries, widening search each time by removing a condition
+		do {
+			$full_query     = "SELECT * FROM $datetime_table WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
+			$datetime_found = $wpdb->get_row($full_query, ARRAY_A);
+			array_shift($conditions);
+		} while (! $datetime_found && $conditions);
+		return $datetime_found;
+	}
+
+
+	/**
+	 * Adds a new Check-in/checkout record according to $new_reg_id,$new_datetime_id,$checking_in, and $timestamp
+	 *
+	 * @param int   $new_reg_id
+	 * @param array $new_datetime
+	 * @return int new Check-in id
+	 */
+	private function _insert_checkin_record(int $new_reg_id, array $new_datetime): int
+	{
+		global $wpdb;
+
+
+		// ok we can actually do what we set out to do: add a checkin/checkout record
+		$cols_n_values = [
+			'REG_ID'        => $new_reg_id,
+			'DTT_ID'        => $new_datetime['DTT_ID'] ?? 0,
+			'CHK_in'        => true,
+			'CHK_timestamp' => $new_datetime['DTT_EVT_start'] ?? null,
+		];
+		$data_types    = [
+			'%d',// REG_ID
+			'%d',// DTT_ID
+			'%d',// CHK_in
+			'%s',// CHK_timestamp
+		];
+		$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,
+					[],
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -31,12 +31,12 @@ 
     {
         global $wpdb;
         $this->_pretty_name      = esc_html__('Checkins', 'event_espresso');
-        $this->_old_table        = $wpdb->prefix . "events_attendee";
+        $this->_old_table        = $wpdb->prefix."events_attendee";
         $this->select_expression = 'att.*, e.event_status';
         $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->_new_table        = $wpdb->prefix . "esp_checkin";
+        $this->_new_table        = $wpdb->prefix."esp_checkin";
         parent::__construct();
     }
 
@@ -47,13 +47,13 @@ 
     protected function _migrate_old_row($old_row)
     {
         global $wpdb;
-        $new_reg_table = $wpdb->prefix . "esp_registration";
+        $new_reg_table = $wpdb->prefix."esp_registration";
 
         $num_to_checkin_at_this_time = max([intval($old_row['checked_in_quantity']), intval($old_row['checked_in'])]);
 
         $new_registrations_for_attendee =
             $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
-        if (! $new_registrations_for_attendee) {
+        if ( ! $new_registrations_for_attendee) {
             $new_registrations_for_attendee = [];
         }
         $new_datetime = $this->_try_to_find_datetime($old_row);
@@ -62,8 +62,8 @@ 
         $new_registrations_for_attendee = array_values($new_registrations_for_attendee);
         $new_checkin_ids                = [];
         for ($i = 0; $i < abs($num_to_checkin_at_this_time); $i++) {
-            $new_reg_id = $new_registrations_for_attendee[ $i ];
-            if (! $new_reg_id) {
+            $new_reg_id = $new_registrations_for_attendee[$i];
+            if ( ! $new_reg_id) {
                 $this->add_error(
                     sprintf(
                         esc_html__(
@@ -89,7 +89,7 @@ 
                     $new_reg_id
                 )
             );
-            if (! $existing_checkin_record) {
+            if ( ! $existing_checkin_record) {
                 $new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
                 if ($new_id) {
                     $new_checkin_ids[] = $new_id;
@@ -123,11 +123,11 @@ 
 
         $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__(
@@ -152,19 +152,19 @@ 
                 "$old_att_start_date $old_att_start_time:00"
             );
 
-        $datetime_table = $wpdb->prefix . "esp_datetime";
+        $datetime_table = $wpdb->prefix."esp_datetime";
         // 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("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime), // times match?
+            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id), // events match?
         ];
         // start running queries, widening search each time by removing a condition
         do {
-            $full_query     = "SELECT * FROM $datetime_table WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
+            $full_query     = "SELECT * FROM $datetime_table WHERE ".implode(" AND ", $conditions)." LIMIT 1";
             $datetime_found = $wpdb->get_row($full_query, ARRAY_A);
             array_shift($conditions);
-        } while (! $datetime_found && $conditions);
+        }while ( ! $datetime_found && $conditions);
         return $datetime_found;
     }
 
@@ -188,14 +188,14 @@ 
             'CHK_in'        => true,
             'CHK_timestamp' => $new_datetime['DTT_EVT_start'] ?? null,
         ];
-        $data_types    = [
-            '%d',// REG_ID
-            '%d',// DTT_ID
-            '%d',// CHK_in
-            '%s',// CHK_timestamp
+        $data_types = [
+            '%d', // REG_ID
+            '%d', // DTT_ID
+            '%d', // CHK_in
+            '%s', // CHK_timestamp
         ];
-        $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_question_group_question.dmsstage.php

Indentation +148 added lines, -148 removed lines

@@ -28,162 +28,162 @@
 class EE_DMS_4_1_0_question_group_question extends EE_Data_Migration_Script_Stage
 {
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table   = $wpdb->prefix . "events_qst_group_rel";
-        $this->_new_table   = $wpdb->prefix . "esp_question_group_question";
-        $this->_pretty_name = esc_html__("Question Group to Question Relations", "event_espresso");
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table   = $wpdb->prefix . "events_qst_group_rel";
+		$this->_new_table   = $wpdb->prefix . "esp_question_group_question";
+		$this->_pretty_name = esc_html__("Question Group to Question Relations", "event_espresso");
+		parent::__construct();
+	}
 
 
-    /**
-     * @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_group_question) {
-            $this->_insert_new_question_group_question($question_group_question);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	/**
+	 * @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_group_question) {
+			$this->_insert_new_question_group_question($question_group_question);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
 
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        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);
+	}
 
 
-    /**
-     * Attempts to insert a new question group in the new format given an old one
-     *
-     * @param array $old_question_group_question
-     * @return void
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _insert_new_question_group_question(array $old_question_group_question): void
-    {
-        global $wpdb;
-        $new_question_id       = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_question",
-            $old_question_group_question['question_id'],
-            $wpdb->prefix . "esp_question"
-        );
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_qst_group",
-            $old_question_group_question['group_id'],
-            $wpdb->prefix . "esp_question_group"
-        );
-        if (! $new_question_id) {
-            $this->add_error(
-                sprintf(
-                    esc_html__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"),
-                    $old_question_group_question['question_id']
-                )
-            );
-            return;
-        }
-        if (! $new_question_group_id) {
-            $this->add_error(
-                sprintf(
-                    esc_html__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"),
-                    $old_question_group_question['group_id']
-                )
-            );
-            return;
-        }
-        // if it's a system question, it needs to be in the right system group. otherwise no dice!
-        if (
-            ($this->_is_system_question_group($new_question_group_id) ==
-             $this->_is_system_question_for_question_group($new_question_id)) ||
-            ! $this->_is_system_question_for_question_group($new_question_id)
-        ) {
-            $cols_n_values = [
-                'QSG_ID' => $new_question_group_id,
-                'QST_ID' => $new_question_id,
-            ];
-            $data_types    = [
-                '%d',// QSG_ID
-                '%d',// QST_ID
-            ];
-            $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_group_question,
-                        $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_question_group_question
+	 * @return void
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _insert_new_question_group_question(array $old_question_group_question): void
+	{
+		global $wpdb;
+		$new_question_id       = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_question",
+			$old_question_group_question['question_id'],
+			$wpdb->prefix . "esp_question"
+		);
+		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_qst_group",
+			$old_question_group_question['group_id'],
+			$wpdb->prefix . "esp_question_group"
+		);
+		if (! $new_question_id) {
+			$this->add_error(
+				sprintf(
+					esc_html__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"),
+					$old_question_group_question['question_id']
+				)
+			);
+			return;
+		}
+		if (! $new_question_group_id) {
+			$this->add_error(
+				sprintf(
+					esc_html__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"),
+					$old_question_group_question['group_id']
+				)
+			);
+			return;
+		}
+		// if it's a system question, it needs to be in the right system group. otherwise no dice!
+		if (
+			($this->_is_system_question_group($new_question_group_id) ==
+			 $this->_is_system_question_for_question_group($new_question_id)) ||
+			! $this->_is_system_question_for_question_group($new_question_id)
+		) {
+			$cols_n_values = [
+				'QSG_ID' => $new_question_group_id,
+				'QST_ID' => $new_question_id,
+			];
+			$data_types    = [
+				'%d',// QSG_ID
+				'%d',// QST_ID
+			];
+			$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_group_question,
+						$this->_new_table,
+						$cols_n_values,
+						$data_types
+					)
+				);
+			}
+		}
+	}
 
 
-    /**
-     * If this question is a system question, returns the QSG_system number that
-     * indicates the question group its permitted in.
-     *
-     * @param int   $new_question_id
-     * @return int
-     * @global wpdb $wpdb
-     */
-    private function _is_system_question_for_question_group(int $new_question_id): int
-    {
-        global $wpdb;
-        $system_id = $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d",
-                $new_question_id
-            )
-        );
-        if (in_array($system_id, ['fname', 'lname', 'email'])) {
-            return 1;
-        }
-        if ($system_id != '' && $system_id) {
-            return 2;
-        }
-        return 0;
-    }
+	/**
+	 * If this question is a system question, returns the QSG_system number that
+	 * indicates the question group its permitted in.
+	 *
+	 * @param int   $new_question_id
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	private function _is_system_question_for_question_group(int $new_question_id): int
+	{
+		global $wpdb;
+		$system_id = $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d",
+				$new_question_id
+			)
+		);
+		if (in_array($system_id, ['fname', 'lname', 'email'])) {
+			return 1;
+		}
+		if ($system_id != '' && $system_id) {
+			return 2;
+		}
+		return 0;
+	}
 
 
-    /**
-     * Returns the question group's QSG_system value (1 meaning personal info, 2
-     * being address info, and 0 being neither)
-     *
-     * @param int   $new_question_group_id
-     * @return int
-     * @global wpdb $wpdb
-     */
-    private function _is_system_question_group(int $new_question_group_id): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d",
-                $new_question_group_id
-            )
-        );
-    }
+	/**
+	 * Returns the question group's QSG_system value (1 meaning personal info, 2
+	 * being address info, and 0 being neither)
+	 *
+	 * @param int   $new_question_group_id
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	private function _is_system_question_group(int $new_question_group_id): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d",
+				$new_question_group_id
+			)
+		);
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -31,8 +31,8 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table   = $wpdb->prefix . "events_qst_group_rel";
-        $this->_new_table   = $wpdb->prefix . "esp_question_group_question";
+        $this->_old_table   = $wpdb->prefix."events_qst_group_rel";
+        $this->_new_table   = $wpdb->prefix."esp_question_group_question";
         $this->_pretty_name = esc_html__("Question Group to Question Relations", "event_espresso");
         parent::__construct();
     }
@@ -68,7 +68,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);
     }
 
 
@@ -83,17 +83,17 @@ 
     private function _insert_new_question_group_question(array $old_question_group_question): void
     {
         global $wpdb;
-        $new_question_id       = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_question",
+        $new_question_id = $this->get_migration_script()->get_mapping_new_pk(
+            $wpdb->prefix."events_question",
             $old_question_group_question['question_id'],
-            $wpdb->prefix . "esp_question"
+            $wpdb->prefix."esp_question"
         );
         $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_qst_group",
+            $wpdb->prefix."events_qst_group",
             $old_question_group_question['group_id'],
-            $wpdb->prefix . "esp_question_group"
+            $wpdb->prefix."esp_question_group"
         );
-        if (! $new_question_id) {
+        if ( ! $new_question_id) {
             $this->add_error(
                 sprintf(
                     esc_html__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"),
@@ -102,7 +102,7 @@ 
             );
             return;
         }
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(
                 sprintf(
                     esc_html__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"),
@@ -121,12 +121,12 @@ 
                 'QSG_ID' => $new_question_group_id,
                 'QST_ID' => $new_question_id,
             ];
-            $data_types    = [
-                '%d',// QSG_ID
-                '%d',// QST_ID
+            $data_types = [
+                '%d', // QSG_ID
+                '%d', // QST_ID
             ];
-            $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,
@@ -154,7 +154,7 @@ 
         global $wpdb;
         $system_id = $wpdb->get_var(
             $wpdb->prepare(
-                "SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d",
+                "SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d",
                 $new_question_id
             )
         );
@@ -181,7 +181,7 @@ 
         global $wpdb;
         return (int) $wpdb->get_var(
             $wpdb->prepare(
-                "SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d",
+                "SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d",
                 $new_question_group_id
             )
         );