eventespresso / event-espresso-core

core/db_models/EEM_Country.model.php

Indentation +200 added lines, -200 removed lines

@@ -10,204 +10,204 @@
 class EEM_Country extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance;
-
-    // array of all countries
-    private static $_all_countries = false;
-
-    // array of all active countries
-    private static $_active_countries = false;
-
-
-    /**
-     * Resets the country
-     *
-     * @param string $timezone
-     * @return EEM_Country
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function reset($timezone = ''): EEM_Country
-    {
-        self::$_active_countries = null;
-        self::$_all_countries    = null;
-        return parent::reset($timezone);
-    }
-
-
-    /**
-     * EEM_Country constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item = esc_html__('Country', 'event_espresso');
-        $this->plural_item   = esc_html__('Countries', 'event_espresso');
-
-        $this->_tables = [
-            'Country' => new EE_Primary_Table('esp_country', 'CNT_ISO'),
-        ];
-
-        $this->_fields          = [
-            'Country' => [
-                'CNT_active'      => new EE_Boolean_Field(
-                    'CNT_active',
-                    esc_html__(
-                        'Country Appears in Dropdown Select Lists',
-                        'event_espresso'
-                    ),
-                    false,
-                    true
-                ),
-                'CNT_ISO'         => new EE_Primary_Key_String_Field(
-                    'CNT_ISO',
-                    esc_html__('Country ISO Code', 'event_espresso')
-                ),
-                'CNT_ISO3'        => new EE_All_Caps_Text_Field(
-                    'CNT_ISO3',
-                    esc_html__('Country ISO3 Code', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'RGN_ID'          => new EE_Integer_Field(
-                    'RGN_ID',
-                    esc_html__('Region ID', 'event_espresso'),
-                    false,
-                    0
-                ),
-                // should be a foreign key, but no region table exists yet
-                'CNT_name'        => new EE_Plain_Text_Field(
-                    'CNT_name',
-                    esc_html__('Country Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'CNT_cur_code'    => new EE_All_Caps_Text_Field(
-                    'CNT_cur_code',
-                    esc_html__('Country Currency Code', 'event_espresso'),
-                    false
-                ),
-                'CNT_cur_single'  => new EE_Plain_Text_Field(
-                    'CNT_cur_single',
-                    esc_html__('Currency Name Singular', 'event_espresso'),
-                    false
-                ),
-                'CNT_cur_plural'  => new EE_Plain_Text_Field(
-                    'CNT_cur_plural',
-                    esc_html__('Currency Name Plural', 'event_espresso'),
-                    false
-                ),
-                'CNT_cur_sign'    => new EE_Plain_Text_Field(
-                    'CNT_cur_sign',
-                    esc_html__('Currency Sign', 'event_espresso'),
-                    false
-                ),
-                'CNT_cur_sign_b4' => new EE_Boolean_Field(
-                    'CNT_cur_sign_b4',
-                    esc_html__('Currency Sign Before Number', 'event_espresso'),
-                    false,
-                    true
-                ),
-                'CNT_cur_dec_plc' => new EE_Integer_Field(
-                    'CNT_cur_dec_plc',
-                    esc_html__('Currency Decimal Places', 'event_espresso'),
-                    false,
-                    2
-                ),
-                'CNT_cur_dec_mrk' => new EE_Plain_Text_Field(
-                    'CNT_cur_dec_mrk',
-                    esc_html__('Currency Decimal Mark', 'event_espresso'),
-                    false,
-                    '.'
-                ),
-                'CNT_cur_thsnds'  => new EE_Plain_Text_Field(
-                    'CNT_cur_thsnds',
-                    esc_html__('Currency Thousands Separator', 'event_espresso'),
-                    false,
-                    ','
-                ),
-                'CNT_tel_code'    => new EE_Plain_Text_Field(
-                    'CNT_tel_code',
-                    esc_html__('Country Telephone Code', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'CNT_is_EU'       => new EE_Boolean_Field(
-                    'CNT_is_EU',
-                    esc_html__('Country is Member of EU', 'event_espresso'),
-                    false,
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Attendee' => new EE_Has_Many_Relation(),
-            'State'    => new EE_Has_Many_Relation(),
-            'Venue'    => new EE_Has_Many_Relation(),
-        ];
-        // only anyone to view, but only those with the default role can do anything
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-
-        parent::__construct($timezone);
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_countries()
-    {
-        if (! self::$_all_countries) {
-            self::$_all_countries = $this->get_all(['order_by' => ['CNT_name' => 'ASC'], 'limit' => [0, 99999]]);
-        }
-        return self::$_all_countries;
-    }
-
-
-    /**
-     * _get_countries
-     * Gets and caches the list of active countries. If you know the list of active countries
-     * has changed during this request, first use EEM_Country::reset() to flush the cache
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_active_countries()
-    {
-        if (! self::$_active_countries) {
-            self::$_active_countries =
-                $this->get_all([['CNT_active' => true], 'order_by' => ['CNT_name' => 'ASC'], 'limit' => [0, 99999]]);
-        }
-        return self::$_active_countries;
-    }
-
-
-    /**
-     * Gets the country's name by its ISO
-     *
-     * @param string $country_ISO
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_country_name_by_ISO($country_ISO)
-    {
-        if (
-            isset(self::$_all_countries[ $country_ISO ])
-            && self::$_all_countries[ $country_ISO ] instanceof EE_Country
-        ) {
-            return self::$_all_countries[ $country_ISO ]->name();
-        }
-        $names = $this->get_col([['CNT_ISO' => $country_ISO], 'limit' => 1], 'CNT_name');
-        if (is_array($names) && ! empty($names)) {
-            return reset($names);
-        }
-        return '';
-    }
+	// private instance of the Attendee object
+	protected static $_instance;
+
+	// array of all countries
+	private static $_all_countries = false;
+
+	// array of all active countries
+	private static $_active_countries = false;
+
+
+	/**
+	 * Resets the country
+	 *
+	 * @param string $timezone
+	 * @return EEM_Country
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function reset($timezone = ''): EEM_Country
+	{
+		self::$_active_countries = null;
+		self::$_all_countries    = null;
+		return parent::reset($timezone);
+	}
+
+
+	/**
+	 * EEM_Country constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item = esc_html__('Country', 'event_espresso');
+		$this->plural_item   = esc_html__('Countries', 'event_espresso');
+
+		$this->_tables = [
+			'Country' => new EE_Primary_Table('esp_country', 'CNT_ISO'),
+		];
+
+		$this->_fields          = [
+			'Country' => [
+				'CNT_active'      => new EE_Boolean_Field(
+					'CNT_active',
+					esc_html__(
+						'Country Appears in Dropdown Select Lists',
+						'event_espresso'
+					),
+					false,
+					true
+				),
+				'CNT_ISO'         => new EE_Primary_Key_String_Field(
+					'CNT_ISO',
+					esc_html__('Country ISO Code', 'event_espresso')
+				),
+				'CNT_ISO3'        => new EE_All_Caps_Text_Field(
+					'CNT_ISO3',
+					esc_html__('Country ISO3 Code', 'event_espresso'),
+					false,
+					''
+				),
+				'RGN_ID'          => new EE_Integer_Field(
+					'RGN_ID',
+					esc_html__('Region ID', 'event_espresso'),
+					false,
+					0
+				),
+				// should be a foreign key, but no region table exists yet
+				'CNT_name'        => new EE_Plain_Text_Field(
+					'CNT_name',
+					esc_html__('Country Name', 'event_espresso'),
+					false,
+					''
+				),
+				'CNT_cur_code'    => new EE_All_Caps_Text_Field(
+					'CNT_cur_code',
+					esc_html__('Country Currency Code', 'event_espresso'),
+					false
+				),
+				'CNT_cur_single'  => new EE_Plain_Text_Field(
+					'CNT_cur_single',
+					esc_html__('Currency Name Singular', 'event_espresso'),
+					false
+				),
+				'CNT_cur_plural'  => new EE_Plain_Text_Field(
+					'CNT_cur_plural',
+					esc_html__('Currency Name Plural', 'event_espresso'),
+					false
+				),
+				'CNT_cur_sign'    => new EE_Plain_Text_Field(
+					'CNT_cur_sign',
+					esc_html__('Currency Sign', 'event_espresso'),
+					false
+				),
+				'CNT_cur_sign_b4' => new EE_Boolean_Field(
+					'CNT_cur_sign_b4',
+					esc_html__('Currency Sign Before Number', 'event_espresso'),
+					false,
+					true
+				),
+				'CNT_cur_dec_plc' => new EE_Integer_Field(
+					'CNT_cur_dec_plc',
+					esc_html__('Currency Decimal Places', 'event_espresso'),
+					false,
+					2
+				),
+				'CNT_cur_dec_mrk' => new EE_Plain_Text_Field(
+					'CNT_cur_dec_mrk',
+					esc_html__('Currency Decimal Mark', 'event_espresso'),
+					false,
+					'.'
+				),
+				'CNT_cur_thsnds'  => new EE_Plain_Text_Field(
+					'CNT_cur_thsnds',
+					esc_html__('Currency Thousands Separator', 'event_espresso'),
+					false,
+					','
+				),
+				'CNT_tel_code'    => new EE_Plain_Text_Field(
+					'CNT_tel_code',
+					esc_html__('Country Telephone Code', 'event_espresso'),
+					false,
+					''
+				),
+				'CNT_is_EU'       => new EE_Boolean_Field(
+					'CNT_is_EU',
+					esc_html__('Country is Member of EU', 'event_espresso'),
+					false,
+					false
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Attendee' => new EE_Has_Many_Relation(),
+			'State'    => new EE_Has_Many_Relation(),
+			'Venue'    => new EE_Has_Many_Relation(),
+		];
+		// only anyone to view, but only those with the default role can do anything
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+
+		parent::__construct($timezone);
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_countries()
+	{
+		if (! self::$_all_countries) {
+			self::$_all_countries = $this->get_all(['order_by' => ['CNT_name' => 'ASC'], 'limit' => [0, 99999]]);
+		}
+		return self::$_all_countries;
+	}
+
+
+	/**
+	 * _get_countries
+	 * Gets and caches the list of active countries. If you know the list of active countries
+	 * has changed during this request, first use EEM_Country::reset() to flush the cache
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_active_countries()
+	{
+		if (! self::$_active_countries) {
+			self::$_active_countries =
+				$this->get_all([['CNT_active' => true], 'order_by' => ['CNT_name' => 'ASC'], 'limit' => [0, 99999]]);
+		}
+		return self::$_active_countries;
+	}
+
+
+	/**
+	 * Gets the country's name by its ISO
+	 *
+	 * @param string $country_ISO
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_country_name_by_ISO($country_ISO)
+	{
+		if (
+			isset(self::$_all_countries[ $country_ISO ])
+			&& self::$_all_countries[ $country_ISO ] instanceof EE_Country
+		) {
+			return self::$_all_countries[ $country_ISO ]->name();
+		}
+		$names = $this->get_col([['CNT_ISO' => $country_ISO], 'limit' => 1], 'CNT_name');
+		if (is_array($names) && ! empty($names)) {
+			return reset($names);
+		}
+		return '';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
             'Country' => new EE_Primary_Table('esp_country', 'CNT_ISO'),
         ];
 
-        $this->_fields          = [
+        $this->_fields = [
             'Country' => [
                 'CNT_active'      => new EE_Boolean_Field(
                     'CNT_active',
@@ -149,7 +149,7 @@ 
             'Venue'    => new EE_Has_Many_Relation(),
         ];
         // only anyone to view, but only those with the default role can do anything
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
         parent::__construct($timezone);
     }
@@ -162,7 +162,7 @@ 
      */
     public function get_all_countries()
     {
-        if (! self::$_all_countries) {
+        if ( ! self::$_all_countries) {
             self::$_all_countries = $this->get_all(['order_by' => ['CNT_name' => 'ASC'], 'limit' => [0, 99999]]);
         }
         return self::$_all_countries;
@@ -180,7 +180,7 @@ 
      */
     public function get_all_active_countries()
     {
-        if (! self::$_active_countries) {
+        if ( ! self::$_active_countries) {
             self::$_active_countries =
                 $this->get_all([['CNT_active' => true], 'order_by' => ['CNT_name' => 'ASC'], 'limit' => [0, 99999]]);
         }
@@ -199,10 +199,10 @@ 
     public function get_country_name_by_ISO($country_ISO)
     {
         if (
-            isset(self::$_all_countries[ $country_ISO ])
-            && self::$_all_countries[ $country_ISO ] instanceof EE_Country
+            isset(self::$_all_countries[$country_ISO])
+            && self::$_all_countries[$country_ISO] instanceof EE_Country
         ) {
-            return self::$_all_countries[ $country_ISO ]->name();
+            return self::$_all_countries[$country_ISO]->name();
         }
         $names = $this->get_col([['CNT_ISO' => $country_ISO], 'limit' => 1], 'CNT_name');
         if (is_array($names) && ! empty($names)) {

core/db_models/EEM_Term.model.php

Indentation +270 added lines, -270 removed lines

@@ -13,290 +13,290 @@
 class EEM_Term extends EEM_Base
 {
 
-    /**
-     * @var EEM_Term
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Term
+	 */
+	protected static $_instance;
 
 
-    /**
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item                                        = esc_html__('Term', 'event_espresso');
-        $this->plural_item                                          = esc_html__('Terms', 'event_espresso');
-        $this->_tables                                              = [
-            'Term' => new EE_Primary_Table('terms', 'term_id'),
-        ];
-        $this->_fields                                              = [
-            'Term' => [
-                'term_id'    => new EE_Primary_Key_Int_Field(
-                    'term_id',
-                    esc_html__('Term ID', 'event_espresso')
-                ),
-                'name'       => new EE_Plain_Text_Field(
-                    'name',
-                    esc_html__('Term Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'slug'       => new EE_Slug_Field(
-                    'slug',
-                    esc_html__('Term Slug', 'event_espresso'),
-                    false
-                ),
-                'term_group' => new EE_Integer_Field(
-                    'term_group',
-                    esc_html__("Term Group", "event_espresso"),
-                    false,
-                    0
-                ),
-            ],
-        ];
-        $this->_model_relations                                     = [
-            'Term_Taxonomy' => new EE_Has_Many_Relation(),
-        ];
-        $this->_wp_core_model                                       = true;
-        $path_to_tax_model                                          = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]   = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
-                                                                    = new EE_Restriction_Generator_Taxonomy_Protected(
-            $path_to_tax_model
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]   = false;
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-        $path_to_tax_model                                          = $path_to_tax_model . '.';
-        // add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
-            [
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => ['!=', 'espresso_event_categories'],
-            ]
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
-            [
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => ['!=', 'espresso_venue_categories'],
-            ]
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type']     = new EE_Default_Where_Conditions(
-            [
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => ['!=', 'espresso_event_type'],
-            ]
-        );
-        // add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
-            [
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => ['!=', 'espresso_event_categories'],
-            ]
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
-            [
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => ['!=', 'espresso_venue_categories'],
-            ]
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type']     = new EE_Default_Where_Conditions(
-            [
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => ['!=', 'espresso_event_type'],
-            ]
-        );
-        parent::__construct($timezone);
-        add_filter('FHEE__Read__create_model_query_params', ['EEM_Term', 'rest_api_query_params'], 10, 3);
-    }
+	/**
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item                                        = esc_html__('Term', 'event_espresso');
+		$this->plural_item                                          = esc_html__('Terms', 'event_espresso');
+		$this->_tables                                              = [
+			'Term' => new EE_Primary_Table('terms', 'term_id'),
+		];
+		$this->_fields                                              = [
+			'Term' => [
+				'term_id'    => new EE_Primary_Key_Int_Field(
+					'term_id',
+					esc_html__('Term ID', 'event_espresso')
+				),
+				'name'       => new EE_Plain_Text_Field(
+					'name',
+					esc_html__('Term Name', 'event_espresso'),
+					false,
+					''
+				),
+				'slug'       => new EE_Slug_Field(
+					'slug',
+					esc_html__('Term Slug', 'event_espresso'),
+					false
+				),
+				'term_group' => new EE_Integer_Field(
+					'term_group',
+					esc_html__("Term Group", "event_espresso"),
+					false,
+					0
+				),
+			],
+		];
+		$this->_model_relations                                     = [
+			'Term_Taxonomy' => new EE_Has_Many_Relation(),
+		];
+		$this->_wp_core_model                                       = true;
+		$path_to_tax_model                                          = 'Term_Taxonomy';
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ]   = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
+																	= new EE_Restriction_Generator_Taxonomy_Protected(
+			$path_to_tax_model
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]   = false;
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$path_to_tax_model                                          = $path_to_tax_model . '.';
+		// add cap restrictions for editing relating to the "ee_edit_*"
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+			[
+				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => ['!=', 'espresso_event_categories'],
+			]
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+			[
+				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => ['!=', 'espresso_venue_categories'],
+			]
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type']     = new EE_Default_Where_Conditions(
+			[
+				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => ['!=', 'espresso_event_type'],
+			]
+		);
+		// add cap restrictions for deleting relating to the "ee_deleting_*"
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+			[
+				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => ['!=', 'espresso_event_categories'],
+			]
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+			[
+				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => ['!=', 'espresso_venue_categories'],
+			]
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type']     = new EE_Default_Where_Conditions(
+			[
+				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => ['!=', 'espresso_event_type'],
+			]
+		);
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', ['EEM_Term', 'rest_api_query_params'], 10, 3);
+	}
 
 
-    /**
-     * retrieves a list of all EE event categories
-     *
-     * @access public
-     * @param bool $show_uncategorized
-     * @return EE_Base_Class[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_ee_categories(bool $show_uncategorized = false): array
-    {
-        $where_params = [
-            'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-            'NOT'                    => ['name' => esc_html__('Uncategorized', 'event_espresso')],
-        ];
-        if ($show_uncategorized) {
-            unset($where_params['NOT']);
-        }
-        return EEM_Term::instance()->get_all(
-            [
-                $where_params,
-                'order_by' => ['name' => 'ASC'],
-            ]
-        );
-    }
+	/**
+	 * retrieves a list of all EE event categories
+	 *
+	 * @access public
+	 * @param bool $show_uncategorized
+	 * @return EE_Base_Class[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_ee_categories(bool $show_uncategorized = false): array
+	{
+		$where_params = [
+			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
+			'NOT'                    => ['name' => esc_html__('Uncategorized', 'event_espresso')],
+		];
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
+		}
+		return EEM_Term::instance()->get_all(
+			[
+				$where_params,
+				'order_by' => ['name' => 'ASC'],
+			]
+		);
+	}
 
 
-    /**
-     * retrieves a list of all post_tags associated with an EE CPT
-     *
-     * @access public
-     * @param string $post_type
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_CPT_post_tags(string $post_type = ''): array
-    {
-        switch ($post_type) {
-            case 'espresso_events':
-                return $this->get_all_event_post_tags();
-            case 'espresso_venues':
-                return $this->get_all_venue_post_tags();
-            default:
-                $event_tags = $this->get_all_event_post_tags();
-                $venue_tags = $this->get_all_venue_post_tags();
-                return array_merge($event_tags, $venue_tags);
-        }
-    }
+	/**
+	 * retrieves a list of all post_tags associated with an EE CPT
+	 *
+	 * @access public
+	 * @param string $post_type
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_CPT_post_tags(string $post_type = ''): array
+	{
+		switch ($post_type) {
+			case 'espresso_events':
+				return $this->get_all_event_post_tags();
+			case 'espresso_venues':
+				return $this->get_all_venue_post_tags();
+			default:
+				$event_tags = $this->get_all_event_post_tags();
+				$venue_tags = $this->get_all_venue_post_tags();
+				return array_merge($event_tags, $venue_tags);
+		}
+	}
 
 
-    /**
-     * returns an EE_Term object for the given tag
-     * if it has been utilized by any EE_Events or EE_Venues
-     *
-     * @param string $tag
-     * @return EE_Term|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function get_post_tag_for_event_or_venue(string $tag): ?EE_Term
-    {
-        $post_tag_results = $this->get_all_wpdb_results(
-            [
-                [
-                    'slug'                   => $tag,
-                    'Term_Taxonomy.taxonomy' => 'post_tag',
-                    'OR'                     => [
-                        'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                        'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                    ],
-                ],
-                'default_where_conditions' => 'none',
-                'extra_selects'            => [
-                    'event_post_type' => ['Term_Taxonomy___Event_CPT.post_type', '%s'],
-                    'venue_post_type' => ['Term_Taxonomy___Venue_CPT.post_type', '%s'],
-                ],
-                'group_by'                 => [
-                    'event_post_type',
-                    'venue_post_type',
-                ],
-                'limit'                    => 2,
-            ]
-        );
+	/**
+	 * returns an EE_Term object for the given tag
+	 * if it has been utilized by any EE_Events or EE_Venues
+	 *
+	 * @param string $tag
+	 * @return EE_Term|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function get_post_tag_for_event_or_venue(string $tag): ?EE_Term
+	{
+		$post_tag_results = $this->get_all_wpdb_results(
+			[
+				[
+					'slug'                   => $tag,
+					'Term_Taxonomy.taxonomy' => 'post_tag',
+					'OR'                     => [
+						'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+						'Term_Taxonomy.Event.post_type' => 'espresso_events',
+					],
+				],
+				'default_where_conditions' => 'none',
+				'extra_selects'            => [
+					'event_post_type' => ['Term_Taxonomy___Event_CPT.post_type', '%s'],
+					'venue_post_type' => ['Term_Taxonomy___Venue_CPT.post_type', '%s'],
+				],
+				'group_by'                 => [
+					'event_post_type',
+					'venue_post_type',
+				],
+				'limit'                    => 2,
+			]
+		);
 
-        $post_types = [];
-        foreach ((array) $post_tag_results as $row) {
-            if ($row['event_post_type'] === 'espresso_events') {
-                $post_types[] = EEM_Event::instance()->post_type();
-            } elseif ($row['venue_post_type'] === 'espresso_venues') {
-                $post_types[] = EEM_Venue::instance()->post_type();
-            }
-        }
-        $post_tag_row = reset($post_tag_results);
-        $post_tag     = $this->instantiate_class_from_array_or_object($post_tag_row);
-        if (! $post_tag instanceof EE_Term) {
-            return null;
-        }
+		$post_types = [];
+		foreach ((array) $post_tag_results as $row) {
+			if ($row['event_post_type'] === 'espresso_events') {
+				$post_types[] = EEM_Event::instance()->post_type();
+			} elseif ($row['venue_post_type'] === 'espresso_venues') {
+				$post_types[] = EEM_Venue::instance()->post_type();
+			}
+		}
+		$post_tag_row = reset($post_tag_results);
+		$post_tag     = $this->instantiate_class_from_array_or_object($post_tag_row);
+		if (! $post_tag instanceof EE_Term) {
+			return null;
+		}
 
-        if ($post_tag->post_type === null) {
-            $post_tag->post_type = [];
-        }
-        $post_tag->post_type = array_merge($post_tag->post_type, array_unique($post_types));
-        return $post_tag;
-    }
+		if ($post_tag->post_type === null) {
+			$post_tag->post_type = [];
+		}
+		$post_tag->post_type = array_merge($post_tag->post_type, array_unique($post_types));
+		return $post_tag;
+	}
 
 
-    /**
-     * get_all_event_post_tags
-     *
-     * @return EE_Base_Class[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_event_post_tags(): array
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            [
-                [
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                ],
-                'order_by'   => ['name' => 'ASC'],
-                'force_join' => ['Term_Taxonomy.Event'],
-            ]
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tag->post_type)) {
-                $post_tag->post_type = [];
-            }
-            $post_tag->post_type[] = 'espresso_events';
-            $post_tags[ $key ]     = $post_tag;
-        }
-        return $post_tags;
-    }
+	/**
+	 * get_all_event_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_event_post_tags(): array
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			[
+				[
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Event.post_type' => 'espresso_events',
+				],
+				'order_by'   => ['name' => 'ASC'],
+				'force_join' => ['Term_Taxonomy.Event'],
+			]
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tag->post_type)) {
+				$post_tag->post_type = [];
+			}
+			$post_tag->post_type[] = 'espresso_events';
+			$post_tags[ $key ]     = $post_tag;
+		}
+		return $post_tags;
+	}
 
 
-    /**
-     * get_all_venue_post_tags
-     *
-     * @return EE_Base_Class[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_venue_post_tags(): array
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            [
-                [
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                ],
-                'order_by'   => ['name' => 'ASC'],
-                'force_join' => ['Term_Taxonomy'],
-            ]
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tag->post_type)) {
-                $post_tag->post_type = [];
-            }
-            $post_tag->post_type[] = 'espresso_venues';
-            $post_tags[ $key ]     = $post_tag;
-        }
-        return $post_tags;
-    }
+	/**
+	 * get_all_venue_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_venue_post_tags(): array
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			[
+				[
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+				],
+				'order_by'   => ['name' => 'ASC'],
+				'force_join' => ['Term_Taxonomy'],
+			]
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tag->post_type)) {
+				$post_tag->post_type = [];
+			}
+			$post_tag->post_type[] = 'espresso_venues';
+			$post_tags[ $key ]     = $post_tag;
+		}
+		return $post_tags;
+	}
 
 
-    /**
-     * Makes sure that during REST API queries, we only return terms
-     * for term taxonomies which should be shown in the rest api
-     *
-     * @param array    $model_query_params
-     * @param array    $querystring_query_params
-     * @param EEM_Base $model
-     * @return array
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    public static function rest_api_query_params(
-        array $model_query_params,
-        array $querystring_query_params,
-        EEM_Base $model
-    ): array {
-        if ($model === EEM_Term::instance()) {
-            $taxonomies = get_taxonomies(['show_in_rest' => true]);
-            if (! empty($taxonomies)) {
-                $model_query_params[0]['Term_Taxonomy.taxonomy'] = ['IN', $taxonomies];
-            }
-        }
-        return $model_query_params;
-    }
+	/**
+	 * Makes sure that during REST API queries, we only return terms
+	 * for term taxonomies which should be shown in the rest api
+	 *
+	 * @param array    $model_query_params
+	 * @param array    $querystring_query_params
+	 * @param EEM_Base $model
+	 * @return array
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	public static function rest_api_query_params(
+		array $model_query_params,
+		array $querystring_query_params,
+		EEM_Base $model
+	): array {
+		if ($model === EEM_Term::instance()) {
+			$taxonomies = get_taxonomies(['show_in_rest' => true]);
+			if (! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = ['IN', $taxonomies];
+			}
+		}
+		return $model_query_params;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -60,44 +60,44 @@ 
         ];
         $this->_wp_core_model                                       = true;
         $path_to_tax_model                                          = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]   = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
+        $this->_cap_restriction_generators[EEM_Base::caps_read]   = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin]
                                                                     = new EE_Restriction_Generator_Taxonomy_Protected(
             $path_to_tax_model
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]   = false;
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-        $path_to_tax_model                                          = $path_to_tax_model . '.';
+        $this->_cap_restriction_generators[EEM_Base::caps_edit]   = false;
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+        $path_to_tax_model                                          = $path_to_tax_model.'.';
         // add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
             [
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => ['!=', 'espresso_event_categories'],
+                $path_to_tax_model.'taxonomy*ee_edit_event_category' => ['!=', 'espresso_event_categories'],
             ]
         );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
             [
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => ['!=', 'espresso_venue_categories'],
+                $path_to_tax_model.'taxonomy*ee_edit_venue_category' => ['!=', 'espresso_venue_categories'],
             ]
         );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type']     = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
             [
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => ['!=', 'espresso_event_type'],
+                $path_to_tax_model.'taxonomy*ee_edit_event_type' => ['!=', 'espresso_event_type'],
             ]
         );
         // add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
             [
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => ['!=', 'espresso_event_categories'],
+                $path_to_tax_model.'taxonomy*ee_delete_event_category' => ['!=', 'espresso_event_categories'],
             ]
         );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
             [
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => ['!=', 'espresso_venue_categories'],
+                $path_to_tax_model.'taxonomy*ee_delete_venue_category' => ['!=', 'espresso_venue_categories'],
             ]
         );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type']     = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
             [
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => ['!=', 'espresso_event_type'],
+                $path_to_tax_model.'taxonomy*ee_delete_event_type' => ['!=', 'espresso_event_type'],
             ]
         );
         parent::__construct($timezone);
@@ -203,7 +203,7 @@ 
         }
         $post_tag_row = reset($post_tag_results);
         $post_tag     = $this->instantiate_class_from_array_or_object($post_tag_row);
-        if (! $post_tag instanceof EE_Term) {
+        if ( ! $post_tag instanceof EE_Term) {
             return null;
         }
 
@@ -235,11 +235,11 @@ 
             ]
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tag->post_type)) {
+            if ( ! isset($post_tag->post_type)) {
                 $post_tag->post_type = [];
             }
             $post_tag->post_type[] = 'espresso_events';
-            $post_tags[ $key ]     = $post_tag;
+            $post_tags[$key]     = $post_tag;
         }
         return $post_tags;
     }
@@ -265,11 +265,11 @@ 
             ]
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tag->post_type)) {
+            if ( ! isset($post_tag->post_type)) {
                 $post_tag->post_type = [];
             }
             $post_tag->post_type[] = 'espresso_venues';
-            $post_tags[ $key ]     = $post_tag;
+            $post_tags[$key]     = $post_tag;
         }
         return $post_tags;
     }
@@ -293,7 +293,7 @@ 
     ): array {
         if ($model === EEM_Term::instance()) {
             $taxonomies = get_taxonomies(['show_in_rest' => true]);
-            if (! empty($taxonomies)) {
+            if ( ! empty($taxonomies)) {
                 $model_query_params[0]['Term_Taxonomy.taxonomy'] = ['IN', $taxonomies];
             }
         }

core/db_models/EEM_System_Status.model.php

Indentation +388 added lines, -388 removed lines

@@ -6,392 +6,392 @@
 class EEM_System_Status
 {
 
-    /**
-     * @var EEM_System_Status
-     */
-    protected static $_instance;
-
-
-    /**
-     * This function is a singleton method used to instantiate the EEM_Attendee object
-     *
-     * @return EEM_System_Status
-     */
-    public static function instance(): EEM_System_Status
-    {
-
-        // check if instance of EEM_System_Status already exists
-        if (self::$_instance === null) {
-            // instantiate EEM_System_Status
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    private function __construct()
-    {
-    }
-
-
-    /**
-     * @return array where each key is a function name on this class, and each value is SOMETHING--
-     * it might be a value, an array, or an object
-     */
-    public function get_system_stati(): array
-    {
-        return apply_filters(
-            'FHEE__EEM_System_Status__get_system_stati',
-            [
-                'ee_version'            => $this->get_ee_version(),
-                'ee_activation_history' => $this->get_ee_activation_history(),
-                'ee_config'             => $this->get_ee_config(),
-                'ee_migration_history'  => $this->get_ee_migration_history(),
-                'active_plugins'        => $this->get_active_plugins(),
-                'wp_settings'           => $this->get_wp_settings(),
-                'wp_maintenance_mode'   => $this->get_wp_maintenance_mode(),
-                'https_enabled'         => $this->get_https_enabled(),
-                'logging_enabled'       => $this->get_logging_enabled(),
-                'remote_posting'        => $this->get_remote_posting(),
-                'php_version'           => $this->php_version(),
-                'php.ini_settings'      => $this->get_php_ini_all(),
-                'php_info'              => $this->get_php_info(),
-            ],
-            $this
-        );
-    }
-
-
-    /**
-     *
-     * @return string
-     */
-    public function get_ee_version(): string
-    {
-        return espresso_version();
-    }
-
-
-    /**
-     *
-     * @return string
-     */
-    public function php_version(): string
-    {
-        return phpversion();
-    }
-
-
-    /**
-     *
-     * @return array, where each key is a plugin name (lower-cased), values are sub-arrays.
-     * Sub-arrays like described in wp function get_plugin_data. Ie,     *
-     *  'Name' => 'Plugin Name',
-     * 'PluginURI' => 'Plugin URI',
-     * 'Version' => 'Version',
-     * 'Description' => 'Description',
-     * 'Author' => 'Author',
-     * 'AuthorURI' => 'Author URI',
-     * 'TextDomain' => 'Text Domain',
-     * 'DomainPath' => 'Domain Path',
-     * 'Network' => 'Network',
-     */
-    public function get_active_plugins(): array
-    {
-        $active_plugins = (array) get_option('active_plugins', []);
-        if (is_multisite()) {
-            $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', []));
-        }
-        $active_plugins = array_map('strtolower', $active_plugins);
-        $plugin_info    = [];
-        foreach ($active_plugins as $plugin) {
-            $plugin_data = @get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin);
-
-            $plugin_info[ $plugin ] = $plugin_data;
-        }
-        return $plugin_info;
-    }
-
-
-    /**
-     *
-     * @return array with keys 'home_url' and 'site_url'
-     */
-    public function get_wp_settings(): array
-    {
-        $wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT);
-        if ($wp_memory_int < 67108864) {
-            $wp_memory_to_display = '<mark class="error">'
-                                    . sprintf(
-                                        esc_html__(
-                                            '%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s',
-                                            'event_espresso'
-                                        ),
-                                        WP_MEMORY_LIMIT,
-                                        '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">',
-                                        '</a>"'
-                                    )
-                                    . '</mark>';
-        } else {
-            $wp_memory_to_display = '<mark class="yes">' . size_format($wp_memory_int) . '</mark>';
-        }
-        return [
-            'name'                => get_bloginfo('name', 'display'),
-            'is_multisite'        => is_multisite(),
-            'version'             => get_bloginfo('version', 'display'),
-            'home_url'            => home_url(),
-            'site_url'            => site_url(),
-            'WP_DEBUG'            => WP_DEBUG,
-            'permalink_structure' => get_option('permalink_structure'),
-            'theme'               => wp_get_theme(),
-            'gmt_offset'          => get_option('gmt_offset'),
-            'timezone_string'     => get_option('timezone_string'),
-            'admin_email'         => get_bloginfo('admin_email', 'display'),
-            'language'            => get_bloginfo('language', 'display'),
-            'wp_max_upload_size'  => size_format(wp_max_upload_size()),
-            'wp_memory'           => $wp_memory_to_display,
-        ];
-    }
-
-
-    /**
-     * Gets an array of information about the history of ee versions installed
-     *
-     * @return array
-     */
-    public function get_ee_activation_history(): array
-    {
-        return get_option('espresso_db_update');
-    }
-
-
-    /**
-     * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that
-     * version was installed
-     *
-     * @return EE_Data_Migration_Script_Base[]
-     */
-    public function get_ee_migration_history(): array
-    {
-        $presentable_migration_scripts = [];
-        $options                       = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
-        foreach ($options as $option_array) {
-            $key                                   = str_replace(
-                EE_Data_Migration_Manager::data_migration_script_option_prefix,
-                '',
-                $option_array['option_name']
-            );
-            $presentable_migration_scripts[ $key ] = maybe_unserialize($option_array['option_value']);
-        }
-        return $presentable_migration_scripts;
-    }
-
-
-    /**
-     *
-     * @return EE_Config
-     */
-    public function get_ee_config(): EE_Config
-    {
-        return EE_Config::instance();
-    }
-
-
-    /**
-     * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463
-     *
-     * @return array like the output of phpinfo(), but in an array
-     */
-    public function get_php_info(): array
-    {
-        ob_start();
-        phpinfo(-1);
-
-        $pi = preg_replace(
-            [
-                '#^.*<body>(.*)</body>.*$#ms',
-                '#<h2>PHP License</h2>.*$#ms',
-                '#<h1>Configuration</h1>#',
-                "#\r?\n#",
-                "#</(h1|h2|h3|tr)>#",
-                '# +<#',
-                "#[ \t]+#",
-                '#&nbsp;#',
-                '#  +#',
-                '# class=".*?"#',
-                '%&#039;%',
-                '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
-                . '<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
-                '#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
-                '#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
-                "# +#",
-                '#<tr>#',
-                '#</tr>#',
-            ],
-            [
-                '$1',
-                '',
-                '',
-                '',
-                '</$1>' . "\n",
-                '<',
-                ' ',
-                ' ',
-                ' ',
-                '',
-                ' ',
-                '<h2>PHP Configuration</h2>' . "\n" . '<tr><td>PHP Version</td><td>$2</td></tr>' .
-                "\n" . '<tr><td>PHP Egg</td><td>$1</td></tr>',
-                '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-                '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
-                '<tr><td>Zend Egg</td><td>$1</td></tr>',
-                ' ',
-                '%S%',
-                '%E%',
-            ],
-            ob_get_clean()
-        );
-
-        $sections = explode('<h2>', strip_tags($pi, '<h2><th><td>'));
-        unset($sections[0]);
-
-        $pi = [];
-        foreach ($sections as $section) {
-            $n = substr($section, 0, strpos($section, '</h2>'));
-            preg_match_all(
-                '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
-                $section,
-                $ask_apache,
-                PREG_SET_ORDER
-            );
-            foreach ($ask_apache as $m) {
-                $m2 = $m[2] ?? null;
-            }
-            $pi[ $n ][ $m[1] ] = (! isset($m[3]) || $m2 == $m[3])
-                ? $m2
-                : array_slice($m, 2);
-        }
-
-        return $pi;
-    }
-
-
-    /**
-     * Checks if site responds ot HTTPS
-     *
-     * @return string
-     */
-    public function get_https_enabled(): string
-    {
-        $home     = str_replace("http://", "https://", home_url());
-        $response = wp_remote_get($home);
-        if ($response instanceof WP_Error) {
-            $error_string = '';
-            foreach ($response->errors as $short_name => $description_array) {
-                $error_string .= "<b>$short_name</b>: " . implode(", ", $description_array);
-            }
-            return $error_string;
-        }
-        return "ok!";
-    }
-
-
-    /**
-     * Whether or not a .maintenance file is detected
-     *
-     * @return string wp_maintenance_mode status
-     */
-    public function get_wp_maintenance_mode(): string
-    {
-        $opened = file_exists(ABSPATH . '.maintenance');
-        return $opened
-            ? sprintf(
-                esc_html__(
-                    '%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            )
-            : esc_html__('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso');
-    }
-
-
-    /**
-     * Whether or not logging is enabled
-     *
-     * @return string logging's status
-     */
-    public function get_logging_enabled(): string
-    {
-        $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a');
-        return $opened
-            ? esc_html__('Log Directory is writable', 'event_espresso')
-            : sprintf(__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>');
-    }
-
-
-    /**
-     *  Whether curl ro fsock works
-     *
-     * @return string describing posting's status
-     */
-    public function get_remote_posting(): string
-    {
-        $fsock_works = function_exists('fsockopen');
-        $curl_works  = function_exists('curl_init');
-        if ($fsock_works && $curl_works) {
-            $status = esc_html__('Your server has fsockopen and cURL enabled.', 'event_espresso');
-        } elseif ($fsock_works) {
-            $status = esc_html__('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
-        } elseif ($curl_works) {
-            $status = esc_html__('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
-        } else {
-            $status = esc_html__(
-                          'Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.',
-                          'event_espresso'
-                      ) . '</mark>';
-        }
-        return $status;
-    }
-
-
-    /**
-     * Gets all the php.ini settings
-     *
-     * @return array
-     */
-    public function get_php_ini_all(): array
-    {
-        return ini_get_all();
-    }
-
-
-    /**
-     * Transforms the php.ini notation for numbers (like '2M') to an integer.
-     *
-     * @param string $size
-     * @return int
-     * @noinspection PhpMissingBreakStatementInspection
-     */
-    public function let_to_num(string $size): int
-    {
-        $l   = substr($size, -1);
-        $ret = substr($size, 0, -1);
-        // phpcs:disable PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
-        switch (strtoupper($l)) {
-            case 'P':
-                $ret *= 1024;
-            case 'T':
-                $ret *= 1024;
-            case 'G':
-                $ret *= 1024;
-            case 'M':
-                $ret *= 1024;
-            case 'K':
-                $ret *= 1024;
-        }
-        // phpcs:enable
-        return $ret;
-    }
+	/**
+	 * @var EEM_System_Status
+	 */
+	protected static $_instance;
+
+
+	/**
+	 * This function is a singleton method used to instantiate the EEM_Attendee object
+	 *
+	 * @return EEM_System_Status
+	 */
+	public static function instance(): EEM_System_Status
+	{
+
+		// check if instance of EEM_System_Status already exists
+		if (self::$_instance === null) {
+			// instantiate EEM_System_Status
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	private function __construct()
+	{
+	}
+
+
+	/**
+	 * @return array where each key is a function name on this class, and each value is SOMETHING--
+	 * it might be a value, an array, or an object
+	 */
+	public function get_system_stati(): array
+	{
+		return apply_filters(
+			'FHEE__EEM_System_Status__get_system_stati',
+			[
+				'ee_version'            => $this->get_ee_version(),
+				'ee_activation_history' => $this->get_ee_activation_history(),
+				'ee_config'             => $this->get_ee_config(),
+				'ee_migration_history'  => $this->get_ee_migration_history(),
+				'active_plugins'        => $this->get_active_plugins(),
+				'wp_settings'           => $this->get_wp_settings(),
+				'wp_maintenance_mode'   => $this->get_wp_maintenance_mode(),
+				'https_enabled'         => $this->get_https_enabled(),
+				'logging_enabled'       => $this->get_logging_enabled(),
+				'remote_posting'        => $this->get_remote_posting(),
+				'php_version'           => $this->php_version(),
+				'php.ini_settings'      => $this->get_php_ini_all(),
+				'php_info'              => $this->get_php_info(),
+			],
+			$this
+		);
+	}
+
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function get_ee_version(): string
+	{
+		return espresso_version();
+	}
+
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function php_version(): string
+	{
+		return phpversion();
+	}
+
+
+	/**
+	 *
+	 * @return array, where each key is a plugin name (lower-cased), values are sub-arrays.
+	 * Sub-arrays like described in wp function get_plugin_data. Ie,     *
+	 *  'Name' => 'Plugin Name',
+	 * 'PluginURI' => 'Plugin URI',
+	 * 'Version' => 'Version',
+	 * 'Description' => 'Description',
+	 * 'Author' => 'Author',
+	 * 'AuthorURI' => 'Author URI',
+	 * 'TextDomain' => 'Text Domain',
+	 * 'DomainPath' => 'Domain Path',
+	 * 'Network' => 'Network',
+	 */
+	public function get_active_plugins(): array
+	{
+		$active_plugins = (array) get_option('active_plugins', []);
+		if (is_multisite()) {
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', []));
+		}
+		$active_plugins = array_map('strtolower', $active_plugins);
+		$plugin_info    = [];
+		foreach ($active_plugins as $plugin) {
+			$plugin_data = @get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin);
+
+			$plugin_info[ $plugin ] = $plugin_data;
+		}
+		return $plugin_info;
+	}
+
+
+	/**
+	 *
+	 * @return array with keys 'home_url' and 'site_url'
+	 */
+	public function get_wp_settings(): array
+	{
+		$wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT);
+		if ($wp_memory_int < 67108864) {
+			$wp_memory_to_display = '<mark class="error">'
+									. sprintf(
+										esc_html__(
+											'%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s',
+											'event_espresso'
+										),
+										WP_MEMORY_LIMIT,
+										'<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">',
+										'</a>"'
+									)
+									. '</mark>';
+		} else {
+			$wp_memory_to_display = '<mark class="yes">' . size_format($wp_memory_int) . '</mark>';
+		}
+		return [
+			'name'                => get_bloginfo('name', 'display'),
+			'is_multisite'        => is_multisite(),
+			'version'             => get_bloginfo('version', 'display'),
+			'home_url'            => home_url(),
+			'site_url'            => site_url(),
+			'WP_DEBUG'            => WP_DEBUG,
+			'permalink_structure' => get_option('permalink_structure'),
+			'theme'               => wp_get_theme(),
+			'gmt_offset'          => get_option('gmt_offset'),
+			'timezone_string'     => get_option('timezone_string'),
+			'admin_email'         => get_bloginfo('admin_email', 'display'),
+			'language'            => get_bloginfo('language', 'display'),
+			'wp_max_upload_size'  => size_format(wp_max_upload_size()),
+			'wp_memory'           => $wp_memory_to_display,
+		];
+	}
+
+
+	/**
+	 * Gets an array of information about the history of ee versions installed
+	 *
+	 * @return array
+	 */
+	public function get_ee_activation_history(): array
+	{
+		return get_option('espresso_db_update');
+	}
+
+
+	/**
+	 * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that
+	 * version was installed
+	 *
+	 * @return EE_Data_Migration_Script_Base[]
+	 */
+	public function get_ee_migration_history(): array
+	{
+		$presentable_migration_scripts = [];
+		$options                       = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
+		foreach ($options as $option_array) {
+			$key                                   = str_replace(
+				EE_Data_Migration_Manager::data_migration_script_option_prefix,
+				'',
+				$option_array['option_name']
+			);
+			$presentable_migration_scripts[ $key ] = maybe_unserialize($option_array['option_value']);
+		}
+		return $presentable_migration_scripts;
+	}
+
+
+	/**
+	 *
+	 * @return EE_Config
+	 */
+	public function get_ee_config(): EE_Config
+	{
+		return EE_Config::instance();
+	}
+
+
+	/**
+	 * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463
+	 *
+	 * @return array like the output of phpinfo(), but in an array
+	 */
+	public function get_php_info(): array
+	{
+		ob_start();
+		phpinfo(-1);
+
+		$pi = preg_replace(
+			[
+				'#^.*<body>(.*)</body>.*$#ms',
+				'#<h2>PHP License</h2>.*$#ms',
+				'#<h1>Configuration</h1>#',
+				"#\r?\n#",
+				"#</(h1|h2|h3|tr)>#",
+				'# +<#',
+				"#[ \t]+#",
+				'#&nbsp;#',
+				'#  +#',
+				'# class=".*?"#',
+				'%&#039;%',
+				'#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
+				. '<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
+				'#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
+				'#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
+				"# +#",
+				'#<tr>#',
+				'#</tr>#',
+			],
+			[
+				'$1',
+				'',
+				'',
+				'',
+				'</$1>' . "\n",
+				'<',
+				' ',
+				' ',
+				' ',
+				'',
+				' ',
+				'<h2>PHP Configuration</h2>' . "\n" . '<tr><td>PHP Version</td><td>$2</td></tr>' .
+				"\n" . '<tr><td>PHP Egg</td><td>$1</td></tr>',
+				'<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
+				'<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
+				'<tr><td>Zend Egg</td><td>$1</td></tr>',
+				' ',
+				'%S%',
+				'%E%',
+			],
+			ob_get_clean()
+		);
+
+		$sections = explode('<h2>', strip_tags($pi, '<h2><th><td>'));
+		unset($sections[0]);
+
+		$pi = [];
+		foreach ($sections as $section) {
+			$n = substr($section, 0, strpos($section, '</h2>'));
+			preg_match_all(
+				'#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
+				$section,
+				$ask_apache,
+				PREG_SET_ORDER
+			);
+			foreach ($ask_apache as $m) {
+				$m2 = $m[2] ?? null;
+			}
+			$pi[ $n ][ $m[1] ] = (! isset($m[3]) || $m2 == $m[3])
+				? $m2
+				: array_slice($m, 2);
+		}
+
+		return $pi;
+	}
+
+
+	/**
+	 * Checks if site responds ot HTTPS
+	 *
+	 * @return string
+	 */
+	public function get_https_enabled(): string
+	{
+		$home     = str_replace("http://", "https://", home_url());
+		$response = wp_remote_get($home);
+		if ($response instanceof WP_Error) {
+			$error_string = '';
+			foreach ($response->errors as $short_name => $description_array) {
+				$error_string .= "<b>$short_name</b>: " . implode(", ", $description_array);
+			}
+			return $error_string;
+		}
+		return "ok!";
+	}
+
+
+	/**
+	 * Whether or not a .maintenance file is detected
+	 *
+	 * @return string wp_maintenance_mode status
+	 */
+	public function get_wp_maintenance_mode(): string
+	{
+		$opened = file_exists(ABSPATH . '.maintenance');
+		return $opened
+			? sprintf(
+				esc_html__(
+					'%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			)
+			: esc_html__('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso');
+	}
+
+
+	/**
+	 * Whether or not logging is enabled
+	 *
+	 * @return string logging's status
+	 */
+	public function get_logging_enabled(): string
+	{
+		$opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a');
+		return $opened
+			? esc_html__('Log Directory is writable', 'event_espresso')
+			: sprintf(__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>');
+	}
+
+
+	/**
+	 *  Whether curl ro fsock works
+	 *
+	 * @return string describing posting's status
+	 */
+	public function get_remote_posting(): string
+	{
+		$fsock_works = function_exists('fsockopen');
+		$curl_works  = function_exists('curl_init');
+		if ($fsock_works && $curl_works) {
+			$status = esc_html__('Your server has fsockopen and cURL enabled.', 'event_espresso');
+		} elseif ($fsock_works) {
+			$status = esc_html__('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
+		} elseif ($curl_works) {
+			$status = esc_html__('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
+		} else {
+			$status = esc_html__(
+						  'Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.',
+						  'event_espresso'
+					  ) . '</mark>';
+		}
+		return $status;
+	}
+
+
+	/**
+	 * Gets all the php.ini settings
+	 *
+	 * @return array
+	 */
+	public function get_php_ini_all(): array
+	{
+		return ini_get_all();
+	}
+
+
+	/**
+	 * Transforms the php.ini notation for numbers (like '2M') to an integer.
+	 *
+	 * @param string $size
+	 * @return int
+	 * @noinspection PhpMissingBreakStatementInspection
+	 */
+	public function let_to_num(string $size): int
+	{
+		$l   = substr($size, -1);
+		$ret = substr($size, 0, -1);
+		// phpcs:disable PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
+		switch (strtoupper($l)) {
+			case 'P':
+				$ret *= 1024;
+			case 'T':
+				$ret *= 1024;
+			case 'G':
+				$ret *= 1024;
+			case 'M':
+				$ret *= 1024;
+			case 'K':
+				$ret *= 1024;
+		}
+		// phpcs:enable
+		return $ret;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -105,9 +105,9 @@ 
         $active_plugins = array_map('strtolower', $active_plugins);
         $plugin_info    = [];
         foreach ($active_plugins as $plugin) {
-            $plugin_data = @get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin);
+            $plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
 
-            $plugin_info[ $plugin ] = $plugin_data;
+            $plugin_info[$plugin] = $plugin_data;
         }
         return $plugin_info;
     }
@@ -133,7 +133,7 @@ 
                                     )
                                     . '</mark>';
         } else {
-            $wp_memory_to_display = '<mark class="yes">' . size_format($wp_memory_int) . '</mark>';
+            $wp_memory_to_display = '<mark class="yes">'.size_format($wp_memory_int).'</mark>';
         }
         return [
             'name'                => get_bloginfo('name', 'display'),
@@ -176,12 +176,12 @@ 
         $presentable_migration_scripts = [];
         $options                       = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
         foreach ($options as $option_array) {
-            $key                                   = str_replace(
+            $key = str_replace(
                 EE_Data_Migration_Manager::data_migration_script_option_prefix,
                 '',
                 $option_array['option_name']
             );
-            $presentable_migration_scripts[ $key ] = maybe_unserialize($option_array['option_value']);
+            $presentable_migration_scripts[$key] = maybe_unserialize($option_array['option_value']);
         }
         return $presentable_migration_scripts;
     }
@@ -233,17 +233,17 @@ 
                 '',
                 '',
                 '',
-                '</$1>' . "\n",
+                '</$1>'."\n",
                 '<',
                 ' ',
                 ' ',
                 ' ',
                 '',
                 ' ',
-                '<h2>PHP Configuration</h2>' . "\n" . '<tr><td>PHP Version</td><td>$2</td></tr>' .
-                "\n" . '<tr><td>PHP Egg</td><td>$1</td></tr>',
+                '<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'.
+                "\n".'<tr><td>PHP Egg</td><td>$1</td></tr>',
                 '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-                '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
+                '<tr><td>Zend Engine</td><td>$2</td></tr>'."\n".
                 '<tr><td>Zend Egg</td><td>$1</td></tr>',
                 ' ',
                 '%S%',
@@ -267,7 +267,7 @@ 
             foreach ($ask_apache as $m) {
                 $m2 = $m[2] ?? null;
             }
-            $pi[ $n ][ $m[1] ] = (! isset($m[3]) || $m2 == $m[3])
+            $pi[$n][$m[1]] = ( ! isset($m[3]) || $m2 == $m[3])
                 ? $m2
                 : array_slice($m, 2);
         }
@@ -288,7 +288,7 @@ 
         if ($response instanceof WP_Error) {
             $error_string = '';
             foreach ($response->errors as $short_name => $description_array) {
-                $error_string .= "<b>$short_name</b>: " . implode(", ", $description_array);
+                $error_string .= "<b>$short_name</b>: ".implode(", ", $description_array);
             }
             return $error_string;
         }
@@ -303,7 +303,7 @@ 
      */
     public function get_wp_maintenance_mode(): string
     {
-        $opened = file_exists(ABSPATH . '.maintenance');
+        $opened = file_exists(ABSPATH.'.maintenance');
         return $opened
             ? sprintf(
                 esc_html__(
@@ -324,7 +324,7 @@ 
      */
     public function get_logging_enabled(): string
     {
-        $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a');
+        $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR.'/logs/espresso_log.txt', 'a');
         return $opened
             ? esc_html__('Log Directory is writable', 'event_espresso')
             : sprintf(__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>');
@@ -350,7 +350,7 @@ 
             $status = esc_html__(
                           'Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.',
                           'event_espresso'
-                      ) . '</mark>';
+                      ).'</mark>';
         }
         return $status;
     }

core/db_models/EEM_Question_Group_Question.model.php

Indentation +65 added lines, -65 removed lines

@@ -14,74 +14,74 @@
 class EEM_Question_Group_Question extends EEM_Base
 {
 
-    /**
-     * @var EEM_Question_Group_Question
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Question_Group_Question
+	 */
+	protected static $_instance;
 
 
-    /**
-     * EEM_Question_Group_Question constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item    = esc_html__('Question Group to Question Link', 'event_espresso');
-        $this->plural_item      = esc_html__('Question Group to Question Links', 'event_espresso');
-        $this->_tables          = [
-            'Question_Group_Question' => new EE_Primary_Table('esp_question_group_question', 'QGQ_ID'),
-        ];
-        $this->_fields          = [
-            'Question_Group_Question' => [
-                'QGQ_ID'    => new EE_Primary_Key_Int_Field(
-                    'QGQ_ID',
-                    esc_html__('Question Group to Question Link ID', 'event_espresso')
-                ),
-                'QSG_ID'    => new EE_Foreign_Key_Int_Field(
-                    'QSG_ID',
-                    esc_html__('Question Group ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Question_Group'
-                ),
-                'QST_ID'    => new EE_Foreign_Key_Int_Field(
-                    'QST_ID',
-                    esc_html__('Question Id', 'event_espresso'),
-                    false,
-                    0,
-                    'Question'
-                ),
-                'QGQ_order' => new EE_Integer_Field(
-                    'QGQ_order',
-                    esc_html__('Question Group Question Order', 'event_espresso'),
-                    false,
-                    0
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Question_Group' => new EE_Belongs_To_Relation(),
-            'Question'       => new EE_Belongs_To_Relation(),
-        ];
+	/**
+	 * EEM_Question_Group_Question constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item    = esc_html__('Question Group to Question Link', 'event_espresso');
+		$this->plural_item      = esc_html__('Question Group to Question Links', 'event_espresso');
+		$this->_tables          = [
+			'Question_Group_Question' => new EE_Primary_Table('esp_question_group_question', 'QGQ_ID'),
+		];
+		$this->_fields          = [
+			'Question_Group_Question' => [
+				'QGQ_ID'    => new EE_Primary_Key_Int_Field(
+					'QGQ_ID',
+					esc_html__('Question Group to Question Link ID', 'event_espresso')
+				),
+				'QSG_ID'    => new EE_Foreign_Key_Int_Field(
+					'QSG_ID',
+					esc_html__('Question Group ID', 'event_espresso'),
+					false,
+					0,
+					'Question_Group'
+				),
+				'QST_ID'    => new EE_Foreign_Key_Int_Field(
+					'QST_ID',
+					esc_html__('Question Id', 'event_espresso'),
+					false,
+					0,
+					'Question'
+				),
+				'QGQ_order' => new EE_Integer_Field(
+					'QGQ_order',
+					esc_html__('Question Group Question Order', 'event_espresso'),
+					false,
+					0
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Question_Group' => new EE_Belongs_To_Relation(),
+			'Question'       => new EE_Belongs_To_Relation(),
+		];
 
-        $this->_model_chain_to_wp_user = 'Question_Group';
+		$this->_model_chain_to_wp_user = 'Question_Group';
 
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form(
-                'Question_Group.QSG_system'
-            );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       = new EE_Restriction_Generator_Reg_Form(
-                'Question_Group.QSG_system'
-            );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     = new EE_Restriction_Generator_Reg_Form(
-                'Question_Group.QSG_system'
-            );
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ]       = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form(
+				'Question_Group.QSG_system'
+			);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]       = new EE_Restriction_Generator_Reg_Form(
+				'Question_Group.QSG_system'
+			);
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ]     = new EE_Restriction_Generator_Reg_Form(
+				'Question_Group.QSG_system'
+			);
 
-        // use the caps for question groups
-        $this->_caps_slug = 'question_groups';
-        parent::__construct($timezone);
-    }
+		// use the caps for question groups
+		$this->_caps_slug = 'question_groups';
+		parent::__construct($timezone);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -69,14 +69,14 @@
         $this->_model_chain_to_wp_user = 'Question_Group';
 
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form(
+        $this->_cap_restriction_generators[EEM_Base::caps_read]       = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form(
                 'Question_Group.QSG_system'
             );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       = new EE_Restriction_Generator_Reg_Form(
+        $this->_cap_restriction_generators[EEM_Base::caps_edit]       = new EE_Restriction_Generator_Reg_Form(
                 'Question_Group.QSG_system'
             );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     = new EE_Restriction_Generator_Reg_Form(
+        $this->_cap_restriction_generators[EEM_Base::caps_delete]     = new EE_Restriction_Generator_Reg_Form(
                 'Question_Group.QSG_system'
             );
 

core/db_models/EEM_Event_Venue.model.php

Indentation +61 added lines, -61 removed lines

@@ -9,68 +9,68 @@
  */
 class EEM_Event_Venue extends EEM_Base
 {
-    // private instance of the Attendee object
-    protected static $_instance;
+	// private instance of the Attendee object
+	protected static $_instance;
 
 
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item    = esc_html__('Event to Question Group Link', 'event_espresso');
-        $this->plural_item      = esc_html__('Event to Question Group Links', 'event_espresso');
-        $this->_tables          = [
-            'Event_Venue' => new EE_Primary_Table('esp_event_venue', 'EVV_ID'),
-        ];
-        $this->_fields          = [
-            'Event_Venue' => [
-                'EVV_ID'      => new EE_Primary_Key_Int_Field(
-                    'EVV_ID',
-                    esc_html__('Event to Venue Link ID', 'event_espresso')
-                ),
-                'EVT_ID'      => new EE_Foreign_Key_Int_Field(
-                    'EVT_ID',
-                    esc_html__('Event ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Event'
-                ),
-                'VNU_ID'      => new EE_Foreign_Key_Int_Field(
-                    'VNU_ID',
-                    esc_html__('Venue ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Venue'
-                ),
-                'EVV_primary' => new EE_Boolean_Field(
-                    'EVV_primary',
-                    esc_html__("Flag indicating venue is primary one for event", "event_espresso"),
-                    false,
-                    true
-                ),
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item    = esc_html__('Event to Question Group Link', 'event_espresso');
+		$this->plural_item      = esc_html__('Event to Question Group Links', 'event_espresso');
+		$this->_tables          = [
+			'Event_Venue' => new EE_Primary_Table('esp_event_venue', 'EVV_ID'),
+		];
+		$this->_fields          = [
+			'Event_Venue' => [
+				'EVV_ID'      => new EE_Primary_Key_Int_Field(
+					'EVV_ID',
+					esc_html__('Event to Venue Link ID', 'event_espresso')
+				),
+				'EVT_ID'      => new EE_Foreign_Key_Int_Field(
+					'EVT_ID',
+					esc_html__('Event ID', 'event_espresso'),
+					false,
+					0,
+					'Event'
+				),
+				'VNU_ID'      => new EE_Foreign_Key_Int_Field(
+					'VNU_ID',
+					esc_html__('Venue ID', 'event_espresso'),
+					false,
+					0,
+					'Venue'
+				),
+				'EVV_primary' => new EE_Boolean_Field(
+					'EVV_primary',
+					esc_html__("Flag indicating venue is primary one for event", "event_espresso"),
+					false,
+					true
+				),
 
-            ],
-        ];
-        $this->_model_relations = [
-            'Event' => new EE_Belongs_To_Relation(),
-            'Venue' => new EE_Belongs_To_Relation(),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
-            'Event'
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
-                                                                  = new EE_Restriction_Generator_Event_Related_Protected(
-            'Event'
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]
-                                                                  = new EE_Restriction_Generator_Event_Related_Protected(
-            'Event'
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]
-                                                                  = new EE_Restriction_Generator_Event_Related_Protected(
-            'Event',
-            EEM_Base::caps_edit
-        );
-        $this->model_chain_to_password                            = 'Event';
-        parent::__construct($timezone);
-    }
+			],
+		];
+		$this->_model_relations = [
+			'Event' => new EE_Belongs_To_Relation(),
+			'Venue' => new EE_Belongs_To_Relation(),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
+			'Event'
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
+																  = new EE_Restriction_Generator_Event_Related_Protected(
+			'Event'
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]
+																  = new EE_Restriction_Generator_Event_Related_Protected(
+			'Event'
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ]
+																  = new EE_Restriction_Generator_Event_Related_Protected(
+			'Event',
+			EEM_Base::caps_edit
+		);
+		$this->model_chain_to_password                            = 'Event';
+		parent::__construct($timezone);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -54,23 +54,23 @@
             'Venue' => new EE_Belongs_To_Relation(),
         ];
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public(
             'Event'
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin]
                                                                   = new EE_Restriction_Generator_Event_Related_Protected(
             'Event'
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]
+        $this->_cap_restriction_generators[EEM_Base::caps_edit]
                                                                   = new EE_Restriction_Generator_Event_Related_Protected(
             'Event'
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]
+        $this->_cap_restriction_generators[EEM_Base::caps_delete]
                                                                   = new EE_Restriction_Generator_Event_Related_Protected(
             'Event',
             EEM_Base::caps_edit
         );
-        $this->model_chain_to_password                            = 'Event';
+        $this->model_chain_to_password = 'Event';
         parent::__construct($timezone);
     }
 }

core/db_models/EEM_WP_User.model.php

Indentation +122 added lines, -122 removed lines

@@ -13,132 +13,132 @@
 class EEM_WP_User extends EEM_Base
 {
 
-    /**
-     * private instance of the EEM_WP_User object
-     *
-     * @type EEM_WP_User
-     */
-    protected static $_instance;
+	/**
+	 * private instance of the EEM_WP_User object
+	 *
+	 * @type EEM_WP_User
+	 */
+	protected static $_instance;
 
 
-    /**
-     *    constructor
-     *
-     * @param string                 $timezone
-     * @param ModelFieldFactory|null $model_field_factory
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '', ModelFieldFactory $model_field_factory = null)
-    {
-        $this->singular_item = esc_html__('WP_User', 'event_espresso');
-        $this->plural_item = esc_html__('WP_Users', 'event_espresso');
-        global $wpdb;
-        $this->_tables = array(
-            'WP_User' => new EE_Primary_Table($wpdb->users, 'ID', true),
-        );
-        $this->_fields = array(
-            'WP_User' => array(
-                'ID'                  => $model_field_factory->createPrimaryKeyIntField(
-                    'ID',
-                    esc_html__('WP_User ID', 'event_espresso')
-                ),
-                'user_login'          => $model_field_factory->createPlainTextField(
-                    'user_login',
-                    esc_html__('User Login', 'event_espresso'),
-                    false
-                ),
-                'user_pass'           => $model_field_factory->createPlainTextField(
-                    'user_pass',
-                    esc_html__('User Password', 'event_espresso'),
-                    false
-                ),
-                'user_nicename'       => $model_field_factory->createPlainTextField(
-                    'user_nicename',
-                    esc_html__(' User Nice Name', 'event_espresso'),
-                    false
-                ),
-                'user_email'          => $model_field_factory->createEmailField(
-                    'user_email',
-                    esc_html__('User Email', 'event_espresso'),
-                    false,
-                    null
-                ),
-                'user_registered'     => $model_field_factory->createDatetimeField(
-                    'user_registered',
-                    esc_html__('Date User Registered', 'event_espresso'),
-                    $timezone
-                ),
-                'user_activation_key' => $model_field_factory->createPlainTextField(
-                    'user_activation_key',
-                    esc_html__('User Activation Key', 'event_espresso'),
-                    false
-                ),
-                'user_status'         => $model_field_factory->createIntegerField(
-                    'user_status',
-                    esc_html__('User Status', 'event_espresso')
-                ),
-                'display_name'        => $model_field_factory->createPlainTextField(
-                    'display_name',
-                    esc_html__('Display Name', 'event_espresso'),
-                    false
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Attendee'       => new EE_Has_Many_Relation(),
-            // all models are related to the change log
-            // 'Change_Log'     => new EE_Has_Many_Relation(),
-            'Event'          => new EE_Has_Many_Relation(),
-            'Message'        => new EE_Has_Many_Relation(),
-            'Payment_Method' => new EE_Has_Many_Relation(),
-            'Price'          => new EE_Has_Many_Relation(),
-            'Price_Type'     => new EE_Has_Many_Relation(),
-            'Question'       => new EE_Has_Many_Relation(),
-            'Question_Group' => new EE_Has_Many_Relation(),
-            'Ticket'         => new EE_Has_Many_Relation(),
-            'Venue'          => new EE_Has_Many_Relation(),
-        );
-        $this->foreign_key_aliases = [
-            'Event.EVT_wp_user'          => 'WP_User.ID',
-            'Payment_Method.PMD_wp_user' => 'WP_User.ID',
-            'Price.PRC_wp_user'          => 'WP_User.ID',
-            'Price_Type.PRT_wp_user'     => 'WP_User.ID',
-            'Question.QST_wp_user'       => 'WP_User.ID',
-            'Question_Group.QSG_wp_user' => 'WP_User.ID',
-            'Ticket.VNU_wp_user'         => 'WP_User.ID',
-            'Venue.TKT_wp_user'          => 'WP_User.ID',
-        ];
-        $this->_wp_core_model = true;
-        $this->_caps_slug = 'users';
-        $this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
-        $this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
-        foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
-            $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
-        }
-        // @todo: account for create_users controls whether they can create users at all
-        parent::__construct($timezone);
-    }
+	/**
+	 *    constructor
+	 *
+	 * @param string                 $timezone
+	 * @param ModelFieldFactory|null $model_field_factory
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '', ModelFieldFactory $model_field_factory = null)
+	{
+		$this->singular_item = esc_html__('WP_User', 'event_espresso');
+		$this->plural_item = esc_html__('WP_Users', 'event_espresso');
+		global $wpdb;
+		$this->_tables = array(
+			'WP_User' => new EE_Primary_Table($wpdb->users, 'ID', true),
+		);
+		$this->_fields = array(
+			'WP_User' => array(
+				'ID'                  => $model_field_factory->createPrimaryKeyIntField(
+					'ID',
+					esc_html__('WP_User ID', 'event_espresso')
+				),
+				'user_login'          => $model_field_factory->createPlainTextField(
+					'user_login',
+					esc_html__('User Login', 'event_espresso'),
+					false
+				),
+				'user_pass'           => $model_field_factory->createPlainTextField(
+					'user_pass',
+					esc_html__('User Password', 'event_espresso'),
+					false
+				),
+				'user_nicename'       => $model_field_factory->createPlainTextField(
+					'user_nicename',
+					esc_html__(' User Nice Name', 'event_espresso'),
+					false
+				),
+				'user_email'          => $model_field_factory->createEmailField(
+					'user_email',
+					esc_html__('User Email', 'event_espresso'),
+					false,
+					null
+				),
+				'user_registered'     => $model_field_factory->createDatetimeField(
+					'user_registered',
+					esc_html__('Date User Registered', 'event_espresso'),
+					$timezone
+				),
+				'user_activation_key' => $model_field_factory->createPlainTextField(
+					'user_activation_key',
+					esc_html__('User Activation Key', 'event_espresso'),
+					false
+				),
+				'user_status'         => $model_field_factory->createIntegerField(
+					'user_status',
+					esc_html__('User Status', 'event_espresso')
+				),
+				'display_name'        => $model_field_factory->createPlainTextField(
+					'display_name',
+					esc_html__('Display Name', 'event_espresso'),
+					false
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Attendee'       => new EE_Has_Many_Relation(),
+			// all models are related to the change log
+			// 'Change_Log'     => new EE_Has_Many_Relation(),
+			'Event'          => new EE_Has_Many_Relation(),
+			'Message'        => new EE_Has_Many_Relation(),
+			'Payment_Method' => new EE_Has_Many_Relation(),
+			'Price'          => new EE_Has_Many_Relation(),
+			'Price_Type'     => new EE_Has_Many_Relation(),
+			'Question'       => new EE_Has_Many_Relation(),
+			'Question_Group' => new EE_Has_Many_Relation(),
+			'Ticket'         => new EE_Has_Many_Relation(),
+			'Venue'          => new EE_Has_Many_Relation(),
+		);
+		$this->foreign_key_aliases = [
+			'Event.EVT_wp_user'          => 'WP_User.ID',
+			'Payment_Method.PMD_wp_user' => 'WP_User.ID',
+			'Price.PRC_wp_user'          => 'WP_User.ID',
+			'Price_Type.PRT_wp_user'     => 'WP_User.ID',
+			'Question.QST_wp_user'       => 'WP_User.ID',
+			'Question_Group.QSG_wp_user' => 'WP_User.ID',
+			'Ticket.VNU_wp_user'         => 'WP_User.ID',
+			'Venue.TKT_wp_user'          => 'WP_User.ID',
+		];
+		$this->_wp_core_model = true;
+		$this->_caps_slug = 'users';
+		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
+		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
+		}
+		// @todo: account for create_users controls whether they can create users at all
+		parent::__construct($timezone);
+	}
 
 
-    /**
-     * We don't need a foreign key to the WP_User model, we just need its primary key
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function wp_user_field_name(): string
-    {
-        return $this->primary_key_name();
-    }
+	/**
+	 * We don't need a foreign key to the WP_User model, we just need its primary key
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function wp_user_field_name(): string
+	{
+		return $this->primary_key_name();
+	}
 
 
-    /**
-     * This WP_User model IS owned, even though it doesn't have a foreign key to itself
-     *
-     * @return boolean
-     */
-    public function is_owned(): bool
-    {
-        return true;
-    }
+	/**
+	 * This WP_User model IS owned, even though it doesn't have a foreign key to itself
+	 *
+	 * @return boolean
+	 */
+	public function is_owned(): bool
+	{
+		return true;
+	}
 }

core/db_models/EEM_Datetime_Ticket.model.php

Indentation +70 added lines, -70 removed lines

@@ -11,77 +11,77 @@
 {
 
 
-    // private instance of the EEM_Datetime_Ticket object
-    protected static $_instance;
+	// private instance of the EEM_Datetime_Ticket object
+	protected static $_instance;
 
 
-    /**
-     *      private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access private
-     * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
-     *                         incoming timezone data that gets saved).  Note this just sends the timezone info to the
-     *                         date time model field objects.  Default is NULL (and will be assumed using the set
-     *                         timezone in the 'timezone_string' wp option)
-     * @return void
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item = esc_html__('Datetime Ticket', 'event_espresso');
-        $this->plural_item   = esc_html__('Datetime Tickets', 'event_espresso');
+	/**
+	 *      private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access private
+	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
+	 *                         incoming timezone data that gets saved).  Note this just sends the timezone info to the
+	 *                         date time model field objects.  Default is NULL (and will be assumed using the set
+	 *                         timezone in the 'timezone_string' wp option)
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item = esc_html__('Datetime Ticket', 'event_espresso');
+		$this->plural_item   = esc_html__('Datetime Tickets', 'event_espresso');
 
-        $this->_tables          = [
-            'Datetime_Ticket' => new EE_Primary_Table(
-                'esp_datetime_ticket',
-                'DTK_ID'
-            ),
-        ];
-        $this->_fields          = [
-            'Datetime_Ticket' => [
-                'DTK_ID' => new EE_Primary_Key_Int_Field(
-                    'DTK_ID',
-                    esc_html__('Datetime Ticket ID', 'event_espresso')
-                ),
-                'DTT_ID' => new EE_Foreign_Key_Int_Field(
-                    'DTT_ID',
-                    esc_html__('The ID to the Datetime', 'event_espresso'),
-                    false,
-                    0,
-                    'Datetime'
-                ),
-                'TKT_ID' => new EE_Foreign_Key_Int_Field(
-                    'TKT_ID',
-                    esc_html__('The ID to the Ticket', 'event_espresso'),
-                    false,
-                    0,
-                    'Ticket'
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Ticket'   => new EE_Belongs_To_Relation(),
-            'Datetime' => new EE_Belongs_To_Relation(),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
-            'Datetime.Event'
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
-                                                                  = new EE_Restriction_Generator_Event_Related_Protected(
-            'Datetime.Event'
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]
-                                                                  = new EE_Restriction_Generator_Event_Related_Protected(
-            'Datetime.Event'
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]
-                                                                  = new EE_Restriction_Generator_Event_Related_Protected(
-            'Datetime.Event',
-            EEM_Base::caps_edit
-        );
-        $this->model_chain_to_password                            = 'Datetime.Event';
-        parent::__construct($timezone);
-    }
+		$this->_tables          = [
+			'Datetime_Ticket' => new EE_Primary_Table(
+				'esp_datetime_ticket',
+				'DTK_ID'
+			),
+		];
+		$this->_fields          = [
+			'Datetime_Ticket' => [
+				'DTK_ID' => new EE_Primary_Key_Int_Field(
+					'DTK_ID',
+					esc_html__('Datetime Ticket ID', 'event_espresso')
+				),
+				'DTT_ID' => new EE_Foreign_Key_Int_Field(
+					'DTT_ID',
+					esc_html__('The ID to the Datetime', 'event_espresso'),
+					false,
+					0,
+					'Datetime'
+				),
+				'TKT_ID' => new EE_Foreign_Key_Int_Field(
+					'TKT_ID',
+					esc_html__('The ID to the Ticket', 'event_espresso'),
+					false,
+					0,
+					'Ticket'
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Ticket'   => new EE_Belongs_To_Relation(),
+			'Datetime' => new EE_Belongs_To_Relation(),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
+			'Datetime.Event'
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
+																  = new EE_Restriction_Generator_Event_Related_Protected(
+			'Datetime.Event'
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]
+																  = new EE_Restriction_Generator_Event_Related_Protected(
+			'Datetime.Event'
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ]
+																  = new EE_Restriction_Generator_Event_Related_Protected(
+			'Datetime.Event',
+			EEM_Base::caps_edit
+		);
+		$this->model_chain_to_password                            = 'Datetime.Event';
+		parent::__construct($timezone);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -32,13 +32,13 @@ 
         $this->singular_item = esc_html__('Datetime Ticket', 'event_espresso');
         $this->plural_item   = esc_html__('Datetime Tickets', 'event_espresso');
 
-        $this->_tables          = [
+        $this->_tables = [
             'Datetime_Ticket' => new EE_Primary_Table(
                 'esp_datetime_ticket',
                 'DTK_ID'
             ),
         ];
-        $this->_fields          = [
+        $this->_fields = [
             'Datetime_Ticket' => [
                 'DTK_ID' => new EE_Primary_Key_Int_Field(
                     'DTK_ID',
@@ -65,23 +65,23 @@ 
             'Datetime' => new EE_Belongs_To_Relation(),
         ];
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public(
             'Datetime.Event'
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ]
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin]
                                                                   = new EE_Restriction_Generator_Event_Related_Protected(
             'Datetime.Event'
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]
+        $this->_cap_restriction_generators[EEM_Base::caps_edit]
                                                                   = new EE_Restriction_Generator_Event_Related_Protected(
             'Datetime.Event'
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]
+        $this->_cap_restriction_generators[EEM_Base::caps_delete]
                                                                   = new EE_Restriction_Generator_Event_Related_Protected(
             'Datetime.Event',
             EEM_Base::caps_edit
         );
-        $this->model_chain_to_password                            = 'Datetime.Event';
+        $this->model_chain_to_password = 'Datetime.Event';
         parent::__construct($timezone);
     }
 }

core/db_models/EEM_Status.model.php

Indentation +310 added lines, -310 removed lines

@@ -10,325 +10,325 @@
 class EEM_Status extends EEM_Base
 {
 
-    /**
-     * @var EEM_Status
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Status
+	 */
+	protected static $_instance;
 
 
-    /**
-     * EEM_Status constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item    = esc_html__('Status', 'event_espresso');
-        $this->plural_item      = esc_html__('Stati', 'event_espresso');
-        $this->_tables          = [
-            'StatusTable' => new EE_Primary_Table('esp_status', 'STS_ID'),
-        ];
-        $this->_fields          = [
-            'StatusTable' => [
-                'STS_ID'       => new EE_Primary_Key_String_Field(
-                    'STS_ID',
-                    esc_html__('Status ID', 'event_espresso')
-                ),
-                'STS_code'     => new EE_Plain_Text_Field(
-                    'STS_code',
-                    esc_html__('Status Code', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'STS_type'     => new EE_Enum_Text_Field(
-                    'STS_type',
-                    esc_html__("Type", "event_espresso"),
-                    false,
-                    'event',
-                    [
-                        'event'        => esc_html__("Event", "event_espresso"),// deprecated
-                        'registration' => esc_html__("Registration", "event_espresso"),
-                        'transaction'  => esc_html__("Transaction", "event_espresso"),
-                        'payment'      => esc_html__("Payment", "event_espresso"),
-                        'email'        => esc_html__("Email", "event_espresso"),
-                        'message'      => esc_html__("Message", "event_espresso"),
-                    ]
-                ),
-                'STS_can_edit' => new EE_Boolean_Field(
-                    'STS_can_edit',
-                    esc_html__('Editable?', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'STS_desc'     => new EE_Simple_HTML_Field(
-                    'STS_desc',
-                    esc_html__("Description", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'STS_open'     => new EE_Boolean_Field(
-                    'STS_open',
-                    esc_html__("Open?", "event_espresso"),
-                    false,
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Registration' => new EE_Has_Many_Relation(),
-            'Transaction'  => new EE_Has_Many_Relation(),
-            'Payment'      => new EE_Has_Many_Relation(),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+	/**
+	 * EEM_Status constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item    = esc_html__('Status', 'event_espresso');
+		$this->plural_item      = esc_html__('Stati', 'event_espresso');
+		$this->_tables          = [
+			'StatusTable' => new EE_Primary_Table('esp_status', 'STS_ID'),
+		];
+		$this->_fields          = [
+			'StatusTable' => [
+				'STS_ID'       => new EE_Primary_Key_String_Field(
+					'STS_ID',
+					esc_html__('Status ID', 'event_espresso')
+				),
+				'STS_code'     => new EE_Plain_Text_Field(
+					'STS_code',
+					esc_html__('Status Code', 'event_espresso'),
+					false,
+					''
+				),
+				'STS_type'     => new EE_Enum_Text_Field(
+					'STS_type',
+					esc_html__("Type", "event_espresso"),
+					false,
+					'event',
+					[
+						'event'        => esc_html__("Event", "event_espresso"),// deprecated
+						'registration' => esc_html__("Registration", "event_espresso"),
+						'transaction'  => esc_html__("Transaction", "event_espresso"),
+						'payment'      => esc_html__("Payment", "event_espresso"),
+						'email'        => esc_html__("Email", "event_espresso"),
+						'message'      => esc_html__("Message", "event_espresso"),
+					]
+				),
+				'STS_can_edit' => new EE_Boolean_Field(
+					'STS_can_edit',
+					esc_html__('Editable?', 'event_espresso'),
+					false,
+					false
+				),
+				'STS_desc'     => new EE_Simple_HTML_Field(
+					'STS_desc',
+					esc_html__("Description", "event_espresso"),
+					false,
+					''
+				),
+				'STS_open'     => new EE_Boolean_Field(
+					'STS_open',
+					esc_html__("Open?", "event_espresso"),
+					false,
+					false
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Registration' => new EE_Has_Many_Relation(),
+			'Transaction'  => new EE_Has_Many_Relation(),
+			'Payment'      => new EE_Has_Many_Relation(),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
 
-        parent::__construct($timezone);
-    }
+		parent::__construct($timezone);
+	}
 
 
-    /**
-     * This method provides the localized singular or plural string for a given status id
-     *
-     * @param array   $statuses  This should be an array of statuses in the format array( $status_id, $status_code ).
-     *                           That way if there isn't a translation in the index we'll return the default code.
-     * @param boolean $plural    Whether to return plural string or not. Note, nearly all of the plural strings are the
-     *                           same as the singular (in English), however, this may NOT be the case with other
-     *                           languages
-     * @param string  $schema    This can be either 'upper', 'lower', or 'sentence'.  Basically indicates how we want
-     *                           the status string returned ( UPPER, lower, Sentence)
-     * @return array             an array of translated strings for the incoming status id.
-     * @throws EE_Error
-     */
-    public function localized_status(array $statuses, bool $plural = false, string $schema = 'upper'): array
-    {
-        // note these are all in lower case because ucwords() on upper case will NOT convert.
-        $translation_array = [
-            EEM_Registration::status_id_pending_payment => [
-                esc_html__('pending payment', 'event_espresso'), // singular
-                esc_html__('pending payments', 'event_espresso') // plural
-            ],
-            EEM_Registration::status_id_approved        => [
-                esc_html__('approved', 'event_espresso'), // singular
-                esc_html__('approved', 'event_espresso') // plural
-            ],
-            EEM_Registration::status_id_not_approved    => [
-                esc_html__('not approved', 'event_espresso'),
-                esc_html__('not approved', 'event_espresso'),
-            ],
-            EEM_Registration::status_id_cancelled       => [
-                esc_html__('cancelled', 'event_espresso'),
-                esc_html__('cancelled', 'event_espresso'),
-            ],
-            EEM_Registration::status_id_incomplete      => [
-                esc_html__('incomplete', 'event_espresso'),
-                esc_html__('incomplete', 'event_espresso'),
-            ],
-            EEM_Registration::status_id_declined        => [
-                esc_html__('declined', 'event_espresso'),
-                esc_html__('declined', 'event_espresso'),
-            ],
-            EEM_Registration::status_id_wait_list       => [
-                esc_html__('wait list', 'event_espresso'),
-                esc_html__('wait list', 'event_espresso'),
-            ],
-            EEM_Transaction::overpaid_status_code       => [
-                esc_html__('overpaid', 'event_espresso'),
-                esc_html__('overpaid', 'event_espresso'),
-            ],
-            EEM_Transaction::complete_status_code       => [
-                esc_html__('complete', 'event_espresso'),
-                esc_html__('complete', 'event_espresso'),
-            ],
-            EEM_Transaction::incomplete_status_code     => [
-                esc_html__('incomplete', 'event_espresso'),
-                esc_html__('incomplete', 'event_espresso'),
-            ],
-            EEM_Transaction::failed_status_code         => [
-                esc_html__('failed', 'event_espresso'),
-                esc_html__('failed', 'event_espresso'),
-            ],
-            EEM_Transaction::abandoned_status_code      => [
-                esc_html__('abandoned', 'event_espresso'),
-                esc_html__('abandoned', 'event_espresso'),
-            ],
-            EEM_Payment::status_id_approved             => [
-                esc_html__('accepted', 'event_espresso'),
-                esc_html__('accepted', 'event_espresso'),
-            ],
-            EEM_Payment::status_id_pending              => [
-                esc_html__('pending', 'event_espresso'),
-                esc_html__('pending', 'event_espresso'),
-            ],
-            EEM_Payment::status_id_cancelled            => [
-                esc_html__('cancelled', 'event_espresso'),
-                esc_html__('cancelled', 'event_espresso'),
-            ],
-            EEM_Payment::status_id_declined             => [
-                esc_html__('declined', 'event_espresso'),
-                esc_html__('declined', 'event_espresso'),
-            ],
-            EEM_Payment::status_id_failed               => [
-                esc_html__('failed', 'event_espresso'),
-                esc_html__('failed', 'event_espresso'),
-            ],
-            // following statuses are NOT part of the EEM_Status but to keep things centralized we include in here.
-            EEM_Event::sold_out                         => [
-                esc_html__('sold out', 'event_espresso'),
-                esc_html__('sold out', 'event_espresso'),
-            ],
-            EEM_Event::postponed                        => [
-                esc_html__('postponed', 'event_espresso'),
-                esc_html__('Postponed', 'event_espresso'),
-            ],
-            EEM_Event::cancelled                        => [
-                esc_html__('cancelled', 'event_espresso'),
-                esc_html__('cancelled', 'event_espresso'),
-            ],
-            EE_Ticket::archived                         => [
-                esc_html__('archived', 'event_espresso'),
-                esc_html__('archived', 'event_espresso'),
-            ],
-            EE_Ticket::expired                          => [
-                esc_html__('expired', 'event_espresso'),
-                esc_html__('expired', 'event_espresso'),
-            ],
-            EE_Ticket::sold_out                         => [
-                esc_html__('sold out', 'event_espresso'),
-                esc_html__('sold out', 'event_espresso'),
-            ],
-            EE_Ticket::pending                          => [
-                esc_html__('upcoming', 'event_espresso'),
-                esc_html__('upcoming', 'event_espresso'),
-            ],
-            EE_Ticket::onsale                           => [
-                esc_html__('on sale', 'event_espresso'),
-                esc_html__('on sale', 'event_espresso'),
-            ],
-            EE_Datetime::cancelled                      => [
-                esc_html__('cancelled', 'event_espresso'),
-                esc_html__('cancelled', 'event_espresso'),
-            ],
-            EE_Datetime::sold_out                       => [
-                esc_html__('sold out', 'event_espresso'),
-                esc_html__('sold out', 'event_espresso'),
-            ],
-            EE_Datetime::expired                        => [
-                esc_html__('expired', 'event_espresso'),
-                esc_html__('expired', 'event_espresso'),
-            ],
-            EE_Datetime::inactive                       => [
-                esc_html__('inactive', 'event_espresso'),
-                esc_html__('inactive', 'event_espresso'),
-            ],
-            EE_Datetime::upcoming                       => [
-                esc_html__('upcoming', 'event_espresso'),
-                esc_html__('upcoming', 'event_espresso'),
-            ],
-            EE_Datetime::active                         => [
-                esc_html__('active', 'event_espresso'),
-                esc_html__('active', 'event_espresso'),
-            ],
-            EE_Datetime::postponed                      => [
-                esc_html__('postponed', 'event_espresso'),
-                esc_html__('postponed', 'event_espresso'),
-            ],
-            // messages related
-            EEM_Message::status_sent                    => [
-                esc_html__('sent', 'event_espresso'),
-                esc_html__('sent', 'event_espresso'),
-            ],
-            EEM_Message::status_idle                    => [
-                esc_html__('queued for sending', 'event_espresso'),
-                esc_html__('queued for sending', 'event_espresso'),
-            ],
-            EEM_Message::status_failed                  => [
-                esc_html__('failed', 'event_espresso'),
-                esc_html__('failed', 'event_espresso'),
-            ],
-            EEM_Message::status_debug_only              => [
-                esc_html__('debug only', 'event_espresso'),
-                esc_html__('debug only', 'event_espresso'),
-            ],
-            EEM_Message::status_messenger_executing     => [
-                esc_html__('messenger is executing', 'event_espresso'),
-                esc_html__('messenger is executing', 'event_espresso'),
-            ],
-            EEM_Message::status_resend                  => [
-                esc_html__('queued for resending', 'event_espresso'),
-                esc_html__('queued for resending', 'event_espresso'),
-            ],
-            EEM_Message::status_incomplete              => [
-                esc_html__('queued for generating', 'event_espresso'),
-                esc_html__('queued for generating', 'event_espresso'),
-            ],
-            EEM_Message::status_retry                   => [
-                esc_html__('failed sending, can be retried', 'event_espresso'),
-                esc_html__('failed sending, can be retried', 'event_espresso'),
-            ],
-            EEM_CPT_Base::post_status_publish           => [
-                esc_html__('published', 'event_espresso'),
-                esc_html__('published', 'event_espresso'),
-            ],
-            EEM_CPT_Base::post_status_future            => [
-                esc_html__('scheduled', 'event_espresso'),
-                esc_html__('scheduled', 'event_espresso'),
-            ],
-            EEM_CPT_Base::post_status_draft             => [
-                esc_html__('draft', 'event_espresso'),
-                esc_html__('draft', 'event_espresso'),
-            ],
-            EEM_CPT_Base::post_status_pending           => [
-                esc_html__('pending', 'event_espresso'),
-                esc_html__('pending', 'event_espresso'),
-            ],
-            EEM_CPT_Base::post_status_private           => [
-                esc_html__('private', 'event_espresso'),
-                esc_html__('private', 'event_espresso'),
-            ],
-            EEM_CPT_Base::post_status_trashed           => [
-                esc_html__('trashed', 'event_espresso'),
-                esc_html__('trashed', 'event_espresso'),
-            ],
-        ];
+	/**
+	 * This method provides the localized singular or plural string for a given status id
+	 *
+	 * @param array   $statuses  This should be an array of statuses in the format array( $status_id, $status_code ).
+	 *                           That way if there isn't a translation in the index we'll return the default code.
+	 * @param boolean $plural    Whether to return plural string or not. Note, nearly all of the plural strings are the
+	 *                           same as the singular (in English), however, this may NOT be the case with other
+	 *                           languages
+	 * @param string  $schema    This can be either 'upper', 'lower', or 'sentence'.  Basically indicates how we want
+	 *                           the status string returned ( UPPER, lower, Sentence)
+	 * @return array             an array of translated strings for the incoming status id.
+	 * @throws EE_Error
+	 */
+	public function localized_status(array $statuses, bool $plural = false, string $schema = 'upper'): array
+	{
+		// note these are all in lower case because ucwords() on upper case will NOT convert.
+		$translation_array = [
+			EEM_Registration::status_id_pending_payment => [
+				esc_html__('pending payment', 'event_espresso'), // singular
+				esc_html__('pending payments', 'event_espresso') // plural
+			],
+			EEM_Registration::status_id_approved        => [
+				esc_html__('approved', 'event_espresso'), // singular
+				esc_html__('approved', 'event_espresso') // plural
+			],
+			EEM_Registration::status_id_not_approved    => [
+				esc_html__('not approved', 'event_espresso'),
+				esc_html__('not approved', 'event_espresso'),
+			],
+			EEM_Registration::status_id_cancelled       => [
+				esc_html__('cancelled', 'event_espresso'),
+				esc_html__('cancelled', 'event_espresso'),
+			],
+			EEM_Registration::status_id_incomplete      => [
+				esc_html__('incomplete', 'event_espresso'),
+				esc_html__('incomplete', 'event_espresso'),
+			],
+			EEM_Registration::status_id_declined        => [
+				esc_html__('declined', 'event_espresso'),
+				esc_html__('declined', 'event_espresso'),
+			],
+			EEM_Registration::status_id_wait_list       => [
+				esc_html__('wait list', 'event_espresso'),
+				esc_html__('wait list', 'event_espresso'),
+			],
+			EEM_Transaction::overpaid_status_code       => [
+				esc_html__('overpaid', 'event_espresso'),
+				esc_html__('overpaid', 'event_espresso'),
+			],
+			EEM_Transaction::complete_status_code       => [
+				esc_html__('complete', 'event_espresso'),
+				esc_html__('complete', 'event_espresso'),
+			],
+			EEM_Transaction::incomplete_status_code     => [
+				esc_html__('incomplete', 'event_espresso'),
+				esc_html__('incomplete', 'event_espresso'),
+			],
+			EEM_Transaction::failed_status_code         => [
+				esc_html__('failed', 'event_espresso'),
+				esc_html__('failed', 'event_espresso'),
+			],
+			EEM_Transaction::abandoned_status_code      => [
+				esc_html__('abandoned', 'event_espresso'),
+				esc_html__('abandoned', 'event_espresso'),
+			],
+			EEM_Payment::status_id_approved             => [
+				esc_html__('accepted', 'event_espresso'),
+				esc_html__('accepted', 'event_espresso'),
+			],
+			EEM_Payment::status_id_pending              => [
+				esc_html__('pending', 'event_espresso'),
+				esc_html__('pending', 'event_espresso'),
+			],
+			EEM_Payment::status_id_cancelled            => [
+				esc_html__('cancelled', 'event_espresso'),
+				esc_html__('cancelled', 'event_espresso'),
+			],
+			EEM_Payment::status_id_declined             => [
+				esc_html__('declined', 'event_espresso'),
+				esc_html__('declined', 'event_espresso'),
+			],
+			EEM_Payment::status_id_failed               => [
+				esc_html__('failed', 'event_espresso'),
+				esc_html__('failed', 'event_espresso'),
+			],
+			// following statuses are NOT part of the EEM_Status but to keep things centralized we include in here.
+			EEM_Event::sold_out                         => [
+				esc_html__('sold out', 'event_espresso'),
+				esc_html__('sold out', 'event_espresso'),
+			],
+			EEM_Event::postponed                        => [
+				esc_html__('postponed', 'event_espresso'),
+				esc_html__('Postponed', 'event_espresso'),
+			],
+			EEM_Event::cancelled                        => [
+				esc_html__('cancelled', 'event_espresso'),
+				esc_html__('cancelled', 'event_espresso'),
+			],
+			EE_Ticket::archived                         => [
+				esc_html__('archived', 'event_espresso'),
+				esc_html__('archived', 'event_espresso'),
+			],
+			EE_Ticket::expired                          => [
+				esc_html__('expired', 'event_espresso'),
+				esc_html__('expired', 'event_espresso'),
+			],
+			EE_Ticket::sold_out                         => [
+				esc_html__('sold out', 'event_espresso'),
+				esc_html__('sold out', 'event_espresso'),
+			],
+			EE_Ticket::pending                          => [
+				esc_html__('upcoming', 'event_espresso'),
+				esc_html__('upcoming', 'event_espresso'),
+			],
+			EE_Ticket::onsale                           => [
+				esc_html__('on sale', 'event_espresso'),
+				esc_html__('on sale', 'event_espresso'),
+			],
+			EE_Datetime::cancelled                      => [
+				esc_html__('cancelled', 'event_espresso'),
+				esc_html__('cancelled', 'event_espresso'),
+			],
+			EE_Datetime::sold_out                       => [
+				esc_html__('sold out', 'event_espresso'),
+				esc_html__('sold out', 'event_espresso'),
+			],
+			EE_Datetime::expired                        => [
+				esc_html__('expired', 'event_espresso'),
+				esc_html__('expired', 'event_espresso'),
+			],
+			EE_Datetime::inactive                       => [
+				esc_html__('inactive', 'event_espresso'),
+				esc_html__('inactive', 'event_espresso'),
+			],
+			EE_Datetime::upcoming                       => [
+				esc_html__('upcoming', 'event_espresso'),
+				esc_html__('upcoming', 'event_espresso'),
+			],
+			EE_Datetime::active                         => [
+				esc_html__('active', 'event_espresso'),
+				esc_html__('active', 'event_espresso'),
+			],
+			EE_Datetime::postponed                      => [
+				esc_html__('postponed', 'event_espresso'),
+				esc_html__('postponed', 'event_espresso'),
+			],
+			// messages related
+			EEM_Message::status_sent                    => [
+				esc_html__('sent', 'event_espresso'),
+				esc_html__('sent', 'event_espresso'),
+			],
+			EEM_Message::status_idle                    => [
+				esc_html__('queued for sending', 'event_espresso'),
+				esc_html__('queued for sending', 'event_espresso'),
+			],
+			EEM_Message::status_failed                  => [
+				esc_html__('failed', 'event_espresso'),
+				esc_html__('failed', 'event_espresso'),
+			],
+			EEM_Message::status_debug_only              => [
+				esc_html__('debug only', 'event_espresso'),
+				esc_html__('debug only', 'event_espresso'),
+			],
+			EEM_Message::status_messenger_executing     => [
+				esc_html__('messenger is executing', 'event_espresso'),
+				esc_html__('messenger is executing', 'event_espresso'),
+			],
+			EEM_Message::status_resend                  => [
+				esc_html__('queued for resending', 'event_espresso'),
+				esc_html__('queued for resending', 'event_espresso'),
+			],
+			EEM_Message::status_incomplete              => [
+				esc_html__('queued for generating', 'event_espresso'),
+				esc_html__('queued for generating', 'event_espresso'),
+			],
+			EEM_Message::status_retry                   => [
+				esc_html__('failed sending, can be retried', 'event_espresso'),
+				esc_html__('failed sending, can be retried', 'event_espresso'),
+			],
+			EEM_CPT_Base::post_status_publish           => [
+				esc_html__('published', 'event_espresso'),
+				esc_html__('published', 'event_espresso'),
+			],
+			EEM_CPT_Base::post_status_future            => [
+				esc_html__('scheduled', 'event_espresso'),
+				esc_html__('scheduled', 'event_espresso'),
+			],
+			EEM_CPT_Base::post_status_draft             => [
+				esc_html__('draft', 'event_espresso'),
+				esc_html__('draft', 'event_espresso'),
+			],
+			EEM_CPT_Base::post_status_pending           => [
+				esc_html__('pending', 'event_espresso'),
+				esc_html__('pending', 'event_espresso'),
+			],
+			EEM_CPT_Base::post_status_private           => [
+				esc_html__('private', 'event_espresso'),
+				esc_html__('private', 'event_espresso'),
+			],
+			EEM_CPT_Base::post_status_trashed           => [
+				esc_html__('trashed', 'event_espresso'),
+				esc_html__('trashed', 'event_espresso'),
+			],
+		];
 
-        $translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-        if (! is_array($statuses)) {
-            throw new EE_Error(
-               esc_html__(
-                   'The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code',
-                   'event_espresso'
-               )
-            );
-        }
+		if (! is_array($statuses)) {
+			throw new EE_Error(
+			   esc_html__(
+				   'The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code',
+				   'event_espresso'
+			   )
+			);
+		}
 
-        $translation = [];
+		$translation = [];
 
-        foreach ($statuses as $id => $code) {
-            if (isset($translation_array[ $id ])) {
-                $translation[ $id ] = $plural
-                    ? $translation_array[ $id ][1]
-                    : $translation_array[ $id ][0];
-            } else {
-                $translation[ $id ] = $code;
-            }
+		foreach ($statuses as $id => $code) {
+			if (isset($translation_array[ $id ])) {
+				$translation[ $id ] = $plural
+					? $translation_array[ $id ][1]
+					: $translation_array[ $id ][0];
+			} else {
+				$translation[ $id ] = $code;
+			}
 
-            // schema
-            switch ($schema) {
-                case 'lower':
-                    // even though these start in lower case, this will catch any statuses added via filter.
-                    $translation[ $id ] = strtolower($translation[ $id ]);
-                    break;
-                case 'sentence':
-                    $translation[ $id ] = ucwords($translation[ $id ]);
-                    break;
-                case 'upper':
-                    $translation[ $id ] = strtoupper($translation[ $id ]);
-                    break;
-            }
-        }
+			// schema
+			switch ($schema) {
+				case 'lower':
+					// even though these start in lower case, this will catch any statuses added via filter.
+					$translation[ $id ] = strtolower($translation[ $id ]);
+					break;
+				case 'sentence':
+					$translation[ $id ] = ucwords($translation[ $id ]);
+					break;
+				case 'upper':
+					$translation[ $id ] = strtoupper($translation[ $id ]);
+					break;
+			}
+		}
 
-        return $translation;
-    }
+		return $translation;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
                     false,
                     'event',
                     [
-                        'event'        => esc_html__("Event", "event_espresso"),// deprecated
+                        'event'        => esc_html__("Event", "event_espresso"), // deprecated
                         'registration' => esc_html__("Registration", "event_espresso"),
                         'transaction'  => esc_html__("Transaction", "event_espresso"),
                         'payment'      => esc_html__("Payment", "event_espresso"),
@@ -81,7 +81,7 @@ 
             'Payment'      => new EE_Has_Many_Relation(),
         ];
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
         parent::__construct($timezone);
     }
@@ -294,7 +294,7 @@ 
 
         $translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-        if (! is_array($statuses)) {
+        if ( ! is_array($statuses)) {
             throw new EE_Error(
                esc_html__(
                    'The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code',
@@ -306,25 +306,25 @@ 
         $translation = [];
 
         foreach ($statuses as $id => $code) {
-            if (isset($translation_array[ $id ])) {
-                $translation[ $id ] = $plural
-                    ? $translation_array[ $id ][1]
-                    : $translation_array[ $id ][0];
+            if (isset($translation_array[$id])) {
+                $translation[$id] = $plural
+                    ? $translation_array[$id][1]
+                    : $translation_array[$id][0];
             } else {
-                $translation[ $id ] = $code;
+                $translation[$id] = $code;
             }
 
             // schema
             switch ($schema) {
                 case 'lower':
                     // even though these start in lower case, this will catch any statuses added via filter.
-                    $translation[ $id ] = strtolower($translation[ $id ]);
+                    $translation[$id] = strtolower($translation[$id]);
                     break;
                 case 'sentence':
-                    $translation[ $id ] = ucwords($translation[ $id ]);
+                    $translation[$id] = ucwords($translation[$id]);
                     break;
                 case 'upper':
-                    $translation[ $id ] = strtoupper($translation[ $id ]);
+                    $translation[$id] = strtoupper($translation[$id]);
                     break;
             }
         }

core/db_models/relations/EE_Belongs_To_Relation.php

Indentation +123 added lines, -123 removed lines

@@ -12,137 +12,137 @@
 class EE_Belongs_To_Relation extends EE_Model_Relation_Base
 {
 
-    /**
-     * Object representing the relationship between two models. Belongs_To means that THIS model has the foreign key
-     * to the other model. This knows how to join the models,
-     * get related models across the relation, and add-and-remove the relationships.
-     *
-     * @param boolean $block_deletes                                For Belongs_To relations, this is set to FALSE by
-     *                                                              default. if there are related models across this
-     *                                                              relation, block (prevent and add an error) the
-     *                                                              deletion of this model
-     * @param string  $related_model_objects_deletion_error_message a customized error message on blocking deletes
-     *                                                              instead of the default
-     */
-    public function __construct($block_deletes = false, $related_model_objects_deletion_error_message = null)
-    {
-        parent::__construct($block_deletes, $related_model_objects_deletion_error_message);
-    }
+	/**
+	 * Object representing the relationship between two models. Belongs_To means that THIS model has the foreign key
+	 * to the other model. This knows how to join the models,
+	 * get related models across the relation, and add-and-remove the relationships.
+	 *
+	 * @param boolean $block_deletes                                For Belongs_To relations, this is set to FALSE by
+	 *                                                              default. if there are related models across this
+	 *                                                              relation, block (prevent and add an error) the
+	 *                                                              deletion of this model
+	 * @param string  $related_model_objects_deletion_error_message a customized error message on blocking deletes
+	 *                                                              instead of the default
+	 */
+	public function __construct($block_deletes = false, $related_model_objects_deletion_error_message = null)
+	{
+		parent::__construct($block_deletes, $related_model_objects_deletion_error_message);
+	}
 
 
-    /**
-     * get_join_statement
-     *
-     * @param string $model_relation_chain
-     * @return string
-     * @throws \EE_Error
-     */
-    public function get_join_statement($model_relation_chain)
-    {
-        // create the sql string like
-        $this_table_fk_field  = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        $other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-        $this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
-            $model_relation_chain,
-            $this->get_this_model()->get_this_model_name()
-        ) . $this_table_fk_field->get_table_alias();
-        $other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
-            $model_relation_chain,
-            $this->get_other_model()->get_this_model_name()
-        ) . $other_table_pk_field->get_table_alias();
-        $other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
-        return $this->_left_join(
-            $other_table,
-            $other_table_alias,
-            $other_table_pk_field->get_table_column(),
-            $this_table_alias,
-            $this_table_fk_field->get_table_column()
-        ) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
-    }
+	/**
+	 * get_join_statement
+	 *
+	 * @param string $model_relation_chain
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function get_join_statement($model_relation_chain)
+	{
+		// create the sql string like
+		$this_table_fk_field  = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
+		$this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+			$model_relation_chain,
+			$this->get_this_model()->get_this_model_name()
+		) . $this_table_fk_field->get_table_alias();
+		$other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+			$model_relation_chain,
+			$this->get_other_model()->get_this_model_name()
+		) . $other_table_pk_field->get_table_alias();
+		$other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
+		return $this->_left_join(
+			$other_table,
+			$other_table_alias,
+			$other_table_pk_field->get_table_column(),
+			$this_table_alias,
+			$this_table_fk_field->get_table_column()
+		) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+	}
 
 
-    /**
-     * Sets this model object's foreign key to the other model object's primary key. Feel free to do this manually if
-     * you like.
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $extra_join_model_fields_n_values
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
-        // find the field on the other model which is a foreign key to this model
-        $fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        if ($this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()) {
-            // set that field on the other model to this model's ID
-            $this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
-            $this_model_obj->save();
-        }
-        return $other_model_obj;
-    }
+	/**
+	 * Sets this model object's foreign key to the other model object's primary key. Feel free to do this manually if
+	 * you like.
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $extra_join_model_fields_n_values
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
+		// find the field on the other model which is a foreign key to this model
+		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		if ($this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()) {
+			// set that field on the other model to this model's ID
+			$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
+			$this_model_obj->save();
+		}
+		return $other_model_obj;
+	}
 
 
-    /**
-     * Sets the this model object's foreign key to its default, instead of pointing to the other model object
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $where_query
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
-        // find the field on the other model which is a foreign key to this model
-        $fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        // set that field on the other model to this model's ID
-        $this_model_obj->set($fk_on_this_model->get_name(), null, true);
-        $this_model_obj->save();
-        return $other_model_obj;
-    }
+	/**
+	 * Sets the this model object's foreign key to its default, instead of pointing to the other model object
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $where_query
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
+		// find the field on the other model which is a foreign key to this model
+		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		// set that field on the other model to this model's ID
+		$this_model_obj->set($fk_on_this_model->get_name(), null, true);
+		$this_model_obj->save();
+		return $other_model_obj;
+	}
 
 
-    /**
-     * Overrides parent so that we don't NEED to save the $model_object before getting the related objects.
-     *
-     * @param EE_Base_Class $model_obj_or_id
-     * @param array         $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @param boolean       $values_already_prepared_by_model_object @deprecated since 4.8.1
-     * @return EE_Base_Class[]
-     * @throws \EE_Error
-     */
-    public function get_all_related(
-        $model_obj_or_id,
-        $query_params = array(),
-        $values_already_prepared_by_model_object = false
-    ) {
-        if ($values_already_prepared_by_model_object !== false) {
-            EE_Error::doing_it_wrong(
-                'EE_Model_Relation_Base::get_all_related',
-                esc_html__('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'),
-                '4.8.1'
-            );
-        }
-        // get column on this model object which is a foreign key to the other model
-        $fk_field_obj = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-        // get its value
-        if ($model_obj_or_id instanceof EE_Base_Class) {
-            $model_obj = $model_obj_or_id;
-        } else {
-            $model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
-        }
-        $ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());
-        // get all where their PK matches that value
-        $query_params[0][ $this->get_other_model()->get_primary_key_field()->get_name() ] = $ID_value_on_other_model;
-        $query_params                                                                   = $this->_disable_default_where_conditions_on_query_param($query_params);
+	/**
+	 * Overrides parent so that we don't NEED to save the $model_object before getting the related objects.
+	 *
+	 * @param EE_Base_Class $model_obj_or_id
+	 * @param array         $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @param boolean       $values_already_prepared_by_model_object @deprecated since 4.8.1
+	 * @return EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
+	public function get_all_related(
+		$model_obj_or_id,
+		$query_params = array(),
+		$values_already_prepared_by_model_object = false
+	) {
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong(
+				'EE_Model_Relation_Base::get_all_related',
+				esc_html__('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'),
+				'4.8.1'
+			);
+		}
+		// get column on this model object which is a foreign key to the other model
+		$fk_field_obj = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		// get its value
+		if ($model_obj_or_id instanceof EE_Base_Class) {
+			$model_obj = $model_obj_or_id;
+		} else {
+			$model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
+		}
+		$ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());
+		// get all where their PK matches that value
+		$query_params[0][ $this->get_other_model()->get_primary_key_field()->get_name() ] = $ID_value_on_other_model;
+		$query_params                                                                   = $this->_disable_default_where_conditions_on_query_param($query_params);
 //      echo '$query_params';
 //      var_dump($query_params);
-        return $this->get_other_model()->get_all($query_params);
-    }
+		return $this->get_other_model()->get_all($query_params);
+	}
 }