eventespresso / event-espresso-core

core/libraries/form_sections/inputs/EE_Country_Select_Input.php

Indentation +69 added lines, -69 removed lines

@@ -14,80 +14,80 @@
  */
 class EE_Country_Select_Input extends EE_Select_Input
 {
-    /**
-     * $input_settings key used for detecting the "get" option
-     */
-    const OPTION_GET_KEY = 'get';
+	/**
+	 * $input_settings key used for detecting the "get" option
+	 */
+	const OPTION_GET_KEY = 'get';
 
-    /**
-     * indicates that ALL countries should be retrieved from the db for the input
-     */
-    const OPTION_GET_ALL = 'all';
+	/**
+	 * indicates that ALL countries should be retrieved from the db for the input
+	 */
+	const OPTION_GET_ALL = 'all';
 
-    /**
-     * indicates that only ACTIVE countries should be retrieved from the db for the input
-     */
-    const OPTION_GET_ACTIVE = 'active';
+	/**
+	 * indicates that only ACTIVE countries should be retrieved from the db for the input
+	 */
+	const OPTION_GET_ACTIVE = 'active';
 
 
-    /**
-     * @param array|null $country_options
-     * @param array      $input_settings
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __construct(?array $country_options = null, $input_settings = [])
-    {
-        $get = $input_settings[ self::OPTION_GET_KEY ] ?? self::OPTION_GET_ACTIVE;
+	/**
+	 * @param array|null $country_options
+	 * @param array      $input_settings
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __construct(?array $country_options = null, $input_settings = [])
+	{
+		$get = $input_settings[ self::OPTION_GET_KEY ] ?? self::OPTION_GET_ACTIVE;
 
-        $country_options = apply_filters(
-            'FHEE__EE_Country_Select_Input____construct__country_options',
-            $this->get_country_answer_options($country_options, $get),
-            $this,
-            $get
-        );
-        $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-country-select-js'
-            : 'ee-country-select-js';
-        parent::__construct($country_options, $input_settings);
-    }
+		$country_options = apply_filters(
+			'FHEE__EE_Country_Select_Input____construct__country_options',
+			$this->get_country_answer_options($country_options, $get),
+			$this,
+			$get
+		);
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'] . ' ee-country-select-js'
+			: 'ee-country-select-js';
+		parent::__construct($country_options, $input_settings);
+	}
 
 
-    /**
-     * get_country_answer_options
-     *
-     * @param array|null $country_options
-     * @param string     $get
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_country_answer_options(
-        ?array $country_options = null,
-        string $get = self::OPTION_GET_ACTIVE
-    ): ?array {
-        // if passed something that is NOT an array
-        if (empty($country_options)) {
-            // get possibly cached list of countries
-            $countries = $get === self::OPTION_GET_ALL
-                ? EEM_Country::instance()->get_all_countries()
-                : EEM_Country::instance()->get_all_active_countries();
-            if (empty($countries)) {
-                return [];
-            }
-            $country_options[''] = '';
-            foreach ($countries as $country) {
-                if ($country instanceof EE_Country) {
-                    $country_options[ $country->ID() ] = $country->name();
-                }
-            }
-        }
-        return $country_options;
-    }
+	/**
+	 * get_country_answer_options
+	 *
+	 * @param array|null $country_options
+	 * @param string     $get
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_country_answer_options(
+		?array $country_options = null,
+		string $get = self::OPTION_GET_ACTIVE
+	): ?array {
+		// if passed something that is NOT an array
+		if (empty($country_options)) {
+			// get possibly cached list of countries
+			$countries = $get === self::OPTION_GET_ALL
+				? EEM_Country::instance()->get_all_countries()
+				: EEM_Country::instance()->get_all_active_countries();
+			if (empty($countries)) {
+				return [];
+			}
+			$country_options[''] = '';
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$country_options[ $country->ID() ] = $country->name();
+				}
+			}
+		}
+		return $country_options;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function __construct(?array $country_options = null, $input_settings = [])
     {
-        $get = $input_settings[ self::OPTION_GET_KEY ] ?? self::OPTION_GET_ACTIVE;
+        $get = $input_settings[self::OPTION_GET_KEY] ?? self::OPTION_GET_ACTIVE;
 
         $country_options = apply_filters(
             'FHEE__EE_Country_Select_Input____construct__country_options',
@@ -50,7 +50,7 @@ 
             $get
         );
         $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-country-select-js'
+            ? $input_settings['html_class'].' ee-country-select-js'
             : 'ee-country-select-js';
         parent::__construct($country_options, $input_settings);
     }
@@ -84,7 +84,7 @@ 
             $country_options[''] = '';
             foreach ($countries as $country) {
                 if ($country instanceof EE_Country) {
-                    $country_options[ $country->ID() ] = $country->name();
+                    $country_options[$country->ID()] = $country->name();
                 }
             }
         }

core/libraries/form_sections/strategies/validation/EE_Min_Length_Validation_Strategy.strategy.php

Indentation +42 added lines, -42 removed lines

@@ -12,46 +12,46 @@
 class EE_Min_Length_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    protected $_min_length;
-
-
-    public function __construct($validation_error_message = null, $min_length = 0)
-    {
-        $this->_min_length = $min_length;
-        if ($validation_error_message === null) {
-            $validation_error_message = sprintf(
-                esc_html__('Input is too short. Minimum number of characters is %1$s', 'event_espresso'),
-                $min_length
-            );
-        }
-        parent::__construct($validation_error_message);
-    }
-
-
-    /**
-     * @param $normalized_value
-     * @throws EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if (
-            $this->_min_length > 0 && $normalized_value && is_string($normalized_value)
-            && strlen($normalized_value)
-               < $this->_min_length
-        ) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'minlength');
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array(): array
-    {
-        return [
-            'minlength' => $this->_min_length,
-            'messages'  => ['minlength' => $this->get_validation_error_message()],
-        ];
-    }
+	protected $_min_length;
+
+
+	public function __construct($validation_error_message = null, $min_length = 0)
+	{
+		$this->_min_length = $min_length;
+		if ($validation_error_message === null) {
+			$validation_error_message = sprintf(
+				esc_html__('Input is too short. Minimum number of characters is %1$s', 'event_espresso'),
+				$min_length
+			);
+		}
+		parent::__construct($validation_error_message);
+	}
+
+
+	/**
+	 * @param $normalized_value
+	 * @throws EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if (
+			$this->_min_length > 0 && $normalized_value && is_string($normalized_value)
+			&& strlen($normalized_value)
+			   < $this->_min_length
+		) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'minlength');
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array(): array
+	{
+		return [
+			'minlength' => $this->_min_length,
+			'messages'  => ['minlength' => $this->get_validation_error_message()],
+		];
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Max_Length_Validation_Strategy.strategy.php

Indentation +47 added lines, -47 removed lines

@@ -12,51 +12,51 @@
 class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    protected $_max_length;
-
-
-    public function __construct($validation_error_message = null, $max_length = EE_INF)
-    {
-        $this->_max_length = $max_length;
-        if ($validation_error_message === null) {
-            $validation_error_message = sprintf(
-                esc_html__('Input is too long. Maximum number of characters is %1$s', 'event_espresso'),
-                $max_length
-            );
-        }
-        parent::__construct($validation_error_message);
-    }
-
-
-    /**
-     * @param $normalized_value
-     * @throws EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if (
-            $this->_max_length !== EE_INF && $normalized_value && is_string($normalized_value)
-            && strlen(
-                   $normalized_value
-               ) > $this->_max_length
-        ) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'maxlength');
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array(): array
-    {
-        if ($this->_max_length !== EE_INF) {
-            return [
-                'maxlength' => $this->_max_length,
-                'messages'  => ['maxlength' => $this->get_validation_error_message()],
-            ];
-        } else {
-            return [];
-        }
-    }
+	protected $_max_length;
+
+
+	public function __construct($validation_error_message = null, $max_length = EE_INF)
+	{
+		$this->_max_length = $max_length;
+		if ($validation_error_message === null) {
+			$validation_error_message = sprintf(
+				esc_html__('Input is too long. Maximum number of characters is %1$s', 'event_espresso'),
+				$max_length
+			);
+		}
+		parent::__construct($validation_error_message);
+	}
+
+
+	/**
+	 * @param $normalized_value
+	 * @throws EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if (
+			$this->_max_length !== EE_INF && $normalized_value && is_string($normalized_value)
+			&& strlen(
+				   $normalized_value
+			   ) > $this->_max_length
+		) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'maxlength');
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array(): array
+	{
+		if ($this->_max_length !== EE_INF) {
+			return [
+				'maxlength' => $this->_max_length,
+				'messages'  => ['maxlength' => $this->get_validation_error_message()],
+			];
+		} else {
+			return [];
+		}
+	}
 }

core/data_migration_scripts/4_12_0_stages/EE_DMS_4_12_0_Create_Default_Form_Sections.dmsstage.php

Indentation +161 added lines, -161 removed lines

@@ -10,94 +10,94 @@ 
 class EE_DMS_4_12_0_Create_Default_Form_Sections extends EE_Data_Migration_Script_Stage_Table
 {
 
-    // tables
-
-    /**
-     * @var string
-     */
-    protected $datetime_table;
-
-    /**
-     * @var string
-     */
-    protected $event_meta_table;
-
-    /**
-     * @var string
-     */
-    protected $event_question_group_table;
-
-    /**
-     * @var string
-     */
-    protected $question_group_table;
-
-    // clauses
-
-    /**
-     * @var string
-     */
-    protected $event_datetime_join_clause;
-
-    /**
-     * @var string
-     */
-    protected $event_question_group_join_clause;
-
-    /**
-     * @var string
-     */
-    protected $group_by_clause;
-
-
-    /**
-     * Just initializes the status of the migration EE_DMS_4_12_0_Create_Default_Form_Sections
-     */
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__('Create Default Form Sections', 'event_espresso');
-        // tables
-        global $wpdb;
-        $this->datetime_table             = $wpdb->prefix . 'esp_datetime';
-        $this->event_meta_table           = $wpdb->prefix . 'esp_event_meta';
-        $this->event_question_group_table = $wpdb->prefix . 'esp_event_question_group';
-        $this->question_group_table       = $wpdb->prefix . 'esp_question_group';
-        $this->_old_table                 = $this->event_question_group_table;
-        // plus $wpdb->posts for events
-
-        // join clauses
-        $this->event_datetime_join_clause       = " JOIN {$this->datetime_table}";
-        $this->event_datetime_join_clause       .= " ON {$wpdb->posts}.`ID` = {$this->datetime_table}.`EVT_ID`";
-        $this->event_question_group_join_clause = " JOIN {$this->event_question_group_table}";
-        $this->event_question_group_join_clause .= " ON {$wpdb->posts}.`ID` = {$this->event_question_group_table}.`EVT_ID`";
-
-        // where clauses
-        $this->_extra_where_sql = " WHERE {$this->datetime_table}.`DTT_EVT_start` > CURRENT_TIMESTAMP";
-        $this->_extra_where_sql .= " AND {$wpdb->posts}.`post_type` = 'espresso_events'";
-        $this->_extra_where_sql .= " AND {$wpdb->posts}.`post_status` = 'publish'";
-        $this->_extra_where_sql .= " AND {$this->datetime_table}.`DTT_deleted` = 0";
-        $this->group_by_clause  = " GROUP BY {$wpdb->posts}.`ID`";
-        parent::__construct();
-    }
-
-
-    /**
-     * SELECT `wp_posts`.`ID` FROM `wp_posts`
-     * JOIN `wp_esp_datetime` ON `wp_posts`.`ID` = `wp_esp_datetime`.`EVT_ID`
-     * WHERE `wp_esp_datetime`.`DTT_EVT_start` > CURRENT_TIMESTAMP
-     * AND `wp_posts`.`post_type` = 'espresso_events'
-     * AND `wp_posts`.`post_status` = 'publish'
-     * AND `wp_esp_datetime`.`DTT_deleted` = 0
-     * GROUP BY `wp_posts`.`ID`
-     * LIMIT 50;
-     *
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     * @global wpdb $wpdb
-     */
-    protected function getUpcomingEvents(): array
-    {
-        global $wpdb;
-        $SQL = <<<QUERY
+	// tables
+
+	/**
+	 * @var string
+	 */
+	protected $datetime_table;
+
+	/**
+	 * @var string
+	 */
+	protected $event_meta_table;
+
+	/**
+	 * @var string
+	 */
+	protected $event_question_group_table;
+
+	/**
+	 * @var string
+	 */
+	protected $question_group_table;
+
+	// clauses
+
+	/**
+	 * @var string
+	 */
+	protected $event_datetime_join_clause;
+
+	/**
+	 * @var string
+	 */
+	protected $event_question_group_join_clause;
+
+	/**
+	 * @var string
+	 */
+	protected $group_by_clause;
+
+
+	/**
+	 * Just initializes the status of the migration EE_DMS_4_12_0_Create_Default_Form_Sections
+	 */
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__('Create Default Form Sections', 'event_espresso');
+		// tables
+		global $wpdb;
+		$this->datetime_table             = $wpdb->prefix . 'esp_datetime';
+		$this->event_meta_table           = $wpdb->prefix . 'esp_event_meta';
+		$this->event_question_group_table = $wpdb->prefix . 'esp_event_question_group';
+		$this->question_group_table       = $wpdb->prefix . 'esp_question_group';
+		$this->_old_table                 = $this->event_question_group_table;
+		// plus $wpdb->posts for events
+
+		// join clauses
+		$this->event_datetime_join_clause       = " JOIN {$this->datetime_table}";
+		$this->event_datetime_join_clause       .= " ON {$wpdb->posts}.`ID` = {$this->datetime_table}.`EVT_ID`";
+		$this->event_question_group_join_clause = " JOIN {$this->event_question_group_table}";
+		$this->event_question_group_join_clause .= " ON {$wpdb->posts}.`ID` = {$this->event_question_group_table}.`EVT_ID`";
+
+		// where clauses
+		$this->_extra_where_sql = " WHERE {$this->datetime_table}.`DTT_EVT_start` > CURRENT_TIMESTAMP";
+		$this->_extra_where_sql .= " AND {$wpdb->posts}.`post_type` = 'espresso_events'";
+		$this->_extra_where_sql .= " AND {$wpdb->posts}.`post_status` = 'publish'";
+		$this->_extra_where_sql .= " AND {$this->datetime_table}.`DTT_deleted` = 0";
+		$this->group_by_clause  = " GROUP BY {$wpdb->posts}.`ID`";
+		parent::__construct();
+	}
+
+
+	/**
+	 * SELECT `wp_posts`.`ID` FROM `wp_posts`
+	 * JOIN `wp_esp_datetime` ON `wp_posts`.`ID` = `wp_esp_datetime`.`EVT_ID`
+	 * WHERE `wp_esp_datetime`.`DTT_EVT_start` > CURRENT_TIMESTAMP
+	 * AND `wp_posts`.`post_type` = 'espresso_events'
+	 * AND `wp_posts`.`post_status` = 'publish'
+	 * AND `wp_esp_datetime`.`DTT_deleted` = 0
+	 * GROUP BY `wp_posts`.`ID`
+	 * LIMIT 50;
+	 *
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 * @global wpdb $wpdb
+	 */
+	protected function getUpcomingEvents(): array
+	{
+		global $wpdb;
+		$SQL = <<<QUERY
 SELECT {$wpdb->posts}.`ID` FROM {$wpdb->posts}
 JOIN {$this->datetime_table} ON {$wpdb->posts}.`ID` = {$this->datetime_table}.`EVT_ID`
 WHERE {$this->datetime_table}.`DTT_EVT_start` > CURRENT_TIMESTAMP
@@ -106,82 +106,82 @@ 
 AND {$this->datetime_table}.`DTT_deleted` = 0
 GROUP BY {$wpdb->posts}.`ID`
 QUERY;
-        return $wpdb->get_results($SQL, ARRAY_A);
-    }
-
-
-    /**
-     * SELECT * FROM `wp_esp_event_question_group`
-     * JOIN `wp_esp_question_group` ON `wp_esp_event_question_group`.`QSG_ID` = `wp_esp_question_group`.`QSG_ID`
-     * WHERE `wp_esp_event_question_group`.`EVT_ID` IN (1, 2, 3, ...);
-     *
-     * @param array $EVT_IDs
-     * @param int   $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     * @global wpdb $wpdb
-     */
-    protected function getEventQuestionGroups(array $EVT_IDs, int $limit): array
-    {
-        // remove invalid event ids
-        $EVT_IDs = array_filter($EVT_IDs, 'absint');
-        // generate array of same length but filled with placeholders
-        $placeholders = array_fill(0, count($EVT_IDs), '%d');
-        // convert to string
-        $placeholders = implode(', ', $placeholders);
-        global $wpdb;
-        $SQL  = <<<QUERY
+		return $wpdb->get_results($SQL, ARRAY_A);
+	}
+
+
+	/**
+	 * SELECT * FROM `wp_esp_event_question_group`
+	 * JOIN `wp_esp_question_group` ON `wp_esp_event_question_group`.`QSG_ID` = `wp_esp_question_group`.`QSG_ID`
+	 * WHERE `wp_esp_event_question_group`.`EVT_ID` IN (1, 2, 3, ...);
+	 *
+	 * @param array $EVT_IDs
+	 * @param int   $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 * @global wpdb $wpdb
+	 */
+	protected function getEventQuestionGroups(array $EVT_IDs, int $limit): array
+	{
+		// remove invalid event ids
+		$EVT_IDs = array_filter($EVT_IDs, 'absint');
+		// generate array of same length but filled with placeholders
+		$placeholders = array_fill(0, count($EVT_IDs), '%d');
+		// convert to string
+		$placeholders = implode(', ', $placeholders);
+		global $wpdb;
+		$SQL  = <<<QUERY
 SELECT * FROM {$this->event_question_group_table}
 JOIN {$this->question_group_table} ON {$this->event_question_group_table}.`QSG_ID` = {$this->question_group_table}.`QSG_ID`
 WHERE {$this->event_question_group_table}.`EVT_ID` IN ({$placeholders})
 LIMIT %d;
 QUERY;
-        $args = $EVT_IDs;
-        array_push($args, $limit);
-        return $wpdb->get_results($wpdb->prepare($SQL, $args), ARRAY_A);
-    }
-
-
-    /**
-     * SELECT `wp_posts`.`ID`, `wp_esp_event_question_group`.`EQG_primary`, `wp_esp_event_question_group`.`EQG_additional`
-     * FROM `wp_posts`,
-     * JOIN `wp_esp_event_question_group` ON `wp_posts`.`ID` = `wp_esp_event_question_group`.`EVT_ID`
-     * JOIN `wp_esp_datetime` ON `wp_posts`.`ID` = `wp_esp_datetime`.`EVT_ID`
-     * WHERE `wp_esp_datetime`.`DTT_EVT_start` > CURRENT_TIMESTAMP
-     * AND `wp_posts`.`post_type` = 'espresso_events'
-     * AND `wp_posts`.`post_status` = 'publish'
-     * AND `wp_esp_datetime`.`DTT_deleted` = 0
-     * GROUP BY `wp_posts`.`ID`;
-     *
-     * @param int   $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     * @global wpdb $wpdb
-     */
-    protected function _get_rows($limit)
-    {
-        global $wpdb;
-        $query = "SELECT {$wpdb->posts}.`ID`";
-        $query .= ", {$wpdb->event_question_group_table}.`EQG_primary`";
-        $query .= ", {$wpdb->event_question_group_table}.`EQG_additional`";
-        $query .= " FROM {$wpdb->posts}";
-        $query .= $this->event_datetime_join_clause;
-        $query .= $this->event_question_group_join_clause;
-        $query .= $this->_extra_where_sql;
-        $query .= $this->group_by_clause;
-        $query .= ' LIMIT %d';
-        return $wpdb->get_results($wpdb->prepare($query, $limit), ARRAY_A);
-    }
-
-
-    /**
-     * Removes the duplicate event_question_group rows that only had EQG_primary=0. Now we just have one row
-     * joining event-to-question-groups with two columns: EQG_primary and EQG_additional, indicating which question
-     * groups apply to which category of registrant.
-     *
-     * @param array $old_row an associative array where keys are column names and values are their values.
-     * @return void
-     */
-    protected function _migrate_old_row($old_row)
-    {
-        \EEH_Debug_Tools::printr($old_row, '$old_row', __FILE__, __LINE__);
-    }
+		$args = $EVT_IDs;
+		array_push($args, $limit);
+		return $wpdb->get_results($wpdb->prepare($SQL, $args), ARRAY_A);
+	}
+
+
+	/**
+	 * SELECT `wp_posts`.`ID`, `wp_esp_event_question_group`.`EQG_primary`, `wp_esp_event_question_group`.`EQG_additional`
+	 * FROM `wp_posts`,
+	 * JOIN `wp_esp_event_question_group` ON `wp_posts`.`ID` = `wp_esp_event_question_group`.`EVT_ID`
+	 * JOIN `wp_esp_datetime` ON `wp_posts`.`ID` = `wp_esp_datetime`.`EVT_ID`
+	 * WHERE `wp_esp_datetime`.`DTT_EVT_start` > CURRENT_TIMESTAMP
+	 * AND `wp_posts`.`post_type` = 'espresso_events'
+	 * AND `wp_posts`.`post_status` = 'publish'
+	 * AND `wp_esp_datetime`.`DTT_deleted` = 0
+	 * GROUP BY `wp_posts`.`ID`;
+	 *
+	 * @param int   $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 * @global wpdb $wpdb
+	 */
+	protected function _get_rows($limit)
+	{
+		global $wpdb;
+		$query = "SELECT {$wpdb->posts}.`ID`";
+		$query .= ", {$wpdb->event_question_group_table}.`EQG_primary`";
+		$query .= ", {$wpdb->event_question_group_table}.`EQG_additional`";
+		$query .= " FROM {$wpdb->posts}";
+		$query .= $this->event_datetime_join_clause;
+		$query .= $this->event_question_group_join_clause;
+		$query .= $this->_extra_where_sql;
+		$query .= $this->group_by_clause;
+		$query .= ' LIMIT %d';
+		return $wpdb->get_results($wpdb->prepare($query, $limit), ARRAY_A);
+	}
+
+
+	/**
+	 * Removes the duplicate event_question_group rows that only had EQG_primary=0. Now we just have one row
+	 * joining event-to-question-groups with two columns: EQG_primary and EQG_additional, indicating which question
+	 * groups apply to which category of registrant.
+	 *
+	 * @param array $old_row an associative array where keys are column names and values are their values.
+	 * @return void
+	 */
+	protected function _migrate_old_row($old_row)
+	{
+		\EEH_Debug_Tools::printr($old_row, '$old_row', __FILE__, __LINE__);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -58,10 +58,10 @@ 
         $this->_pretty_name = esc_html__('Create Default Form Sections', 'event_espresso');
         // tables
         global $wpdb;
-        $this->datetime_table             = $wpdb->prefix . 'esp_datetime';
-        $this->event_meta_table           = $wpdb->prefix . 'esp_event_meta';
-        $this->event_question_group_table = $wpdb->prefix . 'esp_event_question_group';
-        $this->question_group_table       = $wpdb->prefix . 'esp_question_group';
+        $this->datetime_table             = $wpdb->prefix.'esp_datetime';
+        $this->event_meta_table           = $wpdb->prefix.'esp_event_meta';
+        $this->event_question_group_table = $wpdb->prefix.'esp_event_question_group';
+        $this->question_group_table       = $wpdb->prefix.'esp_question_group';
         $this->_old_table                 = $this->event_question_group_table;
         // plus $wpdb->posts for events
 
@@ -76,7 +76,7 @@ 
         $this->_extra_where_sql .= " AND {$wpdb->posts}.`post_type` = 'espresso_events'";
         $this->_extra_where_sql .= " AND {$wpdb->posts}.`post_status` = 'publish'";
         $this->_extra_where_sql .= " AND {$this->datetime_table}.`DTT_deleted` = 0";
-        $this->group_by_clause  = " GROUP BY {$wpdb->posts}.`ID`";
+        $this->group_by_clause = " GROUP BY {$wpdb->posts}.`ID`";
         parent::__construct();
     }
 
