eventespresso / event-espresso-core

core/services/form/meta/inputs/Button.php

Indentation +45 added lines, -45 removed lines

@@ -4,49 +4,49 @@
 
 class Button
 {
-    /**
-     * indicates that the HTML input type is 'button'
-     */
-    public const TYPE_BUTTON = 'button';
-
-    /**
-     * indicates that the HTML input type is 'reset'
-     */
-    public const TYPE_BUTTON_RESET = 'reset';
-
-    /**
-     * indicates that the HTML input type is 'submit'
-     */
-    public const TYPE_BUTTON_SUBMIT = 'submit';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Button__valid_type_options',
-            [
-                Button::TYPE_BUTTON        => esc_html__('Button', 'event_espresso'),
-                Button::TYPE_BUTTON_RESET  => esc_html__('Reset Button', 'event_espresso'),
-                Button::TYPE_BUTTON_SUBMIT => esc_html__('Submit Button', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'button'
+	 */
+	public const TYPE_BUTTON = 'button';
+
+	/**
+	 * indicates that the HTML input type is 'reset'
+	 */
+	public const TYPE_BUTTON_RESET = 'reset';
+
+	/**
+	 * indicates that the HTML input type is 'submit'
+	 */
+	public const TYPE_BUTTON_SUBMIT = 'submit';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Button__valid_type_options',
+			[
+				Button::TYPE_BUTTON        => esc_html__('Button', 'event_espresso'),
+				Button::TYPE_BUTTON_RESET  => esc_html__('Reset Button', 'event_espresso'),
+				Button::TYPE_BUTTON_SUBMIT => esc_html__('Submit Button', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/DateTime.php

Indentation +77 added lines, -77 removed lines

@@ -5,81 +5,81 @@
 class DateTime
 {
 
-    /**
-     * indicates that the HTML input type is 'date'
-     */
-    public const TYPE_DATE = 'date';
-
-    /**
-     * indicates that the HTML input type is 'datetime-local'
-     */
-    public const TYPE_DATETIME_LOCAL = 'datetime-local';
-
-    /**
-     * indicates that the HTML input type is 'month'
-     */
-    public const TYPE_MONTH = 'month';
-
-    /**
-     * indicates that the HTML input type is 'time'
-     */
-    public const TYPE_TIME = 'time';
-
-    /**
-     * indicates that the HTML input type is 'week'
-     */
-    public const TYPE_WEEK = 'week';
-
-    // CUSTOM EE DATE TYPES
-
-    /**
-     * indicates that the input is an HTML dropdown used for selecting the day for a date
-     */
-    public const TYPE_SELECT_DAY = 'day-select';
-
-    /**
-     * indicates that the input is an HTML dropdown used for selecting the month for a date
-     */
-    public const TYPE_SELECT_MONTH = 'month-select';
-
-    /**
-     * indicates that the input is an HTML dropdown used for selecting the year for a date
-     */
-    public const TYPE_SELECT_YEAR = 'year-select';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_DateTime__valid_type_options',
-            [
-                DateTime::TYPE_DATE           => esc_html__('Date Picker', 'event_espresso'),
-                DateTime::TYPE_DATETIME_LOCAL => esc_html__('Local Date Picker', 'event_espresso'),
-                DateTime::TYPE_MONTH          => esc_html__('Month Picker', 'event_espresso'),
-                DateTime::TYPE_TIME           => esc_html__('Time Picker', 'event_espresso'),
-                DateTime::TYPE_WEEK           => esc_html__('Week Picker', 'event_espresso'),
-                DateTime::TYPE_SELECT_DAY     => esc_html__('Day Selector', 'event_espresso'),
-                DateTime::TYPE_SELECT_MONTH   => esc_html__('Month Selector', 'event_espresso'),
-                DateTime::TYPE_SELECT_YEAR    => esc_html__('Year Selector', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'date'
+	 */
+	public const TYPE_DATE = 'date';
+
+	/**
+	 * indicates that the HTML input type is 'datetime-local'
+	 */
+	public const TYPE_DATETIME_LOCAL = 'datetime-local';
+
+	/**
+	 * indicates that the HTML input type is 'month'
+	 */
+	public const TYPE_MONTH = 'month';
+
+	/**
+	 * indicates that the HTML input type is 'time'
+	 */
+	public const TYPE_TIME = 'time';
+
+	/**
+	 * indicates that the HTML input type is 'week'
+	 */
+	public const TYPE_WEEK = 'week';
+
+	// CUSTOM EE DATE TYPES
+
+	/**
+	 * indicates that the input is an HTML dropdown used for selecting the day for a date
+	 */
+	public const TYPE_SELECT_DAY = 'day-select';
+
+	/**
+	 * indicates that the input is an HTML dropdown used for selecting the month for a date
+	 */
+	public const TYPE_SELECT_MONTH = 'month-select';
+
+	/**
+	 * indicates that the input is an HTML dropdown used for selecting the year for a date
+	 */
+	public const TYPE_SELECT_YEAR = 'year-select';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_DateTime__valid_type_options',
+			[
+				DateTime::TYPE_DATE           => esc_html__('Date Picker', 'event_espresso'),
+				DateTime::TYPE_DATETIME_LOCAL => esc_html__('Local Date Picker', 'event_espresso'),
+				DateTime::TYPE_MONTH          => esc_html__('Month Picker', 'event_espresso'),
+				DateTime::TYPE_TIME           => esc_html__('Time Picker', 'event_espresso'),
+				DateTime::TYPE_WEEK           => esc_html__('Week Picker', 'event_espresso'),
+				DateTime::TYPE_SELECT_DAY     => esc_html__('Day Selector', 'event_espresso'),
+				DateTime::TYPE_SELECT_MONTH   => esc_html__('Month Selector', 'event_espresso'),
+				DateTime::TYPE_SELECT_YEAR    => esc_html__('Year Selector', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Number.php

Indentation +45 added lines, -45 removed lines

@@ -5,49 +5,49 @@
 class Number
 {
 
-    /**
-     * indicates that the HTML input type is 'number' whose value is a decimal (float)
-     */
-    public const TYPE_FLOAT = 'decimal';
-
-    /**
-     * indicates that the HTML input type is 'number' whose value is an integer (whole number)
-     */
-    public const TYPE_INT = 'integer';
-
-    /**
-     * indicates that the HTML input type is 'range'
-     */
-    public const TYPE_RANGE = 'range';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Number__valid_type_options',
-            [
-                Number::TYPE_FLOAT => esc_html__('Decimal Number', 'event_espresso'),
-                Number::TYPE_INT   => esc_html__('Integer (Whole) Number', 'event_espresso'),
-                Number::TYPE_RANGE => esc_html__('Number Range', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'number' whose value is a decimal (float)
+	 */
+	public const TYPE_FLOAT = 'decimal';
+
+	/**
+	 * indicates that the HTML input type is 'number' whose value is an integer (whole number)
+	 */
+	public const TYPE_INT = 'integer';
+
+	/**
+	 * indicates that the HTML input type is 'range'
+	 */
+	public const TYPE_RANGE = 'range';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Number__valid_type_options',
+			[
+				Number::TYPE_FLOAT => esc_html__('Decimal Number', 'event_espresso'),
+				Number::TYPE_INT   => esc_html__('Integer (Whole) Number', 'event_espresso'),
+				Number::TYPE_RANGE => esc_html__('Number Range', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Select.php

Indentation +55 added lines, -55 removed lines

@@ -5,59 +5,59 @@
 class Select
 {
 
-    /**
-     * indicates that the input is an HTML dropdown (select input) that accepts only one value
-     */
-    public const TYPE_SELECT = 'select';
-
-    /**
-     * indicates that the input is an HTML dropdown (select input) that accepts multiple values
-     */
-    public const TYPE_SELECT_MULTI = 'select-multi';
-
-    // CUSTOM EE SELECT TYPES
-
-    /**
-     * indicates that input is an HTML dropdown (select input)
-     * populated with names of countries that are enabled for the site
-     */
-    public const TYPE_SELECT_COUNTRY = 'select-country';
-
-    /**
-     * indicates that the input is an HTML dropdown (select input)
-     * populated with names of states for the countries that are enabled for the site
-     */
-    public const TYPE_SELECT_STATE = 'select-state';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Select__valid_type_options',
-            [
-                Select::TYPE_SELECT         => esc_html__('Dropdown', 'event_espresso'),
-                Select::TYPE_SELECT_MULTI   => esc_html__('Multi-Select Dropdown', 'event_espresso'),
-                Select::TYPE_SELECT_COUNTRY => esc_html__('Country Selector', 'event_espresso'),
-                Select::TYPE_SELECT_STATE   => esc_html__('State Selector', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the input is an HTML dropdown (select input) that accepts only one value
+	 */
+	public const TYPE_SELECT = 'select';
+
+	/**
+	 * indicates that the input is an HTML dropdown (select input) that accepts multiple values
+	 */
+	public const TYPE_SELECT_MULTI = 'select-multi';
+
+	// CUSTOM EE SELECT TYPES
+
+	/**
+	 * indicates that input is an HTML dropdown (select input)
+	 * populated with names of countries that are enabled for the site
+	 */
+	public const TYPE_SELECT_COUNTRY = 'select-country';
+
+	/**
+	 * indicates that the input is an HTML dropdown (select input)
+	 * populated with names of states for the countries that are enabled for the site
+	 */
+	public const TYPE_SELECT_STATE = 'select-state';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Select__valid_type_options',
+			[
+				Select::TYPE_SELECT         => esc_html__('Dropdown', 'event_espresso'),
+				Select::TYPE_SELECT_MULTI   => esc_html__('Multi-Select Dropdown', 'event_espresso'),
+				Select::TYPE_SELECT_COUNTRY => esc_html__('Country Selector', 'event_espresso'),
+				Select::TYPE_SELECT_STATE   => esc_html__('State Selector', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Phone.php

Indentation +93 added lines, -93 removed lines

@@ -5,109 +5,109 @@
 class Phone
 {
 
-    /**
-     * indicates that the HTML input type is 'tel'
-     */
-    public const INPUT_TYPE = 'tel';
+	/**
+	 * indicates that the HTML input type is 'tel'
+	 */
+	public const INPUT_TYPE = 'tel';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a US formatted phone number, examples:
-     *      ##########
-     *      ###-###-####
-     *      ### ### ####
-     *      (###)-###-####
-     *      (###) ###-####
-     *
-     * captures the intl code to the first group (+1) and the rest of the number to group 2
-     *      +1 (###) ###-####
-     */
-    public const PATTERN_US = '(\+?\d{1,3})?[\ \-]?(\(?\d{3}\)?[\ \-]?\d{3}[\ \-]?\d{4})';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a US formatted phone number, examples:
+	 *      ##########
+	 *      ###-###-####
+	 *      ### ### ####
+	 *      (###)-###-####
+	 *      (###) ###-####
+	 *
+	 * captures the intl code to the first group (+1) and the rest of the number to group 2
+	 *      +1 (###) ###-####
+	 */
+	public const PATTERN_US = '(\+?\d{1,3})?[\ \-]?(\(?\d{3}\)?[\ \-]?\d{3}[\ \-]?\d{4})';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a UK formatted phone number, examples:
-     *      (###) #### ####
-     *      (####) ### ####
-     *      (#####) ## ####
-     *
-     * captures the intl code to the first group (+44) and the rest of the number to group 2
-     *      +44 (###) #### ####
-     */
-    public const PATTERN_UK = '(\+?44)?[\ ]?(\(?(?:(?:\d{3,5})|(?:\d{4} \d{2}))\)?[\-\ ]?\d{2,4}[\-\ ]?\d{2,4})';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a UK formatted phone number, examples:
+	 *      (###) #### ####
+	 *      (####) ### ####
+	 *      (#####) ## ####
+	 *
+	 * captures the intl code to the first group (+44) and the rest of the number to group 2
+	 *      +44 (###) #### ####
+	 */
+	public const PATTERN_UK = '(\+?44)?[\ ]?(\(?(?:(?:\d{3,5})|(?:\d{4} \d{2}))\)?[\-\ ]?\d{2,4}[\-\ ]?\d{2,4})';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a France formatted phone number, examples:
-     *      0# ## ## ## ##
-     *      0### ## ## ##
-     *
-     * captures the intl code to the first group (+33) and the rest of the number to group 2
-     *      +33 # ## ## ## ##
-     *      0033 # ## ## ## ##
-     */
-    public const PATTERN_FR = '((?:\+|00)33)?[\ \.\-]*((?:(?:\(0\)[\ \.\-]{0,3})?|0)[1-9](?:(?:[\ \.\-]?\d{2}){4}|\d{2}(?:[\ \.\-]?\d{3}){2}))';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a France formatted phone number, examples:
+	 *      0# ## ## ## ##
+	 *      0### ## ## ##
+	 *
+	 * captures the intl code to the first group (+33) and the rest of the number to group 2
+	 *      +33 # ## ## ## ##
+	 *      0033 # ## ## ## ##
+	 */
+	public const PATTERN_FR = '((?:\+|00)33)?[\ \.\-]*((?:(?:\(0\)[\ \.\-]{0,3})?|0)[1-9](?:(?:[\ \.\-]?\d{2}){4}|\d{2}(?:[\ \.\-]?\d{3}){2}))';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a German formatted phone number, examples:
-     *      (0##) ####-####
-     *      (0###) ####-####
-     *      (0####) ###-####
-     *      (03####) ##-####
-     *
-     * captures the intl code to the first group (+49) and the rest of the number to group 2
-     *      +49 (0##) ####-####
-     */
-    public const PATTERN_DE = '(\+?49)?[\ \.\-]?(\(?(?:[\d \-\)\–\/\(]+){6,}\)?(?:[\ \.\-–\/]?)(?:[\d]+))';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a German formatted phone number, examples:
+	 *      (0##) ####-####
+	 *      (0###) ####-####
+	 *      (0####) ###-####
+	 *      (03####) ##-####
+	 *
+	 * captures the intl code to the first group (+49) and the rest of the number to group 2
+	 *      +49 (0##) ####-####
+	 */
+	public const PATTERN_DE = '(\+?49)?[\ \.\-]?(\(?(?:[\d \-\)\–\/\(]+){6,}\)?(?:[\ \.\-–\/]?)(?:[\d]+))';
 
-    /**
-     * @var array
-     */
-    private $regex_patterns;
+	/**
+	 * @var array
+	 */
+	private $regex_patterns;
 
-    /**
-     * @var array
-     */
-    private $valid_type_options;
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
 
 
-    /**
-     * Phone constructor.
-     */
-    public function __construct()
-    {
-        $this->regex_patterns     = (array) apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__regex_patterns',
-            [
-                'de_DE' => Phone::PATTERN_DE,
-                'fr_FR' => Phone::PATTERN_FR,
-                'en_UK' => Phone::PATTERN_UK,
-                'en_US' => Phone::PATTERN_US,
-            ]
-        );
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__valid_type_options',
-            [
-                Phone::INPUT_TYPE => esc_html__('Phone Number', 'event_espresso'),
-            ]
-        );
-    }
+	/**
+	 * Phone constructor.
+	 */
+	public function __construct()
+	{
+		$this->regex_patterns     = (array) apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__regex_patterns',
+			[
+				'de_DE' => Phone::PATTERN_DE,
+				'fr_FR' => Phone::PATTERN_FR,
+				'en_UK' => Phone::PATTERN_UK,
+				'en_US' => Phone::PATTERN_US,
+			]
+		);
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__valid_type_options',
+			[
+				Phone::INPUT_TYPE => esc_html__('Phone Number', 'event_espresso'),
+			]
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function regexPatterns(): array
-    {
-        return $this->regex_patterns;
-    }
+	/**
+	 * @return array
+	 */
+	public function regexPatterns(): array
+	{
+		return $this->regex_patterns;
+	}
 
 
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
      */
     public function __construct()
     {
-        $this->regex_patterns     = (array) apply_filters(
+        $this->regex_patterns = (array) apply_filters(
             'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__regex_patterns',
             [
                 'de_DE' => Phone::PATTERN_DE,

core/services/orm/ModelFieldFactory.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
         bool $nullable = false,
         string $default_value = EE_Datetime_Field::now
     ): EE_Datetime_Field {
-        return $this->loader->getNew('EE_Datetime_Field', [$table_column, $nice_name, $nullable, $default_value,]);
+        return $this->loader->getNew('EE_Datetime_Field', [$table_column, $nice_name, $nullable, $default_value, ]);
     }
 
 

Indentation +614 added lines, -614 removed lines

@@ -46,618 +46,618 @@
  */
 class ModelFieldFactory
 {
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
-
-
-    /**
-     * ModelFieldFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_All_Caps_Text_Field
-     */
-    public function createAllCapsTextField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_All_Caps_Text_Field {
-        return $this->loader->getNew(
-            'EE_All_Caps_Text_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Any_Foreign_Model_Name_Field
-     */
-    public function createAnyForeignModelNameField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null,
-        string $model_name = ''
-    ): EE_Any_Foreign_Model_Name_Field {
-        return $this->loader->getNew(
-            'EE_Any_Foreign_Model_Name_Field',
-            [$table_column, $nice_name, $nullable, $default_value, $model_name]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Boolean_Field
-     */
-    public function createBooleanField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Boolean_Field {
-        return $this->loader->getNew(
-            'EE_Boolean_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param string $default_value
-     * @return EE_Datetime_Field
-     */
-    public function createDatetimeField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable = false,
-        string $default_value = EE_Datetime_Field::now
-    ): EE_Datetime_Field {
-        return $this->loader->getNew('EE_Datetime_Field', [$table_column, $nice_name, $nullable, $default_value,]);
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Float_Field
-     */
-    public function createDbOnlyFloatField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_DB_Only_Float_Field {
-        return $this->loader->getNew(
-            'EE_DB_Only_Float_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Int_Field
-     */
-    public function createDbOnlyIntField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_DB_Only_Int_Field {
-        return $this->loader->getNew(
-            'EE_DB_Only_Int_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Text_Field
-     */
-    public function createDbOnlyTextField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_DB_Only_Text_Field {
-        return $this->loader->getNew(
-            'EE_DB_Only_Text_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string      $table_column
-     * @param string      $nice_name
-     * @param bool        $nullable
-     * @param string|null $default_value
-     * @return EE_Email_Field
-     */
-    public function createEmailField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable = true,
-        string $default_value = ''
-    ): EE_Email_Field {
-        return $this->loader->getNew(
-            'EE_Email_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param array  $allowed_enum_values keys are values to be used in the DB,
-     *                                    values are how they should be displayed
-     * @return EE_Enum_Integer_Field
-     */
-    public function createEnumIntegerField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null,
-        array $allowed_enum_values = []
-    ): EE_Enum_Integer_Field {
-        return $this->loader->getNew(
-            'EE_Enum_Integer_Field',
-            [$table_column, $nice_name, $nullable, $default_value, $allowed_enum_values]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param array  $allowed_enum_values keys are values to be used in the DB,
-     *                                    values are how they should be displayed
-     * @return EE_Enum_Text_Field
-     */
-    public function createEnumTextField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value,
-        array $allowed_enum_values
-    ): EE_Enum_Text_Field {
-        return $this->loader->getNew(
-            'EE_Enum_Text_Field',
-            [$table_column, $nice_name, $nullable, $default_value, $allowed_enum_values]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Float_Field
-     */
-    public function createFloatField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Float_Field {
-        return $this->loader->getNew(
-            'EE_Float_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Foreign_Key_Int_Field
-     */
-    public function createForeignKeyIntField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value,
-        string $model_name
-    ): EE_Foreign_Key_Int_Field {
-        return $this->loader->getNew(
-            'EE_Foreign_Key_Int_Field',
-            [$table_column, $nice_name, $nullable, $default_value, $model_name]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Foreign_Key_String_Field
-     */
-    public function createForeignKeyStringField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value,
-        string $model_name
-    ): EE_Foreign_Key_String_Field {
-        return $this->loader->getNew(
-            'EE_Foreign_Key_String_Field',
-            [$table_column, $nice_name, $nullable, $default_value, $model_name]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Full_HTML_Field
-     */
-    public function createFullHtmlField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Full_HTML_Field {
-        return $this->loader->getNew(
-            'EE_Full_HTML_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Infinite_Integer_Field
-     */
-    public function createInfiniteIntegerField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Infinite_Integer_Field {
-        return $this->loader->getNew(
-            'EE_Infinite_Integer_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param bool    $nullable
-     * @param integer $default_value
-     * @return EE_Integer_Field
-     */
-    public function createIntegerField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable = false,
-        int $default_value = 0
-    ): EE_Integer_Field {
-        return $this->loader->getNew(
-            'EE_Integer_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Maybe_Serialized_Simple_HTML_Field
-     */
-    public function createMaybeSerializedSimpleHtmlField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Maybe_Serialized_Simple_HTML_Field {
-        return $this->loader->getNew(
-            'EE_Maybe_Serialized_Simple_HTML_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Maybe_Serialized_Text_Field
-     */
-    public function createMaybeSerializedTextField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Maybe_Serialized_Text_Field {
-        return $this->loader->getNew(
-            'EE_Maybe_Serialized_Text_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Money_Field
-     */
-    public function createMoneyField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Money_Field {
-        return $this->loader->getNew(
-            'EE_Money_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param string $default_value
-     * @return EE_Plain_Text_Field
-     */
-    public function createPlainTextField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable = true,
-        string $default_value = ''
-    ): EE_Plain_Text_Field {
-        return $this->loader->getNew(
-            'EE_Plain_Text_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Post_Content_Field
-     */
-    public function createPostContentField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Post_Content_Field {
-        return $this->loader->getNew(
-            'EE_Post_Content_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @return EE_Primary_Key_Int_Field
-     */
-    public function createPrimaryKeyIntField(string $table_column, string $nice_name): EE_Primary_Key_Int_Field
-    {
-        return $this->loader->getNew('EE_Primary_Key_Int_Field', [$table_column, $nice_name]);
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @return EE_Primary_Key_String_Field
-     */
-    public function createPrimaryKeyStringField(string $table_column, string $nice_name): EE_Primary_Key_String_Field
-    {
-        return $this->loader->getNew('EE_Primary_Key_String_Field', [$table_column, $nice_name]);
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Serialized_Text_Field
-     */
-    public function createSerializedTextField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Serialized_Text_Field {
-        return $this->loader->getNew(
-            'EE_Serialized_Text_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Simple_HTML_Field
-     */
-    public function createSimpleHtmlField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Simple_HTML_Field {
-        return $this->loader->getNew(
-            'EE_Simple_HTML_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Slug_Field
-     */
-    public function createSlugField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable = false,
-        $default_value = null
-    ): EE_Slug_Field {
-        return $this->loader->getNew(
-            'EE_Slug_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Trashed_Flag_Field
-     */
-    public function createTrashedFlagField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null
-    ): EE_Trashed_Flag_Field {
-        return $this->loader->getNew(
-            'EE_Trashed_Flag_Field',
-            [$table_column, $nice_name, $nullable, $default_value]
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param mixed  $default_value
-     * @param array $values     If additional statuses are to be used other than the default WP statuses,
-     *                          then they can be registered via this property.
-     *                          The format of the array should be as follows:
-     *                          [
-     *                              'status_reference' => [
-     *                                  'label' => __('Status Reference Label', 'event_espresso'),
-     *                                  // whether status is shown on the frontend of the site
-     *                                  'public' => true,
-     *                                  // whether status is excluded from wp searches
-     *                                  'exclude_from_search' => false,
-     *                                  // whether status is included in queries
-     *                                  for the admin 'all' view in list table views.
-     *                                  'show_in_admin_all_list' => true,
-     *                                  // show in the list of statuses with post counts
-     *                                  // at the top of the admin list tables (i.e. Status Reference(2) )
-     *                                  'show_in_admin_status_list' => true,
-     *                                  // the text to display on the admin screen
-     *                                  // ( or you won't see your status count )
-     *                                  'label_count' => _n_noop(
-     *                                      'Status Reference <span class="count">(%s)</span>',
-     *                                      'Status References <span class="count">(%s)</span>'
-     *                                  ),
-     *                              ]
-     *                          ]
-     * @return EE_WP_Post_Status_Field
-     * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
-     */
-    public function createWpPostStatusField(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        $default_value = null,
-        array $values = []
-    ): EE_WP_Post_Status_Field {
-        return $this->loader->getNew(
-            'EE_WP_Post_Status_Field',
-            [$table_column, $nice_name, $nullable, $default_value, $values]
-        );
-    }
-
-
-    /**
-     * @param string $post_type
-     * @return EE_WP_Post_Type_Field
-     */
-    public function createWpPostTypeField(string $post_type): EE_WP_Post_Type_Field
-    {
-        return $this->loader->getNew('EE_WP_Post_Type_Field', [$post_type]);
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @return EE_WP_User_Field
-     */
-    public function createWpUserField(string $table_column, string $nice_name, bool $nullable): EE_WP_User_Field
-    {
-        return $this->loader->getNew('EE_WP_User_Field', [$table_column, $nice_name, $nullable]);
-    }
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
+
+
+	/**
+	 * ModelFieldFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_All_Caps_Text_Field
+	 */
+	public function createAllCapsTextField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_All_Caps_Text_Field {
+		return $this->loader->getNew(
+			'EE_All_Caps_Text_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Any_Foreign_Model_Name_Field
+	 */
+	public function createAnyForeignModelNameField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null,
+		string $model_name = ''
+	): EE_Any_Foreign_Model_Name_Field {
+		return $this->loader->getNew(
+			'EE_Any_Foreign_Model_Name_Field',
+			[$table_column, $nice_name, $nullable, $default_value, $model_name]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Boolean_Field
+	 */
+	public function createBooleanField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Boolean_Field {
+		return $this->loader->getNew(
+			'EE_Boolean_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @return EE_Datetime_Field
+	 */
+	public function createDatetimeField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable = false,
+		string $default_value = EE_Datetime_Field::now
+	): EE_Datetime_Field {
+		return $this->loader->getNew('EE_Datetime_Field', [$table_column, $nice_name, $nullable, $default_value,]);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Float_Field
+	 */
+	public function createDbOnlyFloatField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_DB_Only_Float_Field {
+		return $this->loader->getNew(
+			'EE_DB_Only_Float_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Int_Field
+	 */
+	public function createDbOnlyIntField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_DB_Only_Int_Field {
+		return $this->loader->getNew(
+			'EE_DB_Only_Int_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Text_Field
+	 */
+	public function createDbOnlyTextField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_DB_Only_Text_Field {
+		return $this->loader->getNew(
+			'EE_DB_Only_Text_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string      $table_column
+	 * @param string      $nice_name
+	 * @param bool        $nullable
+	 * @param string|null $default_value
+	 * @return EE_Email_Field
+	 */
+	public function createEmailField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable = true,
+		string $default_value = ''
+	): EE_Email_Field {
+		return $this->loader->getNew(
+			'EE_Email_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param array  $allowed_enum_values keys are values to be used in the DB,
+	 *                                    values are how they should be displayed
+	 * @return EE_Enum_Integer_Field
+	 */
+	public function createEnumIntegerField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null,
+		array $allowed_enum_values = []
+	): EE_Enum_Integer_Field {
+		return $this->loader->getNew(
+			'EE_Enum_Integer_Field',
+			[$table_column, $nice_name, $nullable, $default_value, $allowed_enum_values]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param array  $allowed_enum_values keys are values to be used in the DB,
+	 *                                    values are how they should be displayed
+	 * @return EE_Enum_Text_Field
+	 */
+	public function createEnumTextField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value,
+		array $allowed_enum_values
+	): EE_Enum_Text_Field {
+		return $this->loader->getNew(
+			'EE_Enum_Text_Field',
+			[$table_column, $nice_name, $nullable, $default_value, $allowed_enum_values]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Float_Field
+	 */
+	public function createFloatField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Float_Field {
+		return $this->loader->getNew(
+			'EE_Float_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Foreign_Key_Int_Field
+	 */
+	public function createForeignKeyIntField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value,
+		string $model_name
+	): EE_Foreign_Key_Int_Field {
+		return $this->loader->getNew(
+			'EE_Foreign_Key_Int_Field',
+			[$table_column, $nice_name, $nullable, $default_value, $model_name]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Foreign_Key_String_Field
+	 */
+	public function createForeignKeyStringField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value,
+		string $model_name
+	): EE_Foreign_Key_String_Field {
+		return $this->loader->getNew(
+			'EE_Foreign_Key_String_Field',
+			[$table_column, $nice_name, $nullable, $default_value, $model_name]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Full_HTML_Field
+	 */
+	public function createFullHtmlField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Full_HTML_Field {
+		return $this->loader->getNew(
+			'EE_Full_HTML_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Infinite_Integer_Field
+	 */
+	public function createInfiniteIntegerField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Infinite_Integer_Field {
+		return $this->loader->getNew(
+			'EE_Infinite_Integer_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param bool    $nullable
+	 * @param integer $default_value
+	 * @return EE_Integer_Field
+	 */
+	public function createIntegerField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable = false,
+		int $default_value = 0
+	): EE_Integer_Field {
+		return $this->loader->getNew(
+			'EE_Integer_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Maybe_Serialized_Simple_HTML_Field
+	 */
+	public function createMaybeSerializedSimpleHtmlField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Maybe_Serialized_Simple_HTML_Field {
+		return $this->loader->getNew(
+			'EE_Maybe_Serialized_Simple_HTML_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Maybe_Serialized_Text_Field
+	 */
+	public function createMaybeSerializedTextField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Maybe_Serialized_Text_Field {
+		return $this->loader->getNew(
+			'EE_Maybe_Serialized_Text_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Money_Field
+	 */
+	public function createMoneyField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Money_Field {
+		return $this->loader->getNew(
+			'EE_Money_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @return EE_Plain_Text_Field
+	 */
+	public function createPlainTextField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable = true,
+		string $default_value = ''
+	): EE_Plain_Text_Field {
+		return $this->loader->getNew(
+			'EE_Plain_Text_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Post_Content_Field
+	 */
+	public function createPostContentField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Post_Content_Field {
+		return $this->loader->getNew(
+			'EE_Post_Content_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @return EE_Primary_Key_Int_Field
+	 */
+	public function createPrimaryKeyIntField(string $table_column, string $nice_name): EE_Primary_Key_Int_Field
+	{
+		return $this->loader->getNew('EE_Primary_Key_Int_Field', [$table_column, $nice_name]);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @return EE_Primary_Key_String_Field
+	 */
+	public function createPrimaryKeyStringField(string $table_column, string $nice_name): EE_Primary_Key_String_Field
+	{
+		return $this->loader->getNew('EE_Primary_Key_String_Field', [$table_column, $nice_name]);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Serialized_Text_Field
+	 */
+	public function createSerializedTextField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Serialized_Text_Field {
+		return $this->loader->getNew(
+			'EE_Serialized_Text_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Simple_HTML_Field
+	 */
+	public function createSimpleHtmlField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Simple_HTML_Field {
+		return $this->loader->getNew(
+			'EE_Simple_HTML_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Slug_Field
+	 */
+	public function createSlugField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable = false,
+		$default_value = null
+	): EE_Slug_Field {
+		return $this->loader->getNew(
+			'EE_Slug_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Trashed_Flag_Field
+	 */
+	public function createTrashedFlagField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null
+	): EE_Trashed_Flag_Field {
+		return $this->loader->getNew(
+			'EE_Trashed_Flag_Field',
+			[$table_column, $nice_name, $nullable, $default_value]
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param mixed  $default_value
+	 * @param array $values     If additional statuses are to be used other than the default WP statuses,
+	 *                          then they can be registered via this property.
+	 *                          The format of the array should be as follows:
+	 *                          [
+	 *                              'status_reference' => [
+	 *                                  'label' => __('Status Reference Label', 'event_espresso'),
+	 *                                  // whether status is shown on the frontend of the site
+	 *                                  'public' => true,
+	 *                                  // whether status is excluded from wp searches
+	 *                                  'exclude_from_search' => false,
+	 *                                  // whether status is included in queries
+	 *                                  for the admin 'all' view in list table views.
+	 *                                  'show_in_admin_all_list' => true,
+	 *                                  // show in the list of statuses with post counts
+	 *                                  // at the top of the admin list tables (i.e. Status Reference(2) )
+	 *                                  'show_in_admin_status_list' => true,
+	 *                                  // the text to display on the admin screen
+	 *                                  // ( or you won't see your status count )
+	 *                                  'label_count' => _n_noop(
+	 *                                      'Status Reference <span class="count">(%s)</span>',
+	 *                                      'Status References <span class="count">(%s)</span>'
+	 *                                  ),
+	 *                              ]
+	 *                          ]
+	 * @return EE_WP_Post_Status_Field
+	 * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
+	 */
+	public function createWpPostStatusField(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		$default_value = null,
+		array $values = []
+	): EE_WP_Post_Status_Field {
+		return $this->loader->getNew(
+			'EE_WP_Post_Status_Field',
+			[$table_column, $nice_name, $nullable, $default_value, $values]
+		);
+	}
+
+
+	/**
+	 * @param string $post_type
+	 * @return EE_WP_Post_Type_Field
+	 */
+	public function createWpPostTypeField(string $post_type): EE_WP_Post_Type_Field
+	{
+		return $this->loader->getNew('EE_WP_Post_Type_Field', [$post_type]);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @return EE_WP_User_Field
+	 */
+	public function createWpUserField(string $table_column, string $nice_name, bool $nullable): EE_WP_User_Field
+	{
+		return $this->loader->getNew('EE_WP_User_Field', [$table_column, $nice_name, $nullable]);
+	}
 }

core/domain/services/registration/form/v1/RegFormAttendeeFactory.php

Indentation +100 added lines, -100 removed lines

@@ -16,113 +16,113 @@
 class RegFormAttendeeFactory
 {
 
-    /**
-     * @var CommandBusInterface
-     */
-    public $command_bus;
+	/**
+	 * @var CommandBusInterface
+	 */
+	public $command_bus;
 
-    /**
-     * @var RegistrantData
-     */
-    private $registrant_data;
+	/**
+	 * @var RegistrantData
+	 */
+	private $registrant_data;
 
 
-    /**
-     * RegFormAttendeeFactory constructor.
-     *
-     * @param CommandBusInterface $command_bus
-     * @param RegistrantData      $registrant_data
-     */
-    public function __construct(CommandBusInterface $command_bus, RegistrantData $registrant_data)
-    {
-        $this->command_bus     = $command_bus;
-        $this->registrant_data = $registrant_data;
-    }
+	/**
+	 * RegFormAttendeeFactory constructor.
+	 *
+	 * @param CommandBusInterface $command_bus
+	 * @param RegistrantData      $registrant_data
+	 */
+	public function __construct(CommandBusInterface $command_bus, RegistrantData $registrant_data)
+	{
+		$this->command_bus     = $command_bus;
+		$this->registrant_data = $registrant_data;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function create(EE_Registration $registration, string $reg_url_link): bool
-    {
-        // this registration does not require additional attendee information ?
-        if (
-            $this->registrant_data->copyPrimary()
-            && $this->registrant_data->attendeeCount() > 1
-            && $this->registrant_data->primaryRegistrantIsValid()
-        ) {
-            // just copy the primary registrant
-            $attendee = $this->registrant_data->primaryRegistrant();
-        } else {
-            // ensure critical details are set for additional attendees
-            // raw form data was already set during call to processRegFormData()
-            $this->registrant_data->ensureCriticalRegistrantDataIsSet($reg_url_link);
-            // execute create attendee command (which may return an existing attendee)
-            $attendee = $this->command_bus->execute(
-                new CreateAttendeeCommand(
-                    $this->registrant_data->getRegistrantData($reg_url_link),
-                    $registration
-                )
-            );
-            // who's #1 ?
-            if ($this->registrant_data->currentRegistrantIsPrimary()) {
-                $this->registrant_data->setPrimaryRegistrant($attendee);
-            }
-        }
-        // add relation to registration, set attendee ID, and cache attendee
-        $this->associateAttendeeWithRegistration($registration, $attendee);
-        return $this->isValidAttendee($registration, $reg_url_link);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function create(EE_Registration $registration, string $reg_url_link): bool
+	{
+		// this registration does not require additional attendee information ?
+		if (
+			$this->registrant_data->copyPrimary()
+			&& $this->registrant_data->attendeeCount() > 1
+			&& $this->registrant_data->primaryRegistrantIsValid()
+		) {
+			// just copy the primary registrant
+			$attendee = $this->registrant_data->primaryRegistrant();
+		} else {
+			// ensure critical details are set for additional attendees
+			// raw form data was already set during call to processRegFormData()
+			$this->registrant_data->ensureCriticalRegistrantDataIsSet($reg_url_link);
+			// execute create attendee command (which may return an existing attendee)
+			$attendee = $this->command_bus->execute(
+				new CreateAttendeeCommand(
+					$this->registrant_data->getRegistrantData($reg_url_link),
+					$registration
+				)
+			);
+			// who's #1 ?
+			if ($this->registrant_data->currentRegistrantIsPrimary()) {
+				$this->registrant_data->setPrimaryRegistrant($attendee);
+			}
+		}
+		// add relation to registration, set attendee ID, and cache attendee
+		$this->associateAttendeeWithRegistration($registration, $attendee);
+		return $this->isValidAttendee($registration, $reg_url_link);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @return bool
-     * @throws EE_Error
-     */
-    private function isValidAttendee(EE_Registration $registration, string $reg_url_link): bool
-    {
-        if ($registration->attendee() instanceof EE_Attendee) {
-            return true;
-        }
-        EE_Error::add_error(
-            sprintf(
-                esc_html_x(
-                    'Registration %s has an invalid or missing Attendee object.',
-                    'Registration 123-456-789 has an invalid or missing Attendee object.',
-                    'event_espresso'
-                ),
-                $reg_url_link
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	private function isValidAttendee(EE_Registration $registration, string $reg_url_link): bool
+	{
+		if ($registration->attendee() instanceof EE_Attendee) {
+			return true;
+		}
+		EE_Error::add_error(
+			sprintf(
+				esc_html_x(
+					'Registration %s has an invalid or missing Attendee object.',
+					'Registration 123-456-789 has an invalid or missing Attendee object.',
+					'event_espresso'
+				),
+				$reg_url_link
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Attendee     $attendee
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function associateAttendeeWithRegistration(EE_Registration $registration, EE_Attendee $attendee)
-    {
-        // add relation to attendee
-        $registration->_add_relation_to($attendee, 'Attendee');
-        $registration->set_attendee_id($attendee->ID());
-        $registration->update_cache_after_object_save('Attendee', $attendee);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Attendee     $attendee
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function associateAttendeeWithRegistration(EE_Registration $registration, EE_Attendee $attendee)
+	{
+		// add relation to attendee
+		$registration->_add_relation_to($attendee, 'Attendee');
+		$registration->set_attendee_id($attendee->ID());
+		$registration->update_cache_after_object_save('Attendee', $attendee);
+	}
 }

core/domain/services/registration/form/v1/RegFormQuestionFactory.php

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
             $registration,
             $question->system_ID()
         );
-        $answer       = $answer_value === null
+        $answer = $answer_value === null
             ? $this->answer_model->get_one(
                 [['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
             )
@@ -75,14 +75,14 @@ 
         }
         // verify instance
         if ($answer instanceof EE_Answer) {
-            if (! empty($answer_value)) {
+            if ( ! empty($answer_value)) {
                 $answer->set('ANS_value', $answer_value);
             }
             $answer->cache('Question', $question);
             // remember system ID had a bug where sometimes it could be null
             $answer_cache_id = $question->is_system_question()
-                ? $question->system_ID() . '-' . $registration->reg_url_link()
-                : $question->ID() . '-' . $registration->reg_url_link();
+                ? $question->system_ID().'-'.$registration->reg_url_link()
+                : $question->ID().'-'.$registration->reg_url_link();
             $registration->cache('Answer', $answer, $answer_cache_id);
         }
         return $this->generateQuestionInput($registration, $question, $answer);
@@ -105,23 +105,23 @@ 
         EE_Question $question,
         $answer
     ): EE_Form_Input_Base {
-        $identifier                              = $question->is_system_question()
+        $identifier = $question->is_system_question()
             ? $question->system_ID()
             : $question->ID();
         $callback = $this->addRequiredQuestion;
         $callback($identifier, $question->required());
-        $input_constructor_args                  = [
-            'html_name'        => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-            'html_id'          => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-            'html_class'       => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-            'html_label_id'    => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+        $input_constructor_args = [
+            'html_name'        => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+            'html_id'          => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+            'html_class'       => 'ee-reg-qstn ee-reg-qstn-'.$identifier,
+            'html_label_id'    => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
             'html_label_class' => 'ee-reg-qstn',
         ];
         $input_constructor_args['html_label_id'] .= '-lbl';
         if ($answer instanceof EE_Answer && $answer->ID()) {
-            $input_constructor_args['html_name']     .= '[' . $answer->ID() . ']';
-            $input_constructor_args['html_id']       .= '-' . $answer->ID();
-            $input_constructor_args['html_label_id'] .= '-' . $answer->ID();
+            $input_constructor_args['html_name']     .= '['.$answer->ID().']';
+            $input_constructor_args['html_id']       .= '-'.$answer->ID();
+            $input_constructor_args['html_label_id'] .= '-'.$answer->ID();
         }
         return $question->generate_form_input(
             $registration,

Indentation +107 added lines, -107 removed lines

@@ -16,118 +16,118 @@
 class RegFormQuestionFactory
 {
 
-    /**
-     * @var callable
-     */
-    protected $addRequiredQuestion;
+	/**
+	 * @var callable
+	 */
+	protected $addRequiredQuestion;
 
-    /**
-     * @var EEM_Answer
-     */
-    public $answer_model;
+	/**
+	 * @var EEM_Answer
+	 */
+	public $answer_model;
 
 
-    /**
-     * @param callable   $addRequiredQuestion
-     * @param EEM_Answer $answer_model
-     */
-    public function __construct(callable $addRequiredQuestion, EEM_Answer $answer_model)
-    {
-        $this->addRequiredQuestion = $addRequiredQuestion;
-        $this->answer_model = $answer_model;
-    }
+	/**
+	 * @param callable   $addRequiredQuestion
+	 * @param EEM_Answer $answer_model
+	 */
+	public function __construct(callable $addRequiredQuestion, EEM_Answer $answer_model)
+	{
+		$this->addRequiredQuestion = $addRequiredQuestion;
+		$this->answer_model = $answer_model;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function create(
-        EE_Registration $registration,
-        EE_Question $question
-    ): EE_Form_Input_Base {
-        // if this question was for an attendee detail, then check for that answer
-        $answer_value = $this->answer_model->get_attendee_property_answer_value(
-            $registration,
-            $question->system_ID()
-        );
-        $answer       = $answer_value === null
-            ? $this->answer_model->get_one(
-                [['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
-            )
-            : null;
-        // if NOT returning to edit an existing registration
-        // OR if this question is for an attendee property
-        // OR we still don't have an EE_Answer object
-        if ($answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link()) {
-            // create an EE_Answer object for storing everything in
-            $answer = EE_Answer::new_instance(
-                [
-                    'QST_ID' => $question->ID(),
-                    'REG_ID' => $registration->ID(),
-                ]
-            );
-        }
-        // verify instance
-        if ($answer instanceof EE_Answer) {
-            if (! empty($answer_value)) {
-                $answer->set('ANS_value', $answer_value);
-            }
-            $answer->cache('Question', $question);
-            // remember system ID had a bug where sometimes it could be null
-            $answer_cache_id = $question->is_system_question()
-                ? $question->system_ID() . '-' . $registration->reg_url_link()
-                : $question->ID() . '-' . $registration->reg_url_link();
-            $registration->cache('Answer', $answer, $answer_cache_id);
-        }
-        return $this->generateQuestionInput($registration, $question, $answer);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function create(
+		EE_Registration $registration,
+		EE_Question $question
+	): EE_Form_Input_Base {
+		// if this question was for an attendee detail, then check for that answer
+		$answer_value = $this->answer_model->get_attendee_property_answer_value(
+			$registration,
+			$question->system_ID()
+		);
+		$answer       = $answer_value === null
+			? $this->answer_model->get_one(
+				[['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
+			)
+			: null;
+		// if NOT returning to edit an existing registration
+		// OR if this question is for an attendee property
+		// OR we still don't have an EE_Answer object
+		if ($answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link()) {
+			// create an EE_Answer object for storing everything in
+			$answer = EE_Answer::new_instance(
+				[
+					'QST_ID' => $question->ID(),
+					'REG_ID' => $registration->ID(),
+				]
+			);
+		}
+		// verify instance
+		if ($answer instanceof EE_Answer) {
+			if (! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
+			}
+			$answer->cache('Question', $question);
+			// remember system ID had a bug where sometimes it could be null
+			$answer_cache_id = $question->is_system_question()
+				? $question->system_ID() . '-' . $registration->reg_url_link()
+				: $question->ID() . '-' . $registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
+		}
+		return $this->generateQuestionInput($registration, $question, $answer);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @param                 $answer
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function generateQuestionInput(
-        EE_Registration $registration,
-        EE_Question $question,
-        $answer
-    ): EE_Form_Input_Base {
-        $identifier                              = $question->is_system_question()
-            ? $question->system_ID()
-            : $question->ID();
-        $callback = $this->addRequiredQuestion;
-        $callback($identifier, $question->required());
-        $input_constructor_args                  = [
-            'html_name'        => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-            'html_id'          => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-            'html_class'       => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-            'html_label_id'    => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-            'html_label_class' => 'ee-reg-qstn',
-        ];
-        $input_constructor_args['html_label_id'] .= '-lbl';
-        if ($answer instanceof EE_Answer && $answer->ID()) {
-            $input_constructor_args['html_name']     .= '[' . $answer->ID() . ']';
-            $input_constructor_args['html_id']       .= '-' . $answer->ID();
-            $input_constructor_args['html_label_id'] .= '-' . $answer->ID();
-        }
-        return $question->generate_form_input(
-            $registration,
-            $answer,
-            $input_constructor_args
-        );
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @param                 $answer
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function generateQuestionInput(
+		EE_Registration $registration,
+		EE_Question $question,
+		$answer
+	): EE_Form_Input_Base {
+		$identifier                              = $question->is_system_question()
+			? $question->system_ID()
+			: $question->ID();
+		$callback = $this->addRequiredQuestion;
+		$callback($identifier, $question->required());
+		$input_constructor_args                  = [
+			'html_name'        => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
+			'html_id'          => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_class'       => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
+			'html_label_id'    => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_label_class' => 'ee-reg-qstn',
+		];
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		if ($answer instanceof EE_Answer && $answer->ID()) {
+			$input_constructor_args['html_name']     .= '[' . $answer->ID() . ']';
+			$input_constructor_args['html_id']       .= '-' . $answer->ID();
+			$input_constructor_args['html_label_id'] .= '-' . $answer->ID();
+		}
+		return $question->generate_form_input(
+			$registration,
+			$answer,
+			$input_constructor_args
+		);
+	}
 }

core/domain/services/registration/form/v1/RegFormInputHandler.php

Spacing +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
         $input_value
     ): bool {
         // check for critical inputs
-        if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
+        if ( ! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
             return false;
         }
         $input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
@@ -75,7 +75,7 @@ 
             $form_input,
             $input_value
         );
-        if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
+        if ( ! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
             EE_Error::add_error(
                 sprintf(
                     esc_html_x(
@@ -137,7 +137,7 @@ 
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
         $answer_cache_id   = $this->checkout_reg_url_link
-            ? $form_input . '-' . $reg_url_link
+            ? $form_input.'-'.$reg_url_link
             : $form_input;
         $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
         $answer_is_obj     = $registrant_answer instanceof EE_Answer;
@@ -156,10 +156,10 @@ 
                 break;
 
             default:
-                $ATT_input         = 'ATT_' . $form_input;
+                $ATT_input         = 'ATT_'.$form_input;
                 $attendee_property = $this->attendee_model->has_field($ATT_input);
                 $form_input        = $attendee_property
-                    ? 'ATT_' . $form_input
+                    ? 'ATT_'.$form_input
                     : $form_input;
         }
 
@@ -201,7 +201,7 @@ 
     ): bool {
         if (empty($input_value)) {
             // if the form input isn't marked as being required, then just return
-            if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
+            if ( ! isset($this->required_questions[$form_input]) || ! $this->required_questions[$form_input]) {
                 return true;
             }
             switch ($form_input) {

Indentation +216 added lines, -216 removed lines

@@ -14,223 +14,223 @@
 class RegFormInputHandler
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    private $attendee_model;
-
-    /**
-     * @var string
-     */
-    private $checkout_reg_url_link;
-
-    /**
-     * @var RegistrantData
-     */
-    private $registrant_data;
-
-    /**
-     * @var array
-     */
-    private $required_questions;
-
-
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        string $checkout_reg_url_link,
-        array $required_questions,
-        EEM_Attendee $attendee_model,
-        RegistrantData $registrant_data
-    ) {
-        $this->attendee_model        = $attendee_model;
-        $this->checkout_reg_url_link = $checkout_reg_url_link;
-        $this->registrant_data       = $registrant_data;
-        $this->required_questions    = $required_questions;
-    }
-
-
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function processFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $form_input,
-        $input_value
-    ): bool {
-        // check for critical inputs
-        if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
-            return false;
-        }
-        $input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
-            $reg_url_link,
-            $form_input,
-            $input_value
-        );
-        if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html_x(
-                        'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"',
-                        'Unable to save registration form data for the form input: "form input name" with the submitted value: "form input value"',
-                        'event_espresso'
-                    ),
-                    $form_input,
-                    $input_value
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function saveRegistrationFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $form_input = '',
-        $input_value = ''
-    ): bool {
-        // If email_confirm is sent it's not saved
-        if ((string) $form_input === 'email_confirm') {
-            return true;
-        }
-        // allow for plugins to hook in and do their own processing of the form input.
-        // For plugins to bypass normal processing here, they just need to return a truthy value.
-        if (
-            apply_filters(
-                'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
-                false,
-                $registration,
-                $form_input,
-                $input_value,
-                $this
-            )
-        ) {
-            return true;
-        }
-        /*
+	/**
+	 * @var EEM_Attendee
+	 */
+	private $attendee_model;
+
+	/**
+	 * @var string
+	 */
+	private $checkout_reg_url_link;
+
+	/**
+	 * @var RegistrantData
+	 */
+	private $registrant_data;
+
+	/**
+	 * @var array
+	 */
+	private $required_questions;
+
+
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		string $checkout_reg_url_link,
+		array $required_questions,
+		EEM_Attendee $attendee_model,
+		RegistrantData $registrant_data
+	) {
+		$this->attendee_model        = $attendee_model;
+		$this->checkout_reg_url_link = $checkout_reg_url_link;
+		$this->registrant_data       = $registrant_data;
+		$this->required_questions    = $required_questions;
+	}
+
+
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function processFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$form_input,
+		$input_value
+	): bool {
+		// check for critical inputs
+		if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
+			return false;
+		}
+		$input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
+			$reg_url_link,
+			$form_input,
+			$input_value
+		);
+		if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html_x(
+						'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"',
+						'Unable to save registration form data for the form input: "form input name" with the submitted value: "form input value"',
+						'event_espresso'
+					),
+					$form_input,
+					$input_value
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function saveRegistrationFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$form_input = '',
+		$input_value = ''
+	): bool {
+		// If email_confirm is sent it's not saved
+		if ((string) $form_input === 'email_confirm') {
+			return true;
+		}
+		// allow for plugins to hook in and do their own processing of the form input.
+		// For plugins to bypass normal processing here, they just need to return a truthy value.
+		if (
+			apply_filters(
+				'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
+				false,
+				$registration,
+				$form_input,
+				$input_value,
+				$this
+			)
+		) {
+			return true;
+		}
+		/*
          * $answer_cache_id is the key used to find the EE_Answer we want
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
-        $answer_cache_id   = $this->checkout_reg_url_link
-            ? $form_input . '-' . $reg_url_link
-            : $form_input;
-        $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
-        $answer_is_obj     = $registrant_answer instanceof EE_Answer;
-        // rename form_inputs if they are EE_Attendee properties
-        switch ((string) $form_input) {
-            case 'state':
-            case 'STA_ID':
-                $attendee_property = true;
-                $form_input        = 'STA_ID';
-                break;
-
-            case 'country':
-            case 'CNT_ISO':
-                $attendee_property = true;
-                $form_input        = 'CNT_ISO';
-                break;
-
-            default:
-                $ATT_input         = 'ATT_' . $form_input;
-                $attendee_property = $this->attendee_model->has_field($ATT_input);
-                $form_input        = $attendee_property
-                    ? 'ATT_' . $form_input
-                    : $form_input;
-        }
-
-        // if this form input has a corresponding attendee property
-        if ($attendee_property) {
-            $this->registrant_data->addRegistrantDataValue($reg_url_link, $form_input, $input_value);
-            if ($answer_is_obj) {
-                // and delete the corresponding answer since we won't be storing this data in that object
-                $registration->_remove_relation_to($registrant_answer, 'Answer');
-                $registrant_answer->delete_permanently();
-            }
-            return true;
-        }
-        if ($answer_is_obj) {
-            // save this data to the answer object
-            $registrant_answer->set_value($input_value);
-            $result = $registrant_answer->save();
-            return $result !== false;
-        }
-        foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
-            if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
-                $answer->set_value($input_value);
-                $result = $answer->save();
-                return $result !== false;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return boolean
-     */
-    private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
-        $form_input = '',
-        $input_value = ''
-    ): bool {
-        if (empty($input_value)) {
-            // if the form input isn't marked as being required, then just return
-            if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
-                return true;
-            }
-            switch ($form_input) {
-                case 'fname':
-                    EE_Error::add_error(
-                        esc_html__('First Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case 'lname':
-                    EE_Error::add_error(
-                        esc_html__('Last Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case 'email':
-                    EE_Error::add_error(
-                        esc_html__('Please enter a valid email address.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-            }
-        }
-        return true;
-    }
+		$answer_cache_id   = $this->checkout_reg_url_link
+			? $form_input . '-' . $reg_url_link
+			: $form_input;
+		$registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
+		$answer_is_obj     = $registrant_answer instanceof EE_Answer;
+		// rename form_inputs if they are EE_Attendee properties
+		switch ((string) $form_input) {
+			case 'state':
+			case 'STA_ID':
+				$attendee_property = true;
+				$form_input        = 'STA_ID';
+				break;
+
+			case 'country':
+			case 'CNT_ISO':
+				$attendee_property = true;
+				$form_input        = 'CNT_ISO';
+				break;
+
+			default:
+				$ATT_input         = 'ATT_' . $form_input;
+				$attendee_property = $this->attendee_model->has_field($ATT_input);
+				$form_input        = $attendee_property
+					? 'ATT_' . $form_input
+					: $form_input;
+		}
+
+		// if this form input has a corresponding attendee property
+		if ($attendee_property) {
+			$this->registrant_data->addRegistrantDataValue($reg_url_link, $form_input, $input_value);
+			if ($answer_is_obj) {
+				// and delete the corresponding answer since we won't be storing this data in that object
+				$registration->_remove_relation_to($registrant_answer, 'Answer');
+				$registrant_answer->delete_permanently();
+			}
+			return true;
+		}
+		if ($answer_is_obj) {
+			// save this data to the answer object
+			$registrant_answer->set_value($input_value);
+			$result = $registrant_answer->save();
+			return $result !== false;
+		}
+		foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
+			if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
+				$answer->set_value($input_value);
+				$result = $answer->save();
+				return $result !== false;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return boolean
+	 */
+	private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
+		$form_input = '',
+		$input_value = ''
+	): bool {
+		if (empty($input_value)) {
+			// if the form input isn't marked as being required, then just return
+			if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
+				return true;
+			}
+			switch ($form_input) {
+				case 'fname':
+					EE_Error::add_error(
+						esc_html__('First Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case 'lname':
+					EE_Error::add_error(
+						esc_html__('Last Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case 'email':
+					EE_Error::add_error(
+						esc_html__('Please enter a valid email address.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+			}
+		}
+		return true;
+	}
 }