eventespresso / event-espresso-core

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/form/meta/Element.php

Indentation +51 added lines, -51 removed lines

@@ -5,55 +5,55 @@
 class Element
 {
 
-    /**
-     * indicates that element is not archived or trashed
-     */
-    public const STATUS_ACTIVE = 'active';
-
-    /**
-     * indicates that element is archived and should no longer be displayed on public forms
-     * but may still be required due to existing answers when form was completed prior to input being archived
-     */
-    public const STATUS_ARCHIVED = 'archived';
-
-    /**
-     * indicates that element should be automatically added to newly created forms
-     */
-    public const STATUS_DEFAULT = 'default';
-
-    /**
-     * indicates that element is no longer needed, has no existing answers, and can be moved to the trash
-     */
-    public const STATUS_TRASHED = 'trashed';
-
-    /**
-     * @var array
-     */
-    private $valid_status_options;
-
-
-    public function __construct()
-    {
-        $this->valid_status_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_Element__valid_status_options',
-            [
-                Element::STATUS_ACTIVE   => esc_html__('Active', 'event_espresso'),
-                Element::STATUS_ARCHIVED => esc_html__('Archived', 'event_espresso'),
-                Element::STATUS_DEFAULT  => esc_html__('Default', 'event_espresso'),
-                Element::STATUS_TRASHED  => esc_html__('Trashed', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validStatusOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_status_options)
-            : $this->valid_status_options;
-    }
+	/**
+	 * indicates that element is not archived or trashed
+	 */
+	public const STATUS_ACTIVE = 'active';
+
+	/**
+	 * indicates that element is archived and should no longer be displayed on public forms
+	 * but may still be required due to existing answers when form was completed prior to input being archived
+	 */
+	public const STATUS_ARCHIVED = 'archived';
+
+	/**
+	 * indicates that element should be automatically added to newly created forms
+	 */
+	public const STATUS_DEFAULT = 'default';
+
+	/**
+	 * indicates that element is no longer needed, has no existing answers, and can be moved to the trash
+	 */
+	public const STATUS_TRASHED = 'trashed';
+
+	/**
+	 * @var array
+	 */
+	private $valid_status_options;
+
+
+	public function __construct()
+	{
+		$this->valid_status_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_Element__valid_status_options',
+			[
+				Element::STATUS_ACTIVE   => esc_html__('Active', 'event_espresso'),
+				Element::STATUS_ARCHIVED => esc_html__('Archived', 'event_espresso'),
+				Element::STATUS_DEFAULT  => esc_html__('Default', 'event_espresso'),
+				Element::STATUS_TRASHED  => esc_html__('Trashed', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validStatusOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_status_options)
+			: $this->valid_status_options;
+	}
 }

core/services/form/meta/InputTypes.php

Indentation +98 added lines, -98 removed lines

@@ -12,102 +12,102 @@
 
 class InputTypes
 {
-    /**
-     * @var Button
-     */
-    private $button;
-
-    /**
-     * @var DateTime
-     */
-    private $datetime;
-
-    /**
-     * @var Input
-     */
-    private $input;
-
-    /**
-     * @var Number
-     */
-    private $number;
-
-    /**
-     * @var Phone
-     */
-    private $phone;
-
-    /**
-     * @var Select
-     */
-    private $select;
-
-    /**
-     * @var Text
-     */
-    private $text;
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    /**
-     * InputTypes constructor.
-     *
-     * @param Button   $button
-     * @param DateTime $datetime
-     * @param Input    $input
-     * @param Number   $number
-     * @param Phone    $phone
-     * @param Select   $select
-     * @param Text     $text
-     */
-    public function __construct(
-        Button $button,
-        DateTime $datetime,
-        Input $input,
-        Number $number,
-        Phone $phone,
-        Select $select,
-        Text $text
-    ) {
-        $this->button   = $button;
-        $this->datetime = $datetime;
-        $this->input    = $input;
-        $this->number   = $number;
-        $this->phone    = $phone;
-        $this->select   = $select;
-        $this->text     = $text;
-        $this->assembleValidTypeOptions();
-    }
-
-
-    private function assembleValidTypeOptions()
-    {
-        $button     = $this->button->validTypeOptions();
-        $datetime   = $this->datetime->validTypeOptions();
-        $input      = $this->input->validTypeOptions();
-        $number     = $this->number->validTypeOptions();
-        $phone      = $this->phone->validTypeOptions();
-        $select     = $this->select->validTypeOptions();
-        $text       = $this->text->validTypeOptions();
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_InputTypes__valid_type_options',
-            array_merge($button, $datetime, $input, $number, $phone, $select, $text)
-        );
-    }
-
-
-    /**
-     * @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;
-    }
+	/**
+	 * @var Button
+	 */
+	private $button;
+
+	/**
+	 * @var DateTime
+	 */
+	private $datetime;
+
+	/**
+	 * @var Input
+	 */
+	private $input;
+
+	/**
+	 * @var Number
+	 */
+	private $number;
+
+	/**
+	 * @var Phone
+	 */
+	private $phone;
+
+	/**
+	 * @var Select
+	 */
+	private $select;
+
+	/**
+	 * @var Text
+	 */
+	private $text;
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	/**
+	 * InputTypes constructor.
+	 *
+	 * @param Button   $button
+	 * @param DateTime $datetime
+	 * @param Input    $input
+	 * @param Number   $number
+	 * @param Phone    $phone
+	 * @param Select   $select
+	 * @param Text     $text
+	 */
+	public function __construct(
+		Button $button,
+		DateTime $datetime,
+		Input $input,
+		Number $number,
+		Phone $phone,
+		Select $select,
+		Text $text
+	) {
+		$this->button   = $button;
+		$this->datetime = $datetime;
+		$this->input    = $input;
+		$this->number   = $number;
+		$this->phone    = $phone;
+		$this->select   = $select;
+		$this->text     = $text;
+		$this->assembleValidTypeOptions();
+	}
+
+
+	private function assembleValidTypeOptions()
+	{
+		$button     = $this->button->validTypeOptions();
+		$datetime   = $this->datetime->validTypeOptions();
+		$input      = $this->input->validTypeOptions();
+		$number     = $this->number->validTypeOptions();
+		$phone      = $this->phone->validTypeOptions();
+		$select     = $this->select->validTypeOptions();
+		$text       = $this->text->validTypeOptions();
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_InputTypes__valid_type_options',
+			array_merge($button, $datetime, $input, $number, $phone, $select, $text)
+		);
+	}
+
+
+	/**
+	 * @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/container/Mirror.php

Indentation +286 added lines, -286 removed lines

@@ -21,290 +21,290 @@
 class Mirror
 {
 
-    /**
-     * @var ReflectionClass[]
-     */
-    private $classes = [];
-
-    /**
-     * @var ReflectionMethod[]
-     */
-    private $constructors = [];
-
-    /**
-     * @var ReflectionParameter[][]
-     */
-    private $parameters = [];
-
-    /**
-     * @var ReflectionParameter[][]
-     */
-    private $parameter_classes = [];
-
-    /**
-     * @var ReflectionProperty[][]
-     */
-    private $properties = [];
-
-    /**
-     * @var ReflectionMethod[][]
-     */
-    private $methods = [];
-
-    /**
-     * @var array
-     */
-    private $default_properties = [];
-
-    /**
-     * @var array
-     */
-    private $static_properties = [];
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionClass
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     */
-    public function getReflectionClass(string $class_name): ReflectionClass
-    {
-        if (! is_string($class_name)) {
-            throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
-        }
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
-        }
-        return $this->classes[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod|null
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getConstructor(string $class_name): ?ReflectionMethod
-    {
-        if (! is_string($class_name)) {
-            throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
-        }
-        if (! isset($this->constructors[ $class_name ])) {
-            $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
-        }
-        return $this->constructors[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionMethod|null
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getConstructorFromReflection(ReflectionClass $reflection_class): ?ReflectionMethod
-    {
-        return $this->getConstructor($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParameters(string $class_name): array
-    {
-        if (! isset($this->parameters[ $class_name ])) {
-            $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
-        }
-        return $this->parameters[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getParameters($reflection_class->getName());
-    }
-
-
-    /**
-     * @param ReflectionMethod $constructor
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflectionConstructor(ReflectionMethod $constructor): array
-    {
-        return $this->getParameters($constructor->getDeclaringClass());
-    }
-
-
-    /**
-     * returns array of ReflectionParameter objects for parameters that are NOT optional
-     *
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getRequiredParameters(string $class_name): array
-    {
-        $required_parameters = [];
-        $parameters          = $this->getParameters($class_name);
-        foreach ($parameters as $parameter) {
-            if ($parameter instanceof ReflectionParameter && ! $parameter->isOptional()) {
-                $required_parameters[] = $parameter;
-            }
-        }
-        return $required_parameters;
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return string|null
-     */
-    public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
-        }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
-            ? $param->getClass()->name
-            : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return array|string|null
-     * @throws ReflectionException
-     */
-    public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
-        }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
-            ? $param->getDefaultValue()
-            : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionProperty[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getProperties(string $class_name): array
-    {
-        if (! isset($this->properties[ $class_name ])) {
-            $reflection_class                = $this->getReflectionClass($class_name);
-            $this->properties[ $class_name ] = $reflection_class->getProperties();
-        }
-        return $this->properties[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionProperty[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getPropertiesFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getProperties($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getMethods(string $class_name): array
-    {
-        if (! isset($this->methods[ $class_name ])) {
-            $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
-        }
-        return $this->methods[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class )
-     * @return ReflectionMethod[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getMethodsFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getMethods($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return array
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getDefaultProperties(string $class_name): array
-    {
-        if (! isset($this->default_properties[ $class_name ])) {
-            $reflection_class                        = $this->getReflectionClass($class_name);
-            $this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
-        }
-        return $this->default_properties[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return array
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getStaticProperties(string $class_name): array
-    {
-        if (! isset($this->static_properties[ $class_name ])) {
-            $reflection_class                       = $this->getReflectionClass($class_name);
-            $this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
-        }
-        return $this->static_properties[ $class_name ];
-    }
+	/**
+	 * @var ReflectionClass[]
+	 */
+	private $classes = [];
+
+	/**
+	 * @var ReflectionMethod[]
+	 */
+	private $constructors = [];
+
+	/**
+	 * @var ReflectionParameter[][]
+	 */
+	private $parameters = [];
+
+	/**
+	 * @var ReflectionParameter[][]
+	 */
+	private $parameter_classes = [];
+
+	/**
+	 * @var ReflectionProperty[][]
+	 */
+	private $properties = [];
+
+	/**
+	 * @var ReflectionMethod[][]
+	 */
+	private $methods = [];
+
+	/**
+	 * @var array
+	 */
+	private $default_properties = [];
+
+	/**
+	 * @var array
+	 */
+	private $static_properties = [];
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionClass
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 */
+	public function getReflectionClass(string $class_name): ReflectionClass
+	{
+		if (! is_string($class_name)) {
+			throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
+		}
+		if (! isset($this->classes[ $class_name ])) {
+			$this->classes[ $class_name ] = new ReflectionClass($class_name);
+		}
+		return $this->classes[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod|null
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getConstructor(string $class_name): ?ReflectionMethod
+	{
+		if (! is_string($class_name)) {
+			throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
+		}
+		if (! isset($this->constructors[ $class_name ])) {
+			$reflection_class                  = $this->getReflectionClass($class_name);
+			$this->constructors[ $class_name ] = $reflection_class->getConstructor();
+		}
+		return $this->constructors[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionMethod|null
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getConstructorFromReflection(ReflectionClass $reflection_class): ?ReflectionMethod
+	{
+		return $this->getConstructor($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParameters(string $class_name): array
+	{
+		if (! isset($this->parameters[ $class_name ])) {
+			$constructor                     = $this->getConstructor($class_name);
+			$this->parameters[ $class_name ] = $constructor->getParameters();
+		}
+		return $this->parameters[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getParameters($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param ReflectionMethod $constructor
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflectionConstructor(ReflectionMethod $constructor): array
+	{
+		return $this->getParameters($constructor->getDeclaringClass());
+	}
+
+
+	/**
+	 * returns array of ReflectionParameter objects for parameters that are NOT optional
+	 *
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getRequiredParameters(string $class_name): array
+	{
+		$required_parameters = [];
+		$parameters          = $this->getParameters($class_name);
+		foreach ($parameters as $parameter) {
+			if ($parameter instanceof ReflectionParameter && ! $parameter->isOptional()) {
+				$required_parameters[] = $parameter;
+			}
+		}
+		return $required_parameters;
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return string|null
+	 */
+	public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = [];
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = [];
+		}
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
+			? $param->getClass()->name
+			: null;
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return array|string|null
+	 * @throws ReflectionException
+	 */
+	public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = [];
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = [];
+		}
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+			? $param->getDefaultValue()
+			: null;
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionProperty[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getProperties(string $class_name): array
+	{
+		if (! isset($this->properties[ $class_name ])) {
+			$reflection_class                = $this->getReflectionClass($class_name);
+			$this->properties[ $class_name ] = $reflection_class->getProperties();
+		}
+		return $this->properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionProperty[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getPropertiesFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getProperties($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getMethods(string $class_name): array
+	{
+		if (! isset($this->methods[ $class_name ])) {
+			$reflection_class             = $this->getReflectionClass($class_name);
+			$this->methods[ $class_name ] = $reflection_class->getMethods();
+		}
+		return $this->methods[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class )
+	 * @return ReflectionMethod[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getMethodsFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getMethods($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return array
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getDefaultProperties(string $class_name): array
+	{
+		if (! isset($this->default_properties[ $class_name ])) {
+			$reflection_class                        = $this->getReflectionClass($class_name);
+			$this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
+		}
+		return $this->default_properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return array
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getStaticProperties(string $class_name): array
+	{
+		if (! isset($this->static_properties[ $class_name ])) {
+			$reflection_class                       = $this->getReflectionClass($class_name);
+			$this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
+		}
+		return $this->static_properties[ $class_name ];
+	}
 }

Spacing +39 added lines, -39 removed lines

@@ -70,13 +70,13 @@ 
      */
     public function getReflectionClass(string $class_name): ReflectionClass
     {
-        if (! is_string($class_name)) {
+        if ( ! is_string($class_name)) {
             throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
         }
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
+        if ( ! isset($this->classes[$class_name])) {
+            $this->classes[$class_name] = new ReflectionClass($class_name);
         }
-        return $this->classes[ $class_name ];
+        return $this->classes[$class_name];
     }
 
 
@@ -88,14 +88,14 @@ 
      */
     public function getConstructor(string $class_name): ?ReflectionMethod
     {
-        if (! is_string($class_name)) {
+        if ( ! is_string($class_name)) {
             throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
         }
-        if (! isset($this->constructors[ $class_name ])) {
+        if ( ! isset($this->constructors[$class_name])) {
             $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
+            $this->constructors[$class_name] = $reflection_class->getConstructor();
         }
-        return $this->constructors[ $class_name ];
+        return $this->constructors[$class_name];
     }
 
 
@@ -119,11 +119,11 @@ 
      */
     public function getParameters(string $class_name): array
     {
-        if (! isset($this->parameters[ $class_name ])) {
+        if ( ! isset($this->parameters[$class_name])) {
             $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
+            $this->parameters[$class_name] = $constructor->getParameters();
         }
-        return $this->parameters[ $class_name ];
+        return $this->parameters[$class_name];
     }
 
 
@@ -180,19 +180,19 @@ 
      */
     public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
     {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+        if (isset($this->parameter_classes[$class_name][$index]['param_class_name'])) {
+            return $this->parameter_classes[$class_name][$index]['param_class_name'];
         }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
+        if ( ! isset($this->parameter_classes[$class_name])) {
+            $this->parameter_classes[$class_name] = [];
         }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
+        if ( ! isset($this->parameter_classes[$class_name][$index])) {
+            $this->parameter_classes[$class_name][$index] = [];
         }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
+        $this->parameter_classes[$class_name][$index]['param_class_name'] = $param->getClass()
             ? $param->getClass()->name
             : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+        return $this->parameter_classes[$class_name][$index]['param_class_name'];
     }
 
 
@@ -205,19 +205,19 @@ 
      */
     public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
     {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+        if (isset($this->parameter_classes[$class_name][$index]['param_class_default'])) {
+            return $this->parameter_classes[$class_name][$index]['param_class_default'];
         }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
+        if ( ! isset($this->parameter_classes[$class_name])) {
+            $this->parameter_classes[$class_name] = [];
         }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
+        if ( ! isset($this->parameter_classes[$class_name][$index])) {
+            $this->parameter_classes[$class_name][$index] = [];
         }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+        $this->parameter_classes[$class_name][$index]['param_class_default'] = $param->isDefaultValueAvailable()
             ? $param->getDefaultValue()
             : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+        return $this->parameter_classes[$class_name][$index]['param_class_default'];
     }
 
 
@@ -229,11 +229,11 @@ 
      */
     public function getProperties(string $class_name): array
     {
-        if (! isset($this->properties[ $class_name ])) {
+        if ( ! isset($this->properties[$class_name])) {
             $reflection_class                = $this->getReflectionClass($class_name);
-            $this->properties[ $class_name ] = $reflection_class->getProperties();
+            $this->properties[$class_name] = $reflection_class->getProperties();
         }
-        return $this->properties[ $class_name ];
+        return $this->properties[$class_name];
     }
 
 
@@ -257,11 +257,11 @@ 
      */
     public function getMethods(string $class_name): array
     {
-        if (! isset($this->methods[ $class_name ])) {
+        if ( ! isset($this->methods[$class_name])) {
             $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
+            $this->methods[$class_name] = $reflection_class->getMethods();
         }
-        return $this->methods[ $class_name ];
+        return $this->methods[$class_name];
     }
 
 
@@ -285,11 +285,11 @@ 
      */
     public function getDefaultProperties(string $class_name): array
     {
-        if (! isset($this->default_properties[ $class_name ])) {
+        if ( ! isset($this->default_properties[$class_name])) {
             $reflection_class                        = $this->getReflectionClass($class_name);
-            $this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
+            $this->default_properties[$class_name] = $reflection_class->getDefaultProperties();
         }
-        return $this->default_properties[ $class_name ];
+        return $this->default_properties[$class_name];
     }
 
 
@@ -301,10 +301,10 @@ 
      */
     public function getStaticProperties(string $class_name): array
     {
-        if (! isset($this->static_properties[ $class_name ])) {
+        if ( ! isset($this->static_properties[$class_name])) {
             $reflection_class                       = $this->getReflectionClass($class_name);
-            $this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
+            $this->static_properties[$class_name] = $reflection_class->getStaticProperties();
         }
-        return $this->static_properties[ $class_name ];
+        return $this->static_properties[$class_name];
     }
 }

core/services/orm/ModelFieldFactory.php

Indentation +614 added lines, -614 removed lines

@@ -47,618 +47,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]);
+	}
 }

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, ]);
     }
 
 

core/db_models/EEM_Form_Element.php

Indentation +26 added lines, -26 removed lines

@@ -5,30 +5,30 @@
 abstract class EEM_Form_Element extends EEM_Base
 {
 
-    /**
-     * @var Element
-     */
-    protected $element;
-
-    /**
-     * @var array
-     */
-    protected $valid_status_options;
-
-
-    protected function __construct(Element $element, $timezone)
-    {
-        $this->element = $element;
-        parent::__construct($timezone);
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validStatusOptions(bool $constants_only = false): array
-    {
-        return $this->element->validStatusOptions($constants_only);
-    }
+	/**
+	 * @var Element
+	 */
+	protected $element;
+
+	/**
+	 * @var array
+	 */
+	protected $valid_status_options;
+
+
+	protected function __construct(Element $element, $timezone)
+	{
+		$this->element = $element;
+		parent::__construct($timezone);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validStatusOptions(bool $constants_only = false): array
+	{
+		return $this->element->validStatusOptions($constants_only);
+	}
 }

core/db_models/EEM_Form_Section.model.php

Indentation +229 added lines, -229 removed lines

@@ -21,262 +21,262 @@
  */
 class EEM_Form_Section extends EEM_Form_Element
 {
-    public const APPLIES_TO_ALL         = 'all';
+	public const APPLIES_TO_ALL         = 'all';
 
-    public const APPLIES_TO_PRIMARY     = 'primary';
+	public const APPLIES_TO_PRIMARY     = 'primary';
 
-    public const APPLIES_TO_PURCHASER   = 'purchaser';
+	public const APPLIES_TO_PURCHASER   = 'purchaser';
 
-    public const APPLIES_TO_REGISTRANTS = 'registrants';
+	public const APPLIES_TO_REGISTRANTS = 'registrants';
 
-    /**
-     * @var EEM_Form_Section
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Form_Section
+	 */
+	protected static $_instance;
 
-    /**
-     * @var RequestInterface
-     */
-    private $request;
+	/**
+	 * @var RequestInterface
+	 */
+	private $request;
 
-    /**
-     * @var array
-     */
-    private $valid_applies_to_options;
+	/**
+	 * @var array
+	 */
+	private $valid_applies_to_options;
 
 
-    protected function __construct(Element $element, $timezone = null)
-    {
-        $this->valid_applies_to_options = apply_filters(
-            'FHEE__EEM_Form_Section__valid_applies_to_options',
-            [
-                EEM_Form_Section::APPLIES_TO_ALL         => esc_html__('All Registrants', 'event_espresso'),
-                EEM_Form_Section::APPLIES_TO_PRIMARY     => esc_html__('Primary Registrant Only', 'event_espresso'),
-                EEM_Form_Section::APPLIES_TO_PURCHASER   => esc_html__('Purchasing Agent', 'event_espresso'),
-                EEM_Form_Section::APPLIES_TO_REGISTRANTS => esc_html__('Additional Registrants', 'event_espresso'),
-            ]
-        );
+	protected function __construct(Element $element, $timezone = null)
+	{
+		$this->valid_applies_to_options = apply_filters(
+			'FHEE__EEM_Form_Section__valid_applies_to_options',
+			[
+				EEM_Form_Section::APPLIES_TO_ALL         => esc_html__('All Registrants', 'event_espresso'),
+				EEM_Form_Section::APPLIES_TO_PRIMARY     => esc_html__('Primary Registrant Only', 'event_espresso'),
+				EEM_Form_Section::APPLIES_TO_PURCHASER   => esc_html__('Purchasing Agent', 'event_espresso'),
+				EEM_Form_Section::APPLIES_TO_REGISTRANTS => esc_html__('Additional Registrants', 'event_espresso'),
+			]
+		);
 
-        $related_entity_types = apply_filters(
-            'FHEE__EEM_Form_Section__related_entity_types',
-            [
-                'Datetime',
-                'Event',
-                'Form_Section',
-                'Ticket',
-                'Venue',
-            ]
-        );
+		$related_entity_types = apply_filters(
+			'FHEE__EEM_Form_Section__related_entity_types',
+			[
+				'Datetime',
+				'Event',
+				'Form_Section',
+				'Ticket',
+				'Venue',
+			]
+		);
 
-        $this->singular_item = esc_html__('Form Section', 'event_espresso');
-        $this->plural_item   = esc_html__('Form Sections', 'event_espresso');
+		$this->singular_item = esc_html__('Form Section', 'event_espresso');
+		$this->plural_item   = esc_html__('Form Sections', 'event_espresso');
 
-        $this->_tables          = [
-            'Form_Section' => new EE_Primary_Table('esp_form_section', 'FSC_ID'),
-        ];
-        $this->_fields          = [
-            'Form_Section' => [
-                'FSC_ID'        => new EE_Integer_Field(
-                    'FSC_ID',
-                    esc_html__('Form Section ID (autoincrement db id)', 'event_espresso'),
-                    false
-                ),
-                'FSC_UUID'      => new EE_Primary_Key_String_Field(
-                    'FSC_UUID',
-                    esc_html__('Form Section UUID (universally unique identifier)', 'event_espresso')
-                ),
-                'FSC_appliesTo' => new EE_Enum_Text_Field(
-                    'FSC_appliesTo',
-                    esc_html__(
-                        'Form user types that this form section should be presented to. Values correspond to the EEM_Form_Section::APPLIES_TO_* constants.',
-                        'event_espresso'
-                    ),
-                    false,
-                    EEM_Form_Section::APPLIES_TO_ALL,
-                    $this->valid_applies_to_options
-                ),
-                // 'FSC_attributes' => new EE_Serialized_Text_Field(
-                //     'FSC_attributes',
-                //     esc_html__(
-                //         'Array of HTML attributes that apply to this form section.',
-                //         'event_espresso'
-                //     ),
-                //     true,
-                //     []
-                // ),
-                'FSC_belongsTo' => new EE_Foreign_Key_String_Field(
-                    'FSC_belongsTo',
-                    esc_html__('UUID or ID of related entity this form section belongs to.', 'event_espresso'),
-                    true,
-                    null,
-                    $related_entity_types
-                ),
-                'FSC_htmlClass' => new EE_Plain_Text_Field(
-                    'FSC_htmlClass',
-                    esc_html__('HTML classes to be applied to this form section\'s container.', 'event_espresso'),
-                    true,
-                    null
-                ),
-                'FSC_order'     => new EE_Integer_Field(
-                    'FSC_order',
-                    esc_html__('Order in which form section appears in a form.', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'FSC_relation'  => new EE_Any_Foreign_Model_Name_Field(
-                    'FSC_relation',
-                    esc_html__('Related model type.', 'event_espresso'),
-                    true,
-                    null,
-                    $related_entity_types
-                ),
-                'FSC_status'    => new EE_Enum_Text_Field(
-                    'FSC_status',
-                    esc_html__(
-                        'Whether form section is active, archived, trashed, or used as a default on new forms. Values correspond to the EEM_Form_Section::STATUS_TO_* constants.',
-                        'event_espresso'
-                    ),
-                    false,
-                    Element::STATUS_ACTIVE,
-                    $element->validStatusOptions()
-                ),
-                'FSC_wpUser'    => new EE_WP_User_Field(
-                    'FSC_wpUser',
-                    esc_html__('ID of the WP User that created this form section.', 'event_espresso'),
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [];
-        foreach ($related_entity_types as $model) {
-            $this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
-        }
-        // this model is generally available for reading
-        $restrictions                              = [];
-        $restrictions[ EEM_Base::caps_read ]       = new EE_Restriction_Generator_Public();
-        $restrictions[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
-        $restrictions[ EEM_Base::caps_edit ]       = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
-        $restrictions[ EEM_Base::caps_delete ]     = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
-        $this->_cap_restriction_generators         = $restrictions;
-        parent::__construct($element, $timezone);
-        $this->request = $this->getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
-    }
+		$this->_tables          = [
+			'Form_Section' => new EE_Primary_Table('esp_form_section', 'FSC_ID'),
+		];
+		$this->_fields          = [
+			'Form_Section' => [
+				'FSC_ID'        => new EE_Integer_Field(
+					'FSC_ID',
+					esc_html__('Form Section ID (autoincrement db id)', 'event_espresso'),
+					false
+				),
+				'FSC_UUID'      => new EE_Primary_Key_String_Field(
+					'FSC_UUID',
+					esc_html__('Form Section UUID (universally unique identifier)', 'event_espresso')
+				),
+				'FSC_appliesTo' => new EE_Enum_Text_Field(
+					'FSC_appliesTo',
+					esc_html__(
+						'Form user types that this form section should be presented to. Values correspond to the EEM_Form_Section::APPLIES_TO_* constants.',
+						'event_espresso'
+					),
+					false,
+					EEM_Form_Section::APPLIES_TO_ALL,
+					$this->valid_applies_to_options
+				),
+				// 'FSC_attributes' => new EE_Serialized_Text_Field(
+				//     'FSC_attributes',
+				//     esc_html__(
+				//         'Array of HTML attributes that apply to this form section.',
+				//         'event_espresso'
+				//     ),
+				//     true,
+				//     []
+				// ),
+				'FSC_belongsTo' => new EE_Foreign_Key_String_Field(
+					'FSC_belongsTo',
+					esc_html__('UUID or ID of related entity this form section belongs to.', 'event_espresso'),
+					true,
+					null,
+					$related_entity_types
+				),
+				'FSC_htmlClass' => new EE_Plain_Text_Field(
+					'FSC_htmlClass',
+					esc_html__('HTML classes to be applied to this form section\'s container.', 'event_espresso'),
+					true,
+					null
+				),
+				'FSC_order'     => new EE_Integer_Field(
+					'FSC_order',
+					esc_html__('Order in which form section appears in a form.', 'event_espresso'),
+					false,
+					0
+				),
+				'FSC_relation'  => new EE_Any_Foreign_Model_Name_Field(
+					'FSC_relation',
+					esc_html__('Related model type.', 'event_espresso'),
+					true,
+					null,
+					$related_entity_types
+				),
+				'FSC_status'    => new EE_Enum_Text_Field(
+					'FSC_status',
+					esc_html__(
+						'Whether form section is active, archived, trashed, or used as a default on new forms. Values correspond to the EEM_Form_Section::STATUS_TO_* constants.',
+						'event_espresso'
+					),
+					false,
+					Element::STATUS_ACTIVE,
+					$element->validStatusOptions()
+				),
+				'FSC_wpUser'    => new EE_WP_User_Field(
+					'FSC_wpUser',
+					esc_html__('ID of the WP User that created this form section.', 'event_espresso'),
+					false
+				),
+			],
+		];
+		$this->_model_relations = [];
+		foreach ($related_entity_types as $model) {
+			$this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
+		}
+		// this model is generally available for reading
+		$restrictions                              = [];
+		$restrictions[ EEM_Base::caps_read ]       = new EE_Restriction_Generator_Public();
+		$restrictions[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
+		$restrictions[ EEM_Base::caps_edit ]       = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
+		$restrictions[ EEM_Base::caps_delete ]     = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
+		$this->_cap_restriction_generators         = $restrictions;
+		parent::__construct($element, $timezone);
+		$this->request = $this->getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
+	}
 
 
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validAppliesToOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_applies_to_options)
-            : $this->valid_applies_to_options;
-    }
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validAppliesToOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_applies_to_options)
+			: $this->valid_applies_to_options;
+	}
 
 
-    /**
-     * returns an array of Form Sections for the specified parent Form Section
-     *
-     * @param string $FSC_UUID
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     */
-    public function getChildFormSections(string $FSC_UUID): array
-    {
-        return $this->getFormSectionsFor('FormSection.FSC_UUID', $FSC_UUID);
-    }
+	/**
+	 * returns an array of Form Sections for the specified parent Form Section
+	 *
+	 * @param string $FSC_UUID
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 */
+	public function getChildFormSections(string $FSC_UUID): array
+	{
+		return $this->getFormSectionsFor('FormSection.FSC_UUID', $FSC_UUID);
+	}
 
 
-    /**
-     * returns an array of Form Sections for the specified Event
-     *
-     * @param string $EVT_ID
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     */
-    public function getFormSectionsForEvent(string $EVT_ID): array
-    {
-        return $this->getFormSectionsFor('Event.EVT_ID', $EVT_ID);
-    }
+	/**
+	 * returns an array of Form Sections for the specified Event
+	 *
+	 * @param string $EVT_ID
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 */
+	public function getFormSectionsForEvent(string $EVT_ID): array
+	{
+		return $this->getFormSectionsFor('Event.EVT_ID', $EVT_ID);
+	}
 
 
-    /**
-     * returns an array of Form Sections for the specified Datetime
-     *
-     * @param string $DTT_ID
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     */
-    public function getFormSectionsForDatetime(string $DTT_ID): array
-    {
-        return $this->getFormSectionsFor('Datetime.DTT_ID', $DTT_ID);
-    }
+	/**
+	 * returns an array of Form Sections for the specified Datetime
+	 *
+	 * @param string $DTT_ID
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 */
+	public function getFormSectionsForDatetime(string $DTT_ID): array
+	{
+		return $this->getFormSectionsFor('Datetime.DTT_ID', $DTT_ID);
+	}
 
 
-    /**
-     * returns an array of Form Sections for the specified Ticket
-     *
-     * @param string $TKT_ID
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     */
-    public function getFormSectionsForTicket(string $TKT_ID): array
-    {
-        return $this->getFormSectionsFor('Ticket.TKT_ID', $TKT_ID);
-    }
+	/**
+	 * returns an array of Form Sections for the specified Ticket
+	 *
+	 * @param string $TKT_ID
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 */
+	public function getFormSectionsForTicket(string $TKT_ID): array
+	{
+		return $this->getFormSectionsFor('Ticket.TKT_ID', $TKT_ID);
+	}
 
 
-    /**
-     * returns an array of Form Sections for the specified Venue
-     *
-     * @param string $VNU_ID
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     */
-    public function getFormSectionsForVenue(string $VNU_ID): array
-    {
-        return $this->getFormSectionsFor('Venue.VNU_ID', $VNU_ID);
-    }
+	/**
+	 * returns an array of Form Sections for the specified Venue
+	 *
+	 * @param string $VNU_ID
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 */
+	public function getFormSectionsForVenue(string $VNU_ID): array
+	{
+		return $this->getFormSectionsFor('Venue.VNU_ID', $VNU_ID);
+	}
 
 
-    /**
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     */
-    private function getFormSectionsFor(string $relation, string $related_UUID): array
-    {
-        $where_params = [$relation => $related_UUID];
-        $query_params = $this->addDefaultWhereConditions([$where_params]);
-        $query_params = $this->addOrderByQueryParams($query_params);
-        return $this->get_all($query_params);
-    }
+	/**
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 */
+	private function getFormSectionsFor(string $relation, string $related_UUID): array
+	{
+		$where_params = [$relation => $related_UUID];
+		$query_params = $this->addDefaultWhereConditions([$where_params]);
+		$query_params = $this->addOrderByQueryParams($query_params);
+		return $this->get_all($query_params);
+	}
 
 
-    /**
-     * @param array $query_params
-     * @return array
-     */
-    private function addDefaultWhereConditions(array $query_params): array
-    {
-        // might need to add a way to identify GQL requests for admin domains
-        $admin_request                            = $this->request->isAdmin() || $this->request->isAdminAjax();
-        $query_params['default_where_conditions'] = $admin_request
-            ? EEM_Base::default_where_conditions_none
-            : EEM_Base::default_where_conditions_all;
-        return $query_params;
-    }
+	/**
+	 * @param array $query_params
+	 * @return array
+	 */
+	private function addDefaultWhereConditions(array $query_params): array
+	{
+		// might need to add a way to identify GQL requests for admin domains
+		$admin_request                            = $this->request->isAdmin() || $this->request->isAdminAjax();
+		$query_params['default_where_conditions'] = $admin_request
+			? EEM_Base::default_where_conditions_none
+			: EEM_Base::default_where_conditions_all;
+		return $query_params;
+	}
 
 
-    /**
-     * form sections should always be sorted in ascending order via the FSC_order field
-     *
-     * @param array $query_params
-     * @return array
-     */
-    private function addOrderByQueryParams(array $query_params): array
-    {
-        $query_params['order_by'] = ['FSC_order' => 'ASC'];
-        return $query_params;
-    }
+	/**
+	 * form sections should always be sorted in ascending order via the FSC_order field
+	 *
+	 * @param array $query_params
+	 * @return array
+	 */
+	private function addOrderByQueryParams(array $query_params): array
+	{
+		$query_params['order_by'] = ['FSC_order' => 'ASC'];
+		return $query_params;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -149,14 +149,14 @@
         ];
         $this->_model_relations = [];
         foreach ($related_entity_types as $model) {
-            $this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
+            $this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
         }
         // this model is generally available for reading
         $restrictions                              = [];
-        $restrictions[ EEM_Base::caps_read ]       = new EE_Restriction_Generator_Public();
-        $restrictions[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
-        $restrictions[ EEM_Base::caps_edit ]       = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
-        $restrictions[ EEM_Base::caps_delete ]     = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
+        $restrictions[EEM_Base::caps_read]       = new EE_Restriction_Generator_Public();
+        $restrictions[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
+        $restrictions[EEM_Base::caps_edit]       = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
+        $restrictions[EEM_Base::caps_delete]     = new EE_Restriction_Generator_Reg_Form('FSC_applies_to');
         $this->_cap_restriction_generators         = $restrictions;
         parent::__construct($element, $timezone);
         $this->request = $this->getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');