@@ -129,7 +129,7 @@ 
         // convert to string
         $placeholders = implode(', ', $placeholders);
         global $wpdb;
-        $SQL  = <<<QUERY
+        $SQL = <<<QUERY
 SELECT * FROM {$this->event_question_group_table}
 JOIN {$this->question_group_table} ON {$this->event_question_group_table}.`QSG_ID` = {$this->question_group_table}.`QSG_ID`
 WHERE {$this->event_question_group_table}.`EVT_ID` IN ({$placeholders})

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Indentation +461 added lines, -461 removed lines

@@ -20,465 +20,465 @@
  */
 class EE_SPCO_Reg_Step_Attendee_Information extends EE_SPCO_Reg_Step
 {
-    /**
-     * @var RegFormFactory
-     */
-    protected $reg_form_factory;
-
-    /**
-     * @var string
-     */
-    protected $reg_form_factory_version = RegFormFactory::VERSION_2;
-
-
-    /**
-     *    class constructor
-     *
-     * @access    public
-     * @param EE_Checkout $checkout
-     */
-    public function __construct(EE_Checkout $checkout)
-    {
-        $this->_slug    = 'attendee_information';
-        $this->_name    = esc_html__('Attendee Information', 'event_espresso');
-        $this->checkout = $checkout;
-        $this->_reset_success_message();
-        $this->set_instructions(
-            esc_html__('Please answer the following registration questions before proceeding.', 'event_espresso')
-        );
-        $this->reg_form_factory = new RegFormFactory($this->reg_form_factory_version);
-    }
-
-
-    public function translate_js_strings()
-    {
-        EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
-            ' is a required question.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
-            ' is a required question. Please enter a value for at least one of the options.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['answer_required_questions'] = esc_html__(
-            'Please answer all required questions correctly before proceeding.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
-            esc_html_x(
-                'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
-                'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
-                'event_espresso'
-            ),
-            '<br/>'
-        );
-        EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
-            'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
-            'You must enter a valid email address.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['valid_email_and_questions'] = esc_html__(
-            'You must enter a valid email address and answer all other required questions before you can proceed.',
-            'event_espresso'
-        );
-    }
-
-
-    public function enqueue_styles_and_scripts()
-    {
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function initialize_reg_step(): bool
-    {
-        return true;
-    }
-
-
-    /**
-     * @return FormSectionProperInterface
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_reg_form(): FormSectionProperInterface
-    {
-        return $this->reg_form_factory->getRegForm([$this]);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::getRegForm()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _registrations_reg_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalAttendeeRegInfoInput()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _additional_attendee_reg_info_input()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupRegForm()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _question_group_reg_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupHeader()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _question_group_header()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
-     *
-     * @deprecated   $VID:$
-     */
-    private function _copy_attendee_info_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\AutoCopyAttendeeInfoForm
-     *
-     * @deprecated   $VID:$
-     */
-    private function _auto_copy_attendee_info()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
-     *
-     * @deprecated   $VID:$
-     */
-    private function _copy_attendee_info_inputs()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalPrimaryRegistrantInputs()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _additional_primary_registrant_inputs()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory::create()
-     *
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   $VID:$
-     */
-    public function reg_form_question(EE_Registration $registration, EE_Question $question): EE_Form_Input_Base
-    {
-        /** @var RegFormQuestionFactory $reg_form_question_factory */
-        $reg_form_question_factory = LoaderFactory::getShared(RegFormQuestionFactory::class);
-        return $reg_form_question_factory->create($registration, $question);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::generateQuestionInput()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _generate_question_input()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CountryOptions::forLegacyFormInput()
-     *
-     * @param array|null           $countries_list
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer
-     * @return array 2d keys are country IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   $VID:$
-     */
-    public function use_cached_countries_for_form_input(
-        array $countries_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        /** @var CountryOptions $country_options */
-        $country_options = LoaderFactory::getShared(CountryOptions::class, [$this->checkout->action]);
-        return $country_options->forLegacyFormInput($countries_list, $question, $registration, $answer);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\StateOptions::forLegacyFormInput()
-     *
-     * @param array|null           $states_list
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer
-     * @return array 2d keys are state IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   $VID:$
-     */
-    public function use_cached_states_for_form_input(
-        array $states_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        /** @var StateOptions $state_options */
-        $state_options = LoaderFactory::getShared(StateOptions::class, [$this->checkout->action]);
-        return $state_options->forLegacyFormInput($states_list, $question, $registration, $answer);
-    }
-
-
-    /********************************************************************************************************/
-    /****************************************  PROCESS REG STEP  ****************************************/
-    /********************************************************************************************************/
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function process_reg_step(): bool
-    {
-        // grab validated data from form
-        $valid_data = $this->checkout->current_step->valid_data();
-        // if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-        if (empty($valid_data)) {
-            return $this->inValidDataError();
-        }
-        if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
-            return $this->inValidTransactionError();
-        }
-        // get cached registrations
-        $registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
-        // verify we got the goods
-        if (empty($registrations)) {
-            return $this->noRegistrationsError();
-        }
-        $reg_form_handler = $this->reg_form_factory->getRegFormHandler($this->checkout);
-        // extract attendee info from form data and save to model objects
-        if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
-            // return immediately if the previous step exited early due to errors
-            return false;
-        }
-        // if first pass thru SPCO,
-        // then let's check processed registrations against the total number of tickets in the cart
-        $registrations_processed = $reg_form_handler->attendeeCount();
-        if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
-            return $this->registrationProcessingError($registrations_processed);
-        }
-        // mark this reg step as completed
-        $this->set_completed();
-        $this->_set_success_message(
-            esc_html__('The Attendee Information Step has been successfully completed.', 'event_espresso')
-        );
-        // do action in case a plugin wants to do something with the data submitted in step 1.
-        // passes EE_Single_Page_Checkout, and it's posted data
-        do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
-        return true;
-    }
-
-
-    /**
-     * @return bool
-     * @since   $VID:$
-     */
-    private function inValidDataError(): bool
-    {
-        EE_Error::add_error(
-            esc_html__('No valid question responses were received.', 'event_espresso'),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @return bool
-     * @since   $VID:$
-     */
-    private function inValidTransactionError(): bool
-    {
-        EE_Error::add_error(
-            esc_html__(
-                'A valid transaction could not be initiated for processing your registrations.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @return bool
-     * @since   $VID:$
-     */
-    private function noRegistrationsError(): bool
-    {
-        // combine the old translated string with a new one, in order to not break translations
-        $error_message = esc_html__(
-            'Your form data could not be applied to any valid registrations.',
-            'event_espresso'
-        );
-        $error_message .= sprintf(
-            esc_html_x(
-                '%3$sThis can sometimes happen if too much time has been taken to complete the registration process.%3$sPlease return to the %1$sEvent List%2$s and reselect your tickets. If the problem continues, please contact the site administrator.',
-                '(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
-                'event_espresso'
-            ),
-            '<a href="' . get_post_type_archive_link('espresso_events') . '" >',
-            '</a>',
-            '<br />'
-        );
-        EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
-        return false;
-    }
-
-
-    /**
-     * @param int $registrations_processed
-     * @return bool
-     * @since   $VID:$
-     */
-    private function registrationProcessingError(int $registrations_processed): bool
-    {
-        // generate a correctly translated string for all possible singular/plural combinations
-        if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
-            $error_msg = sprintf(
-                esc_html_x(
-                    'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
-                    'There was 1 ticket in the Event Queue, but 2 registrations were processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        } elseif ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
-            $error_msg = sprintf(
-                esc_html_x(
-                    'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
-                    'There was a total of 2 tickets in the Event Queue, but only 1 registration was processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        } else {
-            $error_msg = sprintf(
-                esc_html__(
-                    'There was a total of 2 tickets in the Event Queue, but 2 registrations were processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        }
-        EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
-        return false;
-    }
-
-
-    /**
-     *    update_reg_step
-     *    this is the final step after a user  revisits the site to edit their attendee information
-     *    this gets called AFTER the process_reg_step() method above
-     *
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function update_reg_step(): bool
-    {
-        // save everything
-        if ($this->process_reg_step()) {
-            $this->checkout->redirect     = true;
-            $this->checkout->redirect_url = add_query_arg(
-                [
-                    'e_reg_url_link' => $this->checkout->reg_url_link,
-                    'revisit'        => true,
-                ],
-                $this->checkout->thank_you_page_url
-            );
-            $this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * @var RegFormFactory
+	 */
+	protected $reg_form_factory;
+
+	/**
+	 * @var string
+	 */
+	protected $reg_form_factory_version = RegFormFactory::VERSION_2;
+
+
+	/**
+	 *    class constructor
+	 *
+	 * @access    public
+	 * @param EE_Checkout $checkout
+	 */
+	public function __construct(EE_Checkout $checkout)
+	{
+		$this->_slug    = 'attendee_information';
+		$this->_name    = esc_html__('Attendee Information', 'event_espresso');
+		$this->checkout = $checkout;
+		$this->_reset_success_message();
+		$this->set_instructions(
+			esc_html__('Please answer the following registration questions before proceeding.', 'event_espresso')
+		);
+		$this->reg_form_factory = new RegFormFactory($this->reg_form_factory_version);
+	}
+
+
+	public function translate_js_strings()
+	{
+		EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
+			' is a required question.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
+			' is a required question. Please enter a value for at least one of the options.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['answer_required_questions'] = esc_html__(
+			'Please answer all required questions correctly before proceeding.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
+			esc_html_x(
+				'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
+				'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
+				'event_espresso'
+			),
+			'<br/>'
+		);
+		EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
+			'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
+			'You must enter a valid email address.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = esc_html__(
+			'You must enter a valid email address and answer all other required questions before you can proceed.',
+			'event_espresso'
+		);
+	}
+
+
+	public function enqueue_styles_and_scripts()
+	{
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function initialize_reg_step(): bool
+	{
+		return true;
+	}
+
+
+	/**
+	 * @return FormSectionProperInterface
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_reg_form(): FormSectionProperInterface
+	{
+		return $this->reg_form_factory->getRegForm([$this]);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::getRegForm()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _registrations_reg_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalAttendeeRegInfoInput()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _additional_attendee_reg_info_input()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupRegForm()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _question_group_reg_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupHeader()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _question_group_header()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _copy_attendee_info_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\AutoCopyAttendeeInfoForm
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _auto_copy_attendee_info()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _copy_attendee_info_inputs()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalPrimaryRegistrantInputs()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _additional_primary_registrant_inputs()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory::create()
+	 *
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   $VID:$
+	 */
+	public function reg_form_question(EE_Registration $registration, EE_Question $question): EE_Form_Input_Base
+	{
+		/** @var RegFormQuestionFactory $reg_form_question_factory */
+		$reg_form_question_factory = LoaderFactory::getShared(RegFormQuestionFactory::class);
+		return $reg_form_question_factory->create($registration, $question);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::generateQuestionInput()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _generate_question_input()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CountryOptions::forLegacyFormInput()
+	 *
+	 * @param array|null           $countries_list
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer
+	 * @return array 2d keys are country IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   $VID:$
+	 */
+	public function use_cached_countries_for_form_input(
+		array $countries_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		/** @var CountryOptions $country_options */
+		$country_options = LoaderFactory::getShared(CountryOptions::class, [$this->checkout->action]);
+		return $country_options->forLegacyFormInput($countries_list, $question, $registration, $answer);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\StateOptions::forLegacyFormInput()
+	 *
+	 * @param array|null           $states_list
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer
+	 * @return array 2d keys are state IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   $VID:$
+	 */
+	public function use_cached_states_for_form_input(
+		array $states_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		/** @var StateOptions $state_options */
+		$state_options = LoaderFactory::getShared(StateOptions::class, [$this->checkout->action]);
+		return $state_options->forLegacyFormInput($states_list, $question, $registration, $answer);
+	}
+
+
+	/********************************************************************************************************/
+	/****************************************  PROCESS REG STEP  ****************************************/
+	/********************************************************************************************************/
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function process_reg_step(): bool
+	{
+		// grab validated data from form
+		$valid_data = $this->checkout->current_step->valid_data();
+		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
+		if (empty($valid_data)) {
+			return $this->inValidDataError();
+		}
+		if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+			return $this->inValidTransactionError();
+		}
+		// get cached registrations
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		// verify we got the goods
+		if (empty($registrations)) {
+			return $this->noRegistrationsError();
+		}
+		$reg_form_handler = $this->reg_form_factory->getRegFormHandler($this->checkout);
+		// extract attendee info from form data and save to model objects
+		if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
+			// return immediately if the previous step exited early due to errors
+			return false;
+		}
+		// if first pass thru SPCO,
+		// then let's check processed registrations against the total number of tickets in the cart
+		$registrations_processed = $reg_form_handler->attendeeCount();
+		if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
+			return $this->registrationProcessingError($registrations_processed);
+		}
+		// mark this reg step as completed
+		$this->set_completed();
+		$this->_set_success_message(
+			esc_html__('The Attendee Information Step has been successfully completed.', 'event_espresso')
+		);
+		// do action in case a plugin wants to do something with the data submitted in step 1.
+		// passes EE_Single_Page_Checkout, and it's posted data
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
+		return true;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function inValidDataError(): bool
+	{
+		EE_Error::add_error(
+			esc_html__('No valid question responses were received.', 'event_espresso'),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function inValidTransactionError(): bool
+	{
+		EE_Error::add_error(
+			esc_html__(
+				'A valid transaction could not be initiated for processing your registrations.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function noRegistrationsError(): bool
+	{
+		// combine the old translated string with a new one, in order to not break translations
+		$error_message = esc_html__(
+			'Your form data could not be applied to any valid registrations.',
+			'event_espresso'
+		);
+		$error_message .= sprintf(
+			esc_html_x(
+				'%3$sThis can sometimes happen if too much time has been taken to complete the registration process.%3$sPlease return to the %1$sEvent List%2$s and reselect your tickets. If the problem continues, please contact the site administrator.',
+				'(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
+				'event_espresso'
+			),
+			'<a href="' . get_post_type_archive_link('espresso_events') . '" >',
+			'</a>',
+			'<br />'
+		);
+		EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	 * @param int $registrations_processed
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function registrationProcessingError(int $registrations_processed): bool
+	{
+		// generate a correctly translated string for all possible singular/plural combinations
+		if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
+			$error_msg = sprintf(
+				esc_html_x(
+					'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
+					'There was 1 ticket in the Event Queue, but 2 registrations were processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		} elseif ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
+			$error_msg = sprintf(
+				esc_html_x(
+					'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
+					'There was a total of 2 tickets in the Event Queue, but only 1 registration was processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		} else {
+			$error_msg = sprintf(
+				esc_html__(
+					'There was a total of 2 tickets in the Event Queue, but 2 registrations were processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		}
+		EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	 *    update_reg_step
+	 *    this is the final step after a user  revisits the site to edit their attendee information
+	 *    this gets called AFTER the process_reg_step() method above
+	 *
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function update_reg_step(): bool
+	{
+		// save everything
+		if ($this->process_reg_step()) {
+			$this->checkout->redirect     = true;
+			$this->checkout->redirect_url = add_query_arg(
+				[
+					'e_reg_url_link' => $this->checkout->reg_url_link,
+					'revisit'        => true,
+				],
+				$this->checkout->thank_you_page_url
+			);
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
+			return true;
+		}
+		return false;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -52,11 +52,11 @@ 
 
     public function translate_js_strings()
     {
-        EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
+        EE_Registry::$i18n_js_strings['required_field'] = esc_html__(
             ' is a required question.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
+        EE_Registry::$i18n_js_strings['required_multi_field'] = esc_html__(
             ' is a required question. Please enter a value for at least one of the options.',
             'event_espresso'
         );
@@ -64,7 +64,7 @@ 
             'Please answer all required questions correctly before proceeding.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
+        EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(
             esc_html_x(
                 'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
                 'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
@@ -72,11 +72,11 @@ 
             ),
             '<br/>'
         );
-        EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
+        EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = esc_html__(
             'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
+        EE_Registry::$i18n_js_strings['enter_valid_email'] = esc_html__(
             'You must enter a valid email address.',
             'event_espresso'
         );
@@ -314,7 +314,7 @@ 
         if (empty($valid_data)) {
             return $this->inValidDataError();
         }
-        if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+        if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
             return $this->inValidTransactionError();
         }
         // get cached registrations
@@ -325,14 +325,14 @@ 
         }
         $reg_form_handler = $this->reg_form_factory->getRegFormHandler($this->checkout);
         // extract attendee info from form data and save to model objects
-        if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
+        if ( ! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
             // return immediately if the previous step exited early due to errors
             return false;
         }
         // if first pass thru SPCO,
         // then let's check processed registrations against the total number of tickets in the cart
         $registrations_processed = $reg_form_handler->attendeeCount();
-        if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
+        if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
             return $this->registrationProcessingError($registrations_processed);
         }
         // mark this reg step as completed
@@ -399,7 +399,7 @@ 
                 '(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
                 'event_espresso'
             ),
-            '<a href="' . get_post_type_archive_link('espresso_events') . '" >',
+            '<a href="'.get_post_type_archive_link('espresso_events').'" >',
             '</a>',
             '<br />'
         );