eventespresso / event-espresso-core

core/libraries/plugin_api/db/EEME_Base.lib.php

Indentation +207 added lines, -207 removed lines

@@ -44,211 +44,211 @@
 abstract class EEME_Base
 {
 
-    const extending_method_prefix = 'ext_';
-    const dynamic_callback_method_prefix = 'dynamic_callback_method_';
-
-    protected $_extra_tables = array();
-    protected $_extra_fields = array();
-    protected $_extra_relations = array();
-
-    /**
-     * The model name that is extended (not classname)
-     *
-     * @var string
-     */
-    protected $_model_name_extended = null;
-
-    /**
-     * The model this extends
-     *
-     * @var EEM_Base
-     */
-    protected $_ = null;
-
-
-    /**
-     * @throws \EE_Error
-     */
-    public function __construct()
-    {
-        if (! $this->_model_name_extended) {
-            throw new EE_Error(
-                __(
-                    "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
-                    "event_espresso"
-                )
-            );
-        }
-        $construct_end_action = 'AHEE__EEM_' . $this->_model_name_extended . '__construct__end';
-        if (did_action($construct_end_action)) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired",
-                        "event_espresso"
-                    ),
-                    get_class($this),
-                    $this->_model_name_extended,
-                    $construct_end_action
-                )
-            );
-        }
-        add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
-            array($this, 'add_extra_tables_on_filter')
-        );
-        add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
-            array($this, 'add_extra_fields_on_filter')
-        );
-        add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
-            array($this, 'add_extra_relations_on_filter')
-        );
-        $this->_register_extending_methods();
-    }
-
-
-    /**
-     * @param array $existing_tables
-     * @return array
-     */
-    public function add_extra_tables_on_filter($existing_tables)
-    {
-        return array_merge((array) $existing_tables, $this->_extra_tables);
-    }
-
-
-    /**
-     * @param array $existing_fields
-     * @return array
-     */
-    public function add_extra_fields_on_filter($existing_fields)
-    {
-        if ($this->_extra_fields) {
-            foreach ($this->_extra_fields as $table_alias => $fields) {
-                if (! isset($existing_fields[ $table_alias ])) {
-                    $existing_fields[ $table_alias ] = array();
-                }
-                $existing_fields[ $table_alias ] = array_merge(
-                    (array) $existing_fields[ $table_alias ],
-                    $this->_extra_fields[ $table_alias ]
-                );
-            }
-        }
-        return $existing_fields;
-    }
-
-
-    /**
-     * @param array $existing_relations
-     * @return array
-     */
-    public function add_extra_relations_on_filter($existing_relations)
-    {
-        return array_merge((array) $existing_relations, $this->_extra_relations);
-    }
-
-
-    /**
-     * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
-     * model extended. (Internally uses filters, and the __call magic method)
-     */
-    protected function _register_extending_methods()
-    {
-        $all_methods = get_class_methods(get_class($this));
-        foreach ($all_methods as $method_name) {
-            if (strpos($method_name, self::extending_method_prefix) === 0) {
-                $method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
-                $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-                add_filter(
-                    $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
-                    10,
-                    10
-                );
-            }
-        }
-    }
-
-    /**
-     * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
-     * model extended. (Internally uses filters, and the __call magic method)
-     */
-    public function deregister()
-    {
-        remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
-            array($this, 'add_extra_tables_on_filter')
-        );
-        remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
-            array($this, 'add_extra_fields_on_filter')
-        );
-        remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
-            array($this, 'add_extra_relations_on_filter')
-        );
-        $all_methods = get_class_methods(get_class($this));
-        foreach ($all_methods as $method_name) {
-            if (strpos($method_name, self::extending_method_prefix) === 0) {
-                $method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
-                $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-                remove_filter(
-                    $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
-                    10
-                );
-            }
-        }
-        /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
-        if (class_exists($model_to_reset)) {
-            $model_to_reset::reset();
-        }
-    }
-
-
-    /**
-     * @param string $callback_method_name
-     * @param array  $args
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function __call($callback_method_name, $args)
-    {
-        if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
-            // it's a dynamic callback for a method name
-            $method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
-            list($original_return_val, $model_called, $args_provided_to_method_on_model) = (array) $args;
-            // phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
-            $this->_ = $model_called;
-            // phpcs:enable
-            $extending_method = self::extending_method_prefix . $method_called_on_model;
-            if (method_exists($this, $extending_method)) {
-                return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
-            } else {
-                throw new EE_Error(
-                    sprintf(
-                        __(
-                            "An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)",
-                            "event_espresso"
-                        ),
-                        $this->_model_name_extended,
-                        get_class($this),
-                        $extending_method,
-                        $extending_method
-                    )
-                );
-            }
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    __("There is no method named '%s' on '%s'", "event_espresso"),
-                    $callback_method_name,
-                    get_class($this)
-                )
-            );
-        }
-    }
+	const extending_method_prefix = 'ext_';
+	const dynamic_callback_method_prefix = 'dynamic_callback_method_';
+
+	protected $_extra_tables = array();
+	protected $_extra_fields = array();
+	protected $_extra_relations = array();
+
+	/**
+	 * The model name that is extended (not classname)
+	 *
+	 * @var string
+	 */
+	protected $_model_name_extended = null;
+
+	/**
+	 * The model this extends
+	 *
+	 * @var EEM_Base
+	 */
+	protected $_ = null;
+
+
+	/**
+	 * @throws \EE_Error
+	 */
+	public function __construct()
+	{
+		if (! $this->_model_name_extended) {
+			throw new EE_Error(
+				__(
+					"When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
+					"event_espresso"
+				)
+			);
+		}
+		$construct_end_action = 'AHEE__EEM_' . $this->_model_name_extended . '__construct__end';
+		if (did_action($construct_end_action)) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired",
+						"event_espresso"
+					),
+					get_class($this),
+					$this->_model_name_extended,
+					$construct_end_action
+				)
+			);
+		}
+		add_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+			array($this, 'add_extra_tables_on_filter')
+		);
+		add_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+			array($this, 'add_extra_fields_on_filter')
+		);
+		add_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+			array($this, 'add_extra_relations_on_filter')
+		);
+		$this->_register_extending_methods();
+	}
+
+
+	/**
+	 * @param array $existing_tables
+	 * @return array
+	 */
+	public function add_extra_tables_on_filter($existing_tables)
+	{
+		return array_merge((array) $existing_tables, $this->_extra_tables);
+	}
+
+
+	/**
+	 * @param array $existing_fields
+	 * @return array
+	 */
+	public function add_extra_fields_on_filter($existing_fields)
+	{
+		if ($this->_extra_fields) {
+			foreach ($this->_extra_fields as $table_alias => $fields) {
+				if (! isset($existing_fields[ $table_alias ])) {
+					$existing_fields[ $table_alias ] = array();
+				}
+				$existing_fields[ $table_alias ] = array_merge(
+					(array) $existing_fields[ $table_alias ],
+					$this->_extra_fields[ $table_alias ]
+				);
+			}
+		}
+		return $existing_fields;
+	}
+
+
+	/**
+	 * @param array $existing_relations
+	 * @return array
+	 */
+	public function add_extra_relations_on_filter($existing_relations)
+	{
+		return array_merge((array) $existing_relations, $this->_extra_relations);
+	}
+
+
+	/**
+	 * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
+	 * model extended. (Internally uses filters, and the __call magic method)
+	 */
+	protected function _register_extending_methods()
+	{
+		$all_methods = get_class_methods(get_class($this));
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
+				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
+				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
+				add_filter(
+					$callback_name,
+					array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+					10,
+					10
+				);
+			}
+		}
+	}
+
+	/**
+	 * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
+	 * model extended. (Internally uses filters, and the __call magic method)
+	 */
+	public function deregister()
+	{
+		remove_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+			array($this, 'add_extra_tables_on_filter')
+		);
+		remove_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+			array($this, 'add_extra_fields_on_filter')
+		);
+		remove_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+			array($this, 'add_extra_relations_on_filter')
+		);
+		$all_methods = get_class_methods(get_class($this));
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
+				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
+				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
+				remove_filter(
+					$callback_name,
+					array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+					10
+				);
+			}
+		}
+		/** @var EEM_Base $model_to_reset */
+		$model_to_reset = 'EEM_' . $this->_model_name_extended;
+		if (class_exists($model_to_reset)) {
+			$model_to_reset::reset();
+		}
+	}
+
+
+	/**
+	 * @param string $callback_method_name
+	 * @param array  $args
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function __call($callback_method_name, $args)
+	{
+		if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
+			// it's a dynamic callback for a method name
+			$method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
+			list($original_return_val, $model_called, $args_provided_to_method_on_model) = (array) $args;
+			// phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
+			$this->_ = $model_called;
+			// phpcs:enable
+			$extending_method = self::extending_method_prefix . $method_called_on_model;
+			if (method_exists($this, $extending_method)) {
+				return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
+			} else {
+				throw new EE_Error(
+					sprintf(
+						__(
+							"An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)",
+							"event_espresso"
+						),
+						$this->_model_name_extended,
+						get_class($this),
+						$extending_method,
+						$extending_method
+					)
+				);
+			}
+		} else {
+			throw new EE_Error(
+				sprintf(
+					__("There is no method named '%s' on '%s'", "event_espresso"),
+					$callback_method_name,
+					get_class($this)
+				)
+			);
+		}
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -71,7 +71,7 @@ 
      */
     public function __construct()
     {
-        if (! $this->_model_name_extended) {
+        if ( ! $this->_model_name_extended) {
             throw new EE_Error(
                 __(
                     "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
@@ -79,7 +79,7 @@ 
                 )
             );
         }
-        $construct_end_action = 'AHEE__EEM_' . $this->_model_name_extended . '__construct__end';
+        $construct_end_action = 'AHEE__EEM_'.$this->_model_name_extended.'__construct__end';
         if (did_action($construct_end_action)) {
             throw new EE_Error(
                 sprintf(
@@ -94,15 +94,15 @@ 
             );
         }
         add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',
             array($this, 'add_extra_tables_on_filter')
         );
         add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',
             array($this, 'add_extra_fields_on_filter')
         );
         add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',
             array($this, 'add_extra_relations_on_filter')
         );
         $this->_register_extending_methods();
@@ -127,12 +127,12 @@ 
     {
         if ($this->_extra_fields) {
             foreach ($this->_extra_fields as $table_alias => $fields) {
-                if (! isset($existing_fields[ $table_alias ])) {
-                    $existing_fields[ $table_alias ] = array();
+                if ( ! isset($existing_fields[$table_alias])) {
+                    $existing_fields[$table_alias] = array();
                 }
-                $existing_fields[ $table_alias ] = array_merge(
-                    (array) $existing_fields[ $table_alias ],
-                    $this->_extra_fields[ $table_alias ]
+                $existing_fields[$table_alias] = array_merge(
+                    (array) $existing_fields[$table_alias],
+                    $this->_extra_fields[$table_alias]
                 );
             }
         }
@@ -163,7 +163,7 @@ 
                 $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
                 add_filter(
                     $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+                    array($this, self::dynamic_callback_method_prefix.$method_name_on_model),
                     10,
                     10
                 );
@@ -178,15 +178,15 @@ 
     public function deregister()
     {
         remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',
             array($this, 'add_extra_tables_on_filter')
         );
         remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',
             array($this, 'add_extra_fields_on_filter')
         );
         remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',
             array($this, 'add_extra_relations_on_filter')
         );
         $all_methods = get_class_methods(get_class($this));
@@ -196,13 +196,13 @@ 
                 $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
                 remove_filter(
                     $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+                    array($this, self::dynamic_callback_method_prefix.$method_name_on_model),
                     10
                 );
             }
         }
         /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
+        $model_to_reset = 'EEM_'.$this->_model_name_extended;
         if (class_exists($model_to_reset)) {
             $model_to_reset::reset();
         }
@@ -224,7 +224,7 @@ 
             // phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
             $this->_ = $model_called;
             // phpcs:enable
-            $extending_method = self::extending_method_prefix . $method_called_on_model;
+            $extending_method = self::extending_method_prefix.$method_called_on_model;
             if (method_exists($this, $extending_method)) {
                 return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
             } else {

core/libraries/plugin_api/EE_Register_Model.lib.php

Indentation +168 added lines, -168 removed lines

@@ -11,183 +11,183 @@
  */
 class EE_Register_Model implements EEI_Plugin_API
 {
-    /**
-     *
-     * @var array keys are the model_id used to register with, values are the array provided to register them, exactly
-     *      like EE_Register_Model::register()'s 2nd arg
-     */
-    protected static $_model_registry;
+	/**
+	 *
+	 * @var array keys are the model_id used to register with, values are the array provided to register them, exactly
+	 *      like EE_Register_Model::register()'s 2nd arg
+	 */
+	protected static $_model_registry;
 
-    /**
-     *
-     * @var array keys are model names, values are their class names. Stored on registration and used
-     * on a hook
-     */
-    protected static $_model_name_to_classname_map;
+	/**
+	 *
+	 * @var array keys are model names, values are their class names. Stored on registration and used
+	 * on a hook
+	 */
+	protected static $_model_name_to_classname_map;
 
 
-    /**
-     * @param string $model_id unique id for it
-     * @param array  $config {
-     * @type array   $model_paths array of folders containing DB models, where each file follows the models naming
-     *       convention, which is: EEM_{model_name}.model.php which contains a single class called EEM_{model_name}.
-     *       Eg. you could pass
-     *                            "public_html/wp-content/plugins/my_addon/db_models" (with or without trailing slash)
-     *                            and in that folder put each of your model files, like "EEM_Food.model.php" which
-     *                            contains the class "EEM_Food" and
-     *                            "EEM_Monkey.model.php" which contains the class "EEM_Monkey". These will be
-     *                            autoloaded and added to the EE registry so they can be used like ordinary models. The
-     *                            class contained in each file should extend EEM_Base.
-     * @type array   $class_paths array of folders containing DB classes, where each file follows the model class
-     *       naming convention, which is EE_{model_name}.class.php. The class contained in each file should extend
-     *       EE_Base_Class
-     *
-     * }
-     * @throws EE_Error
-     */
-    public static function register($model_id = null, $config = array())
-    {
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($model_id) || ! is_array($config) || empty($config['model_paths'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register Models with EE_Register_Model::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_paths" (an array of full server paths to folders that contain models)',
-                    'event_espresso'
-                )
-            );
-        }
+	/**
+	 * @param string $model_id unique id for it
+	 * @param array  $config {
+	 * @type array   $model_paths array of folders containing DB models, where each file follows the models naming
+	 *       convention, which is: EEM_{model_name}.model.php which contains a single class called EEM_{model_name}.
+	 *       Eg. you could pass
+	 *                            "public_html/wp-content/plugins/my_addon/db_models" (with or without trailing slash)
+	 *                            and in that folder put each of your model files, like "EEM_Food.model.php" which
+	 *                            contains the class "EEM_Food" and
+	 *                            "EEM_Monkey.model.php" which contains the class "EEM_Monkey". These will be
+	 *                            autoloaded and added to the EE registry so they can be used like ordinary models. The
+	 *                            class contained in each file should extend EEM_Base.
+	 * @type array   $class_paths array of folders containing DB classes, where each file follows the model class
+	 *       naming convention, which is EE_{model_name}.class.php. The class contained in each file should extend
+	 *       EE_Base_Class
+	 *
+	 * }
+	 * @throws EE_Error
+	 */
+	public static function register($model_id = null, $config = array())
+	{
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($model_id) || ! is_array($config) || empty($config['model_paths'])) {
+			throw new EE_Error(
+				__(
+					'In order to register Models with EE_Register_Model::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_paths" (an array of full server paths to folders that contain models)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_model_registry[ $model_id ])) {
-            return;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_model_registry[ $model_id ])) {
+			return;
+		}
 
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('FHEE__EE_System__parse_model_names')
-            || did_action('FHEE__EE_System__parse_implemented_model_names')) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'An attempt was made to register "%s" as a group models has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.',
-                        'event_espresso'
-                    ),
-                    $model_id
-                ),
-                '4.5'
-            );
-        }
-        self::$_model_registry[ $model_id ] = $config;
+		if (! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('FHEE__EE_System__parse_model_names')
+			|| did_action('FHEE__EE_System__parse_implemented_model_names')) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'An attempt was made to register "%s" as a group models has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.',
+						'event_espresso'
+					),
+					$model_id
+				),
+				'4.5'
+			);
+		}
+		self::$_model_registry[ $model_id ] = $config;
 
-        if ((isset($config['model_paths']) && ! isset($config['class_paths'])) ||
-            (! isset($config['model_paths']) && isset($config['class_paths']))) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        'You must register both "model_paths" AND "class_paths", not just one or the other You provided %s',
-                        'event_espresso'
-                    ),
-                    implode(", ", array_keys($config))
-                )
-            );
-        }
-        if (isset($config['model_paths'])) {
-            // make sure they passed in an array
-            if (! is_array($config['model_paths'])) {
-                $config['model_paths'] = array($config['model_paths']);
-            }
-            // we want to add this as a model folder
-            // and autoload them all
-            $class_to_filepath_map = EEH_File::get_contents_of_folders($config['model_paths']);
-            EEH_Autoloader::register_autoloader($class_to_filepath_map);
-            $model_name_to_classname_map = array();
-            foreach (array_keys($class_to_filepath_map) as $classname) {
-                $model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
-            }
-            self::$_model_name_to_classname_map[ $model_id ] = $model_name_to_classname_map;
-            add_filter('FHEE__EE_System__parse_model_names', array('EE_Register_Model', 'add_addon_models'));
-            add_filter(
-                'FHEE__EE_System__parse_implemented_model_names',
-                array('EE_Register_Model', 'add_addon_models')
-            );
-            add_filter('FHEE__EE_Registry__load_model__paths', array('EE_Register_Model', 'add_model_folders'));
-            unset($config['model_paths']);
-        }
-        if (isset($config['class_paths'])) {
-            // make sure they passed in an array
-            if (! is_array($config['class_paths'])) {
-                $config['class_paths'] = array($config['class_paths']);
-            }
-            $class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_paths']);
-            EEH_Autoloader::register_autoloader($class_to_filepath_map);
-            add_filter('FHEE__EE_Registry__load_class__paths', array('EE_Register_Model', 'add_class_folders'));
-            unset($config['class_paths']);
-        }
-        foreach ($config as $unknown_key => $unknown_config) {
-            self::deregister($model_id);
-            throw new EE_Error(
-                sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key)
-            );
-        }
-    }
+		if ((isset($config['model_paths']) && ! isset($config['class_paths'])) ||
+			(! isset($config['model_paths']) && isset($config['class_paths']))) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						'You must register both "model_paths" AND "class_paths", not just one or the other You provided %s',
+						'event_espresso'
+					),
+					implode(", ", array_keys($config))
+				)
+			);
+		}
+		if (isset($config['model_paths'])) {
+			// make sure they passed in an array
+			if (! is_array($config['model_paths'])) {
+				$config['model_paths'] = array($config['model_paths']);
+			}
+			// we want to add this as a model folder
+			// and autoload them all
+			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['model_paths']);
+			EEH_Autoloader::register_autoloader($class_to_filepath_map);
+			$model_name_to_classname_map = array();
+			foreach (array_keys($class_to_filepath_map) as $classname) {
+				$model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
+			}
+			self::$_model_name_to_classname_map[ $model_id ] = $model_name_to_classname_map;
+			add_filter('FHEE__EE_System__parse_model_names', array('EE_Register_Model', 'add_addon_models'));
+			add_filter(
+				'FHEE__EE_System__parse_implemented_model_names',
+				array('EE_Register_Model', 'add_addon_models')
+			);
+			add_filter('FHEE__EE_Registry__load_model__paths', array('EE_Register_Model', 'add_model_folders'));
+			unset($config['model_paths']);
+		}
+		if (isset($config['class_paths'])) {
+			// make sure they passed in an array
+			if (! is_array($config['class_paths'])) {
+				$config['class_paths'] = array($config['class_paths']);
+			}
+			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_paths']);
+			EEH_Autoloader::register_autoloader($class_to_filepath_map);
+			add_filter('FHEE__EE_Registry__load_class__paths', array('EE_Register_Model', 'add_class_folders'));
+			unset($config['class_paths']);
+		}
+		foreach ($config as $unknown_key => $unknown_config) {
+			self::deregister($model_id);
+			throw new EE_Error(
+				sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key)
+			);
+		}
+	}
 
-    /**
-     * Filters the core list of models
-     *
-     * @param array $core_models
-     * @return array keys are model names (eg 'Event') and values are their classes (eg 'EE_Event')
-     */
-    public static function add_addon_models($core_models = array())
-    {
-        foreach (self::$_model_name_to_classname_map as $model_name_to_class_map) {
-            $core_models = array_merge($core_models, $model_name_to_class_map);
-        }
-        return $core_models;
-    }
+	/**
+	 * Filters the core list of models
+	 *
+	 * @param array $core_models
+	 * @return array keys are model names (eg 'Event') and values are their classes (eg 'EE_Event')
+	 */
+	public static function add_addon_models($core_models = array())
+	{
+		foreach (self::$_model_name_to_classname_map as $model_name_to_class_map) {
+			$core_models = array_merge($core_models, $model_name_to_class_map);
+		}
+		return $core_models;
+	}
 
-    /**
-     * Filters the list of model folders
-     *
-     * @param array $folders
-     * @return array of folder paths
-     */
-    public static function add_model_folders($folders = array())
-    {
-        foreach (self::$_model_registry as $config) {
-            if (isset($config['model_paths'])) {
-                $folders = array_merge($folders, $config['model_paths']);
-            }
-        }
-        return $folders;
-    }
+	/**
+	 * Filters the list of model folders
+	 *
+	 * @param array $folders
+	 * @return array of folder paths
+	 */
+	public static function add_model_folders($folders = array())
+	{
+		foreach (self::$_model_registry as $config) {
+			if (isset($config['model_paths'])) {
+				$folders = array_merge($folders, $config['model_paths']);
+			}
+		}
+		return $folders;
+	}
 
-    /**
-     * Filters the array of model class paths
-     *
-     * @param array $folders
-     * @return array of folder paths
-     */
-    public static function add_class_folders($folders = array())
-    {
-        foreach (self::$_model_registry as $config) {
-            if (isset($config['class_paths'])) {
-                $folders = array_merge($folders, $config['class_paths']);
-            }
-        }
-        return $folders;
-    }
+	/**
+	 * Filters the array of model class paths
+	 *
+	 * @param array $folders
+	 * @return array of folder paths
+	 */
+	public static function add_class_folders($folders = array())
+	{
+		foreach (self::$_model_registry as $config) {
+			if (isset($config['class_paths'])) {
+				$folders = array_merge($folders, $config['class_paths']);
+			}
+		}
+		return $folders;
+	}
 
 
-    /**
-     * deregister
-     *
-     * @param string $model_id
-     */
-    public static function deregister($model_id = null)
-    {
-        if (isset(self::$_model_registry[ $model_id ])) {
-            unset(self::$_model_registry[ $model_id ]);
-            unset(self::$_model_name_to_classname_map[ $model_id ]);
-        }
-    }
+	/**
+	 * deregister
+	 *
+	 * @param string $model_id
+	 */
+	public static function deregister($model_id = null)
+	{
+		if (isset(self::$_model_registry[ $model_id ])) {
+			unset(self::$_model_registry[ $model_id ]);
+			unset(self::$_model_name_to_classname_map[ $model_id ]);
+		}
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -58,11 +58,11 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_model_registry[ $model_id ])) {
+        if (isset(self::$_model_registry[$model_id])) {
             return;
         }
 
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
+        if ( ! did_action('AHEE__EE_System__load_espresso_addons')
             || did_action('FHEE__EE_System__parse_model_names')
             || did_action('FHEE__EE_System__parse_implemented_model_names')) {
             EE_Error::doing_it_wrong(
@@ -77,10 +77,10 @@ 
                 '4.5'
             );
         }
-        self::$_model_registry[ $model_id ] = $config;
+        self::$_model_registry[$model_id] = $config;
 
         if ((isset($config['model_paths']) && ! isset($config['class_paths'])) ||
-            (! isset($config['model_paths']) && isset($config['class_paths']))) {
+            ( ! isset($config['model_paths']) && isset($config['class_paths']))) {
             throw new EE_Error(
                 sprintf(
                     __(
@@ -93,7 +93,7 @@ 
         }
         if (isset($config['model_paths'])) {
             // make sure they passed in an array
-            if (! is_array($config['model_paths'])) {
+            if ( ! is_array($config['model_paths'])) {
                 $config['model_paths'] = array($config['model_paths']);
             }
             // we want to add this as a model folder
@@ -102,9 +102,9 @@ 
             EEH_Autoloader::register_autoloader($class_to_filepath_map);
             $model_name_to_classname_map = array();
             foreach (array_keys($class_to_filepath_map) as $classname) {
-                $model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
+                $model_name_to_classname_map[str_replace("EEM_", "", $classname)] = $classname;
             }
-            self::$_model_name_to_classname_map[ $model_id ] = $model_name_to_classname_map;
+            self::$_model_name_to_classname_map[$model_id] = $model_name_to_classname_map;
             add_filter('FHEE__EE_System__parse_model_names', array('EE_Register_Model', 'add_addon_models'));
             add_filter(
                 'FHEE__EE_System__parse_implemented_model_names',
@@ -115,7 +115,7 @@ 
         }
         if (isset($config['class_paths'])) {
             // make sure they passed in an array
-            if (! is_array($config['class_paths'])) {
+            if ( ! is_array($config['class_paths'])) {
                 $config['class_paths'] = array($config['class_paths']);
             }
             $class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_paths']);
@@ -185,9 +185,9 @@ 
      */
     public static function deregister($model_id = null)
     {
-        if (isset(self::$_model_registry[ $model_id ])) {
-            unset(self::$_model_registry[ $model_id ]);
-            unset(self::$_model_name_to_classname_map[ $model_id ]);
+        if (isset(self::$_model_registry[$model_id])) {
+            unset(self::$_model_registry[$model_id]);
+            unset(self::$_model_name_to_classname_map[$model_id]);
         }
     }
 }

core/libraries/plugin_api/EE_Register_Admin_Page.lib.php

Indentation +135 added lines, -135 removed lines

@@ -12,139 +12,139 @@
 {
 
 
-    /**
-     * Holds registered EE_Admin_Pages
-     *
-     * @var array
-     */
-    protected static $_ee_admin_page_registry = array();
-
-
-    /**
-     * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE
-     * Admin Page loader system).
-     *
-     * @since 4.3.0
-     *
-     * @param  string $page_basename This string represents the basename of the Admin Page init.
-     *                                                                The init file must use this basename in its name
-     *                                                                and class (i.e.
-     *                                                                {page_basename}_Admin_Page_Init.core.php).
-     * @param  array  $config {              An array of configuration options that will be used in different
-     *                        circumstances
-     *
-     * @type  string  $page_path This is the path where the registered admin pages reside ( used to setup autoloaders).
-     *
-     *    }
-     * @return void
-     */
-    public static function register($page_basename = null, $config = array())
-    {
-
-        // check that an admin_page has not already been registered with that name
-        if (isset(self::$_ee_admin_page_registry[ $page_basename ])) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        'An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.',
-                        'event_espresso'
-                    ),
-                    $page_basename
-                )
-            );
-        }
-
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($page_basename) || ! is_array($config) || empty($config['page_path'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // make sure we don't register twice
-        if (isset(self::$_ee_admin_page_registry[ $page_basename ])) {
-            return;
-        }
-
-        if (! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.',
-                        'event_espresso'
-                    ),
-                    $page_basename
-                ),
-                '4.3'
-            );
-        }
-
-        // add incoming stuff to our registry property
-        self::$_ee_admin_page_registry[ $page_basename ] = array(
-            'page_path' => $config['page_path'],
-            'config'    => $config,
-        );
-
-        // add filters
-
-        add_filter(
-            'FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs',
-            array('EE_Register_Admin_Page', 'set_page_basename'),
-            10
-        );
-        add_filter('FHEE__EEH_Autoloader__load_admin_core', array('EE_Register_Admin_Page', 'set_page_path'), 10);
-    }
-
-
-    /**
-     * This deregisters a EE_Admin page that is already registered.  Note, this MUST be loaded after the
-     * page being deregistered is loaded.
-     *
-     * @since    4.3.0
-     *
-     * @param  string $page_basename Use whatever string was used to register the admin page.
-     * @return  void
-     */
-    public static function deregister($page_basename = null)
-    {
-        if (! empty(self::$_ee_admin_page_registry[ $page_basename ])) {
-            unset(self::$_ee_admin_page_registry[ $page_basename ]);
-        }
-    }
-
-
-    /**
-     * set_page_basename
-     *
-     * @param $installed_refs
-     * @return mixed
-     */
-    public static function set_page_basename($installed_refs)
-    {
-        if (! empty(self::$_ee_admin_page_registry)) {
-            foreach (self::$_ee_admin_page_registry as $basename => $args) {
-                $installed_refs[ $basename ] = $args['page_path'];
-            }
-        }
-        return $installed_refs;
-    }
-
-
-    /**
-     * set_page_path
-     *
-     * @param $paths
-     * @return mixed
-     */
-    public static function set_page_path($paths)
-    {
-        foreach (self::$_ee_admin_page_registry as $basename => $args) {
-            $paths[ $basename ] = $args['page_path'];
-        }
-        return $paths;
-    }
+	/**
+	 * Holds registered EE_Admin_Pages
+	 *
+	 * @var array
+	 */
+	protected static $_ee_admin_page_registry = array();
+
+
+	/**
+	 * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE
+	 * Admin Page loader system).
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param  string $page_basename This string represents the basename of the Admin Page init.
+	 *                                                                The init file must use this basename in its name
+	 *                                                                and class (i.e.
+	 *                                                                {page_basename}_Admin_Page_Init.core.php).
+	 * @param  array  $config {              An array of configuration options that will be used in different
+	 *                        circumstances
+	 *
+	 * @type  string  $page_path This is the path where the registered admin pages reside ( used to setup autoloaders).
+	 *
+	 *    }
+	 * @return void
+	 */
+	public static function register($page_basename = null, $config = array())
+	{
+
+		// check that an admin_page has not already been registered with that name
+		if (isset(self::$_ee_admin_page_registry[ $page_basename ])) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						'An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.',
+						'event_espresso'
+					),
+					$page_basename
+				)
+			);
+		}
+
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($page_basename) || ! is_array($config) || empty($config['page_path'])) {
+			throw new EE_Error(
+				__(
+					'In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)',
+					'event_espresso'
+				)
+			);
+		}
+
+		// make sure we don't register twice
+		if (isset(self::$_ee_admin_page_registry[ $page_basename ])) {
+			return;
+		}
+
+		if (! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.',
+						'event_espresso'
+					),
+					$page_basename
+				),
+				'4.3'
+			);
+		}
+
+		// add incoming stuff to our registry property
+		self::$_ee_admin_page_registry[ $page_basename ] = array(
+			'page_path' => $config['page_path'],
+			'config'    => $config,
+		);
+
+		// add filters
+
+		add_filter(
+			'FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs',
+			array('EE_Register_Admin_Page', 'set_page_basename'),
+			10
+		);
+		add_filter('FHEE__EEH_Autoloader__load_admin_core', array('EE_Register_Admin_Page', 'set_page_path'), 10);
+	}
+
+
+	/**
+	 * This deregisters a EE_Admin page that is already registered.  Note, this MUST be loaded after the
+	 * page being deregistered is loaded.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  string $page_basename Use whatever string was used to register the admin page.
+	 * @return  void
+	 */
+	public static function deregister($page_basename = null)
+	{
+		if (! empty(self::$_ee_admin_page_registry[ $page_basename ])) {
+			unset(self::$_ee_admin_page_registry[ $page_basename ]);
+		}
+	}
+
+
+	/**
+	 * set_page_basename
+	 *
+	 * @param $installed_refs
+	 * @return mixed
+	 */
+	public static function set_page_basename($installed_refs)
+	{
+		if (! empty(self::$_ee_admin_page_registry)) {
+			foreach (self::$_ee_admin_page_registry as $basename => $args) {
+				$installed_refs[ $basename ] = $args['page_path'];
+			}
+		}
+		return $installed_refs;
+	}
+
+
+	/**
+	 * set_page_path
+	 *
+	 * @param $paths
+	 * @return mixed
+	 */
+	public static function set_page_path($paths)
+	{
+		foreach (self::$_ee_admin_page_registry as $basename => $args) {
+			$paths[ $basename ] = $args['page_path'];
+		}
+		return $paths;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
     {
 
         // check that an admin_page has not already been registered with that name
-        if (isset(self::$_ee_admin_page_registry[ $page_basename ])) {
+        if (isset(self::$_ee_admin_page_registry[$page_basename])) {
             throw new EE_Error(
                 sprintf(
                     __(
@@ -65,11 +65,11 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_ee_admin_page_registry[ $page_basename ])) {
+        if (isset(self::$_ee_admin_page_registry[$page_basename])) {
             return;
         }
 
-        if (! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
+        if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
             EE_Error::doing_it_wrong(
                 __METHOD__,
                 sprintf(
@@ -84,7 +84,7 @@ 
         }
 
         // add incoming stuff to our registry property
-        self::$_ee_admin_page_registry[ $page_basename ] = array(
+        self::$_ee_admin_page_registry[$page_basename] = array(
             'page_path' => $config['page_path'],
             'config'    => $config,
         );
@@ -111,8 +111,8 @@ 
      */
     public static function deregister($page_basename = null)
     {
-        if (! empty(self::$_ee_admin_page_registry[ $page_basename ])) {
-            unset(self::$_ee_admin_page_registry[ $page_basename ]);
+        if ( ! empty(self::$_ee_admin_page_registry[$page_basename])) {
+            unset(self::$_ee_admin_page_registry[$page_basename]);
         }
     }
 
@@ -125,9 +125,9 @@ 
      */
     public static function set_page_basename($installed_refs)
     {
-        if (! empty(self::$_ee_admin_page_registry)) {
+        if ( ! empty(self::$_ee_admin_page_registry)) {
             foreach (self::$_ee_admin_page_registry as $basename => $args) {
-                $installed_refs[ $basename ] = $args['page_path'];
+                $installed_refs[$basename] = $args['page_path'];
             }
         }
         return $installed_refs;
@@ -143,7 +143,7 @@ 
     public static function set_page_path($paths)
     {
         foreach (self::$_ee_admin_page_registry as $basename => $args) {
-            $paths[ $basename ] = $args['page_path'];
+            $paths[$basename] = $args['page_path'];
         }
         return $paths;
     }

core/libraries/plugin_api/EEI_Plugin_API.lib.php

Indentation +17 added lines, -17 removed lines

@@ -20,23 +20,23 @@
 interface EEI_Plugin_API
 {
 
-    /**
-     * Used to register a component with EE.
-     *
-     * @since    4.3.0
-     * @param string $ID         a unique name or ID for the component being registered
-     * @param array  $setup_args an array of key value pairs of info for registering the component
-     * @return void
-     */
-    public static function register($ID = null, $setup_args = array());
+	/**
+	 * Used to register a component with EE.
+	 *
+	 * @since    4.3.0
+	 * @param string $ID         a unique name or ID for the component being registered
+	 * @param array  $setup_args an array of key value pairs of info for registering the component
+	 * @return void
+	 */
+	public static function register($ID = null, $setup_args = array());
 
 
-    /**
-     * Used to deregister a component with EE.
-     *
-     * @since 4.3.0
-     * @param string $ID a unique name or ID for the component being registered
-     * @return void
-     */
-    public static function deregister($ID = null);
+	/**
+	 * Used to deregister a component with EE.
+	 *
+	 * @since 4.3.0
+	 * @param string $ID a unique name or ID for the component being registered
+	 * @return void
+	 */
+	public static function deregister($ID = null);
 }

core/libraries/plugin_api/EE_Register_Messages_Shortcode_Library.lib.php

Indentation +182 added lines, -182 removed lines

@@ -12,186 +12,186 @@
 {
 
 
-    /**
-     * holds values for registered messages shortcode libraries
-     *
-     * @var array
-     */
-    protected static $_ee_messages_shortcode_registry = array();
-
-
-    /**
-     * Helper method for registring a new shortcodes library class for the messages system.
-     *
-     * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
-     * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
-     *
-     * @since    4.3.0
-     *
-     * @param  array $setup_args                    {
-     *                                              An array of arguments provided for registering the new messages
-     *                                              shortcode library.
-     *
-     * @type string  $name                          What is the name of this shortcode library
-     *                                                                              (e.g. 'question_list');
-     * @type array   $autoloadpaths                 An array of paths to add to the messages
-     *                                                                              autoloader for the new shortcode
-     *                                                                              library class file.
-     * @type string  $msgr_validator_callback       Callback for a method that will register the
-     *                                                                              library with the messenger
-     *                                                                              _validator_config. Optional.
-     * @type string  $msgr_template_fields_callback Callback for changing adding the
-     *                                                                              _template_fields property for
-     *                                                                              messenger. For example, the
-     *                                                                              shortcode library may add a new
-     *                                                                              field to the message templates.
-     *                                                                              Optional.
-     * @type string  $valid_shortcodes_callback     Callback for message types
-     *                                                                              _valid_shortcodes array setup.
-     *                                                                              Optional.
-     * @type array   $list_type_shortcodes          If there are any specific shortcodes with this
-     *                                                                             message shortcode library that
-     *                                                                             should be considered "list type"
-     *                                                                             then include them in an array.  List
-     *                                                                             Type shortcodes are shortcodes that
-     *                                                                             have a corresponding field that
-     *                                                                             indicates how they are parsed.
-     *                                                                             Optional.
-     * }
-     * @return void
-     */
-    public static function register($name = null, $setup_args = array())
-    {
-
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($name) || ! is_array($setup_args) || empty($setup_args['autoloadpaths'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // make sure we don't register twice
-        if (isset(self::$_ee_messages_shortcode_registry[ $name ])) {
-            return;
-        }
-
-        // make sure this was called in the right place!
-        if (! did_action('EE_Brewing_Regular___messages_caf')
-            || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).',
-                        'event_espresso'
-                    ),
-                    $name
-                ),
-                '4.3.0'
-            );
-        }
-
-        $name = (string) $name;
-        self::$_ee_messages_shortcode_registry[ $name ] = array(
-            'autoloadpaths'        => (array) $setup_args['autoloadpaths'],
-            'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes'])
-                ? (array) $setup_args['list_type_shortcodes'] : array(),
-        );
-
-        // add filters
-        add_filter(
-            'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-            array('EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'),
-            10
-        );
-
-        // add below filters if the required callback is provided.
-        if (! empty($setup_args['msgr_validator_callback'])) {
-            add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
-        }
-
-        if (! empty($setup_args['msgr_template_fields_callback'])) {
-            add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
-        }
-
-        if (! empty($setup_args['valid_shortcodes_callback'])) {
-            add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
-        }
-
-        if (! empty($setup_args['list_type_shortcodes'])) {
-            add_filter(
-                'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
-                array('EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'),
-                10
-            );
-        }
-    }
-
-
-    /**
-     * This deregisters any messages shortcode library previously registered with the given name.
-     *
-     * @since    4.3.0
-     * @param  string $name name used to register the shortcode library.
-     * @return  void
-     */
-    public static function deregister($name = null)
-    {
-        if (! empty(self::$_ee_messages_shortcode_registry[ $name ])) {
-            unset(self::$_ee_messages_shortcode_registry[ $name ]);
-        }
-    }
-
-
-    /**
-     * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
-     *
-     * @since    4.3.0
-     *
-     * @param array $paths array of paths to be checked by EE_messages autoloader.
-     * @return array
-     */
-    public static function register_msgs_autoload_paths($paths)
-    {
-
-        if (! empty(self::$_ee_messages_shortcode_registry)) {
-            foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
-                if (empty($st_reg['autoloadpaths'])) {
-                    continue;
-                }
-                $paths = array_merge($paths, $st_reg['autoloadpaths']);
-            }
-        }
-
-        return $paths;
-    }
-
-
-    /**
-     * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
-     * filter which is used to add additional list type shortcodes.
-     *
-     * @since 4.3.0
-     *
-     * @param  array $original_shortcodes
-     * @return  array                                   Modifications to original shortcodes.
-     */
-    public static function register_list_type_shortcodes($original_shortcodes)
-    {
-        if (empty(self::$_ee_messages_shortcode_registry)) {
-            return $original_shortcodes;
-        }
-
-        foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
-            if (! empty($sc_reg['list_type_shortcodes'])) {
-                $original_shortcodes = array_merge($original_shortcodes, $sc_reg['list_type_shortcodes']);
-            }
-        }
-
-        return $original_shortcodes;
-    }
+	/**
+	 * holds values for registered messages shortcode libraries
+	 *
+	 * @var array
+	 */
+	protected static $_ee_messages_shortcode_registry = array();
+
+
+	/**
+	 * Helper method for registring a new shortcodes library class for the messages system.
+	 *
+	 * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
+	 * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array $setup_args                    {
+	 *                                              An array of arguments provided for registering the new messages
+	 *                                              shortcode library.
+	 *
+	 * @type string  $name                          What is the name of this shortcode library
+	 *                                                                              (e.g. 'question_list');
+	 * @type array   $autoloadpaths                 An array of paths to add to the messages
+	 *                                                                              autoloader for the new shortcode
+	 *                                                                              library class file.
+	 * @type string  $msgr_validator_callback       Callback for a method that will register the
+	 *                                                                              library with the messenger
+	 *                                                                              _validator_config. Optional.
+	 * @type string  $msgr_template_fields_callback Callback for changing adding the
+	 *                                                                              _template_fields property for
+	 *                                                                              messenger. For example, the
+	 *                                                                              shortcode library may add a new
+	 *                                                                              field to the message templates.
+	 *                                                                              Optional.
+	 * @type string  $valid_shortcodes_callback     Callback for message types
+	 *                                                                              _valid_shortcodes array setup.
+	 *                                                                              Optional.
+	 * @type array   $list_type_shortcodes          If there are any specific shortcodes with this
+	 *                                                                             message shortcode library that
+	 *                                                                             should be considered "list type"
+	 *                                                                             then include them in an array.  List
+	 *                                                                             Type shortcodes are shortcodes that
+	 *                                                                             have a corresponding field that
+	 *                                                                             indicates how they are parsed.
+	 *                                                                             Optional.
+	 * }
+	 * @return void
+	 */
+	public static function register($name = null, $setup_args = array())
+	{
+
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($name) || ! is_array($setup_args) || empty($setup_args['autoloadpaths'])) {
+			throw new EE_Error(
+				__(
+					'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"',
+					'event_espresso'
+				)
+			);
+		}
+
+		// make sure we don't register twice
+		if (isset(self::$_ee_messages_shortcode_registry[ $name ])) {
+			return;
+		}
+
+		// make sure this was called in the right place!
+		if (! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).',
+						'event_espresso'
+					),
+					$name
+				),
+				'4.3.0'
+			);
+		}
+
+		$name = (string) $name;
+		self::$_ee_messages_shortcode_registry[ $name ] = array(
+			'autoloadpaths'        => (array) $setup_args['autoloadpaths'],
+			'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes'])
+				? (array) $setup_args['list_type_shortcodes'] : array(),
+		);
+
+		// add filters
+		add_filter(
+			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
+			array('EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'),
+			10
+		);
+
+		// add below filters if the required callback is provided.
+		if (! empty($setup_args['msgr_validator_callback'])) {
+			add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
+		}
+
+		if (! empty($setup_args['msgr_template_fields_callback'])) {
+			add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
+		}
+
+		if (! empty($setup_args['valid_shortcodes_callback'])) {
+			add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
+		}
+
+		if (! empty($setup_args['list_type_shortcodes'])) {
+			add_filter(
+				'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
+				array('EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'),
+				10
+			);
+		}
+	}
+
+
+	/**
+	 * This deregisters any messages shortcode library previously registered with the given name.
+	 *
+	 * @since    4.3.0
+	 * @param  string $name name used to register the shortcode library.
+	 * @return  void
+	 */
+	public static function deregister($name = null)
+	{
+		if (! empty(self::$_ee_messages_shortcode_registry[ $name ])) {
+			unset(self::$_ee_messages_shortcode_registry[ $name ]);
+		}
+	}
+
+
+	/**
+	 * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param array $paths array of paths to be checked by EE_messages autoloader.
+	 * @return array
+	 */
+	public static function register_msgs_autoload_paths($paths)
+	{
+
+		if (! empty(self::$_ee_messages_shortcode_registry)) {
+			foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
+				if (empty($st_reg['autoloadpaths'])) {
+					continue;
+				}
+				$paths = array_merge($paths, $st_reg['autoloadpaths']);
+			}
+		}
+
+		return $paths;
+	}
+
+
+	/**
+	 * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
+	 * filter which is used to add additional list type shortcodes.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param  array $original_shortcodes
+	 * @return  array                                   Modifications to original shortcodes.
+	 */
+	public static function register_list_type_shortcodes($original_shortcodes)
+	{
+		if (empty(self::$_ee_messages_shortcode_registry)) {
+			return $original_shortcodes;
+		}
+
+		foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
+			if (! empty($sc_reg['list_type_shortcodes'])) {
+				$original_shortcodes = array_merge($original_shortcodes, $sc_reg['list_type_shortcodes']);
+			}
+		}
+
+		return $original_shortcodes;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -74,12 +74,12 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_ee_messages_shortcode_registry[ $name ])) {
+        if (isset(self::$_ee_messages_shortcode_registry[$name])) {
             return;
         }
 
         // make sure this was called in the right place!
-        if (! did_action('EE_Brewing_Regular___messages_caf')
+        if ( ! did_action('EE_Brewing_Regular___messages_caf')
             || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
         ) {
             EE_Error::doing_it_wrong(
@@ -96,7 +96,7 @@ 
         }
 
         $name = (string) $name;
-        self::$_ee_messages_shortcode_registry[ $name ] = array(
+        self::$_ee_messages_shortcode_registry[$name] = array(
             'autoloadpaths'        => (array) $setup_args['autoloadpaths'],
             'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes'])
                 ? (array) $setup_args['list_type_shortcodes'] : array(),
@@ -110,19 +110,19 @@ 
         );
 
         // add below filters if the required callback is provided.
-        if (! empty($setup_args['msgr_validator_callback'])) {
+        if ( ! empty($setup_args['msgr_validator_callback'])) {
             add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
         }
 
-        if (! empty($setup_args['msgr_template_fields_callback'])) {
+        if ( ! empty($setup_args['msgr_template_fields_callback'])) {
             add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
         }
 
-        if (! empty($setup_args['valid_shortcodes_callback'])) {
+        if ( ! empty($setup_args['valid_shortcodes_callback'])) {
             add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
         }
 
-        if (! empty($setup_args['list_type_shortcodes'])) {
+        if ( ! empty($setup_args['list_type_shortcodes'])) {
             add_filter(
                 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
                 array('EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'),
@@ -141,8 +141,8 @@ 
      */
     public static function deregister($name = null)
     {
-        if (! empty(self::$_ee_messages_shortcode_registry[ $name ])) {
-            unset(self::$_ee_messages_shortcode_registry[ $name ]);
+        if ( ! empty(self::$_ee_messages_shortcode_registry[$name])) {
+            unset(self::$_ee_messages_shortcode_registry[$name]);
         }
     }
 
@@ -158,7 +158,7 @@ 
     public static function register_msgs_autoload_paths($paths)
     {
 
-        if (! empty(self::$_ee_messages_shortcode_registry)) {
+        if ( ! empty(self::$_ee_messages_shortcode_registry)) {
             foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
                 if (empty($st_reg['autoloadpaths'])) {
                     continue;
@@ -187,7 +187,7 @@ 
         }
 
         foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
-            if (! empty($sc_reg['list_type_shortcodes'])) {
+            if ( ! empty($sc_reg['list_type_shortcodes'])) {
                 $original_shortcodes = array_merge($original_shortcodes, $sc_reg['list_type_shortcodes']);
             }
         }

core/libraries/plugin_api/EE_Register_Widget.lib.php

Indentation +85 added lines, -85 removed lines

@@ -14,99 +14,99 @@
 class EE_Register_Widget implements EEI_Plugin_API
 {
 
-    /**
-     * Holds values for registered widgets
-     *
-     * @var array
-     */
-    protected static $_settings = array();
+	/**
+	 * Holds values for registered widgets
+	 *
+	 * @var array
+	 */
+	protected static $_settings = array();
 
 
-    /**
-     *    Method for registering new EED_Widgets
-     *
-     * @since    4.3.0
-     * @param string $widget_id a unique identifier for this set of widgets
-     * @param  array $setup_args an array of arguments provided for registering widgets
-     * @type array widget_paths        an array of full server paths to folders containing any EED_Widgets, or to the
-     *       EED_Widget files themselves
-     * @throws EE_Error
-     * @return void
-     */
-    public static function register($widget_id = null, $setup_args = array())
-    {
+	/**
+	 *    Method for registering new EED_Widgets
+	 *
+	 * @since    4.3.0
+	 * @param string $widget_id a unique identifier for this set of widgets
+	 * @param  array $setup_args an array of arguments provided for registering widgets
+	 * @type array widget_paths        an array of full server paths to folders containing any EED_Widgets, or to the
+	 *       EED_Widget files themselves
+	 * @throws EE_Error
+	 * @return void
+	 */
+	public static function register($widget_id = null, $setup_args = array())
+	{
 
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($widget_id) || ! is_array($setup_args) || empty($setup_args['widget_paths'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register Widgets with EE_Register_Widget::register(), you must include a "widget_id" (a unique identifier for this set of widgets), and an array containing the following keys: "widget_paths" (an array of full server paths to folders that contain widgets, or to the widget files themselves)',
-                    'event_espresso'
-                )
-            );
-        }
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($widget_id) || ! is_array($setup_args) || empty($setup_args['widget_paths'])) {
+			throw new EE_Error(
+				__(
+					'In order to register Widgets with EE_Register_Widget::register(), you must include a "widget_id" (a unique identifier for this set of widgets), and an array containing the following keys: "widget_paths" (an array of full server paths to folders that contain widgets, or to the widget files themselves)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_settings[ $widget_id ])) {
-            return;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_settings[ $widget_id ])) {
+			return;
+		}
 
 
-        // make sure this was called in the right place!
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                __(
-                    'An attempt to register widgets has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register widgets.',
-                    'event_espresso'
-                ),
-                '4.3.0'
-            );
-        }
-        // setup $_settings array from incoming values.
-        self::$_settings[ $widget_id ] = array(
-            // array of full server paths to any EED_Widgets used by the widget
-            'widget_paths' => isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
-        );
-        // add to list of widgets to be registered
-        add_filter(
-            'FHEE__EE_Config__register_widgets__widgets_to_register',
-            array('EE_Register_Widget', 'add_widgets')
-        );
-    }
+		// make sure this was called in the right place!
+		if (! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				__(
+					'An attempt to register widgets has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register widgets.',
+					'event_espresso'
+				),
+				'4.3.0'
+			);
+		}
+		// setup $_settings array from incoming values.
+		self::$_settings[ $widget_id ] = array(
+			// array of full server paths to any EED_Widgets used by the widget
+			'widget_paths' => isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
+		);
+		// add to list of widgets to be registered
+		add_filter(
+			'FHEE__EE_Config__register_widgets__widgets_to_register',
+			array('EE_Register_Widget', 'add_widgets')
+		);
+	}
 
 
-    /**
-     * Filters the list of widgets to add ours.
-     * and they're just full filepaths to FOLDERS containing a shortcode class file. Eg.
-     * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/widgets/espresso_monkey',...)
-     *
-     * @param array $widgets_to_register array of paths to all widgets that require registering
-     * @return array
-     */
-    public static function add_widgets($widgets_to_register = array())
-    {
-        foreach (self::$_settings as $settings) {
-            $widgets_to_register = array_merge($widgets_to_register, $settings['widget_paths']);
-        }
-        return $widgets_to_register;
-    }
+	/**
+	 * Filters the list of widgets to add ours.
+	 * and they're just full filepaths to FOLDERS containing a shortcode class file. Eg.
+	 * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/widgets/espresso_monkey',...)
+	 *
+	 * @param array $widgets_to_register array of paths to all widgets that require registering
+	 * @return array
+	 */
+	public static function add_widgets($widgets_to_register = array())
+	{
+		foreach (self::$_settings as $settings) {
+			$widgets_to_register = array_merge($widgets_to_register, $settings['widget_paths']);
+		}
+		return $widgets_to_register;
+	}
 
 
-    /**
-     * This deregisters a widget that was previously registered with a specific $widget_id.
-     *
-     * @since    4.3.0
-     *
-     * @param string $widget_id the name for the widget that was previously registered
-     * @return void
-     */
-    public static function deregister($widget_id = null)
-    {
-        if (isset(self::$_settings[ $widget_id ])) {
-            unset(self::$_settings[ $widget_id ]);
-        }
-    }
+	/**
+	 * This deregisters a widget that was previously registered with a specific $widget_id.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param string $widget_id the name for the widget that was previously registered
+	 * @return void
+	 */
+	public static function deregister($widget_id = null)
+	{
+		if (isset(self::$_settings[ $widget_id ])) {
+			unset(self::$_settings[ $widget_id ]);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -47,13 +47,13 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_settings[ $widget_id ])) {
+        if (isset(self::$_settings[$widget_id])) {
             return;
         }
 
 
         // make sure this was called in the right place!
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
+        if ( ! did_action('AHEE__EE_System__load_espresso_addons')
             || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
         ) {
             EE_Error::doing_it_wrong(
@@ -66,7 +66,7 @@ 
             );
         }
         // setup $_settings array from incoming values.
-        self::$_settings[ $widget_id ] = array(
+        self::$_settings[$widget_id] = array(
             // array of full server paths to any EED_Widgets used by the widget
             'widget_paths' => isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
         );
@@ -105,8 +105,8 @@ 
      */
     public static function deregister($widget_id = null)
     {
-        if (isset(self::$_settings[ $widget_id ])) {
-            unset(self::$_settings[ $widget_id ]);
+        if (isset(self::$_settings[$widget_id])) {
+            unset(self::$_settings[$widget_id]);
         }
     }
 }

core/libraries/plugin_api/EE_Register_Module.lib.php

Indentation +86 added lines, -86 removed lines

@@ -14,99 +14,99 @@
 class EE_Register_Module implements EEI_Plugin_API
 {
 
-    /**
-     * Holds values for registered modules
-     *
-     * @var array
-     */
-    protected static $_settings = array();
+	/**
+	 * Holds values for registered modules
+	 *
+	 * @var array
+	 */
+	protected static $_settings = array();
 
 
-    /**
-     *    Method for registering new EED_Modules
-     *
-     * @since    4.3.0
-     * @param string $module_id a unique identifier for this set of modules Required.
-     * @param  array $setup_args an array of full server paths to folders containing any EED_Modules, or to the
-     *                           EED_Module files themselves Required.
-     * @type    array module_paths    an array of full server paths to folders containing any EED_Modules, or to the
-     *          EED_Module files themselves
-     * @throws EE_Error
-     * @return void
-     */
-    public static function register($module_id = null, $setup_args = array())
-    {
+	/**
+	 *    Method for registering new EED_Modules
+	 *
+	 * @since    4.3.0
+	 * @param string $module_id a unique identifier for this set of modules Required.
+	 * @param  array $setup_args an array of full server paths to folders containing any EED_Modules, or to the
+	 *                           EED_Module files themselves Required.
+	 * @type    array module_paths    an array of full server paths to folders containing any EED_Modules, or to the
+	 *          EED_Module files themselves
+	 * @throws EE_Error
+	 * @return void
+	 */
+	public static function register($module_id = null, $setup_args = array())
+	{
 
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($module_id) || ! is_array($setup_args) || empty($setup_args['module_paths'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register Modules with EE_Register_Module::register(), you must include a "module_id" (a unique identifier for this set of modules), and an array containing the following keys: "module_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)',
-                    'event_espresso'
-                )
-            );
-        }
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($module_id) || ! is_array($setup_args) || empty($setup_args['module_paths'])) {
+			throw new EE_Error(
+				__(
+					'In order to register Modules with EE_Register_Module::register(), you must include a "module_id" (a unique identifier for this set of modules), and an array containing the following keys: "module_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_settings[ $module_id ])) {
-            return;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_settings[ $module_id ])) {
+			return;
+		}
 
-        // make sure this was called in the right place!
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                __(
-                    'An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.',
-                    'event_espresso'
-                ),
-                '4.3.0'
-            );
-        }
-        // setup $_settings array from incoming values.
-        self::$_settings[ $module_id ] = array(
-            // array of full server paths to any EED_Modules used by the module
-            'module_paths' => isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
-        );
-        // add to list of modules to be registered
-        add_filter(
-            'FHEE__EE_Config__register_modules__modules_to_register',
-            array('EE_Register_Module', 'add_modules')
-        );
-    }
+		// make sure this was called in the right place!
+		if (! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				__(
+					'An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.',
+					'event_espresso'
+				),
+				'4.3.0'
+			);
+		}
+		// setup $_settings array from incoming values.
+		self::$_settings[ $module_id ] = array(
+			// array of full server paths to any EED_Modules used by the module
+			'module_paths' => isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
+		);
+		// add to list of modules to be registered
+		add_filter(
+			'FHEE__EE_Config__register_modules__modules_to_register',
+			array('EE_Register_Module', 'add_modules')
+		);
+	}
 
 
-    /**
-     * Filters the list of modules to add ours.
-     * and they're just full filepaths to FOLDERS containing a module class file. Eg.
-     * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/shortcodes/espresso_monkey',...)
-     *
-     * @param array $modules_to_register array of paths to all modules that require registering
-     * @return array
-     */
-    public static function add_modules($modules_to_register)
-    {
-        foreach (self::$_settings as $settings) {
-            $modules_to_register = array_merge($modules_to_register, $settings['module_paths']);
-        }
-        return $modules_to_register;
-    }
+	/**
+	 * Filters the list of modules to add ours.
+	 * and they're just full filepaths to FOLDERS containing a module class file. Eg.
+	 * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/shortcodes/espresso_monkey',...)
+	 *
+	 * @param array $modules_to_register array of paths to all modules that require registering
+	 * @return array
+	 */
+	public static function add_modules($modules_to_register)
+	{
+		foreach (self::$_settings as $settings) {
+			$modules_to_register = array_merge($modules_to_register, $settings['module_paths']);
+		}
+		return $modules_to_register;
+	}
 
 
-    /**
-     * This deregisters a module that was previously registered with a specific $module_id.
-     *
-     * @since    4.3.0
-     *
-     * @param string $module_id the name for the module that was previously registered
-     * @return void
-     */
-    public static function deregister($module_id = null)
-    {
-        if (isset(self::$_settings[ $module_id ])) {
-            unset(self::$_settings[ $module_id ]);
-        }
-    }
+	/**
+	 * This deregisters a module that was previously registered with a specific $module_id.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param string $module_id the name for the module that was previously registered
+	 * @return void
+	 */
+	public static function deregister($module_id = null)
+	{
+		if (isset(self::$_settings[ $module_id ])) {
+			unset(self::$_settings[ $module_id ]);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -48,12 +48,12 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_settings[ $module_id ])) {
+        if (isset(self::$_settings[$module_id])) {
             return;
         }
 
         // make sure this was called in the right place!
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
+        if ( ! did_action('AHEE__EE_System__load_espresso_addons')
             || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
         ) {
             EE_Error::doing_it_wrong(
@@ -66,7 +66,7 @@ 
             );
         }
         // setup $_settings array from incoming values.
-        self::$_settings[ $module_id ] = array(
+        self::$_settings[$module_id] = array(
             // array of full server paths to any EED_Modules used by the module
             'module_paths' => isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
         );
@@ -105,8 +105,8 @@ 
      */
     public static function deregister($module_id = null)
     {
-        if (isset(self::$_settings[ $module_id ])) {
-            unset(self::$_settings[ $module_id ]);
+        if (isset(self::$_settings[$module_id])) {
+            unset(self::$_settings[$module_id]);
         }
     }
 }

core/libraries/plugin_api/EE_Register_Shortcode.lib.php

Indentation +147 added lines, -147 removed lines

@@ -18,162 +18,162 @@
 class EE_Register_Shortcode implements EEI_Plugin_API
 {
 
-    /**
-     * Holds values for registered shortcodes
-     *
-     * @var array
-     */
-    protected static $_settings = array();
+	/**
+	 * Holds values for registered shortcodes
+	 *
+	 * @var array
+	 */
+	protected static $_settings = array();
 
 
-    /**
-     *    Method for registering new EE_Shortcodes
-     *
-     * @since    4.3.0
-     * @since    4.9.46.rc.025  for the new `shortcode_fqcns` array argument.
-     * @param string $shortcode_id                      a unique identifier for this set of modules Required.
-     * @param  array $setup_args                        an array of arguments provided for registering shortcodes
-     *                                                  Required.
-     * @type array shortcode_paths        an array of full server paths to folders containing any
-     *                                                  EES_Shortcodes
-     * @type array shortcode_fqcns        an array of fully qualified class names for any new shortcode
-     *                                                  classes to register.  Shortcode classes should extend
-     *                                                  EspressoShortcode and be properly namespaced so they are
-     *                                                  autoloaded.
-     * @throws EE_Error
-     * @return void
-     */
-    public static function register($shortcode_id = null, $setup_args = array())
-    {
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($shortcode_id)
-            || ! is_array($setup_args)
-            || (
-               empty($setup_args['shortcode_paths']))
-               && empty($setup_args['shortcode_fqcns'])
-        ) {
-            throw new EE_Error(
-                esc_html__(
-                    'In order to register Modules with EE_Register_Shortcode::register(), you must include a "shortcode_id" (a unique identifier for this set of shortcodes), and an array containing the following keys: "shortcode_paths" (an array of full server paths to folders that contain shortcodes, or to the shortcode files themselves)',
-                    'event_espresso'
-                )
-            );
-        }
+	/**
+	 *    Method for registering new EE_Shortcodes
+	 *
+	 * @since    4.3.0
+	 * @since    4.9.46.rc.025  for the new `shortcode_fqcns` array argument.
+	 * @param string $shortcode_id                      a unique identifier for this set of modules Required.
+	 * @param  array $setup_args                        an array of arguments provided for registering shortcodes
+	 *                                                  Required.
+	 * @type array shortcode_paths        an array of full server paths to folders containing any
+	 *                                                  EES_Shortcodes
+	 * @type array shortcode_fqcns        an array of fully qualified class names for any new shortcode
+	 *                                                  classes to register.  Shortcode classes should extend
+	 *                                                  EspressoShortcode and be properly namespaced so they are
+	 *                                                  autoloaded.
+	 * @throws EE_Error
+	 * @return void
+	 */
+	public static function register($shortcode_id = null, $setup_args = array())
+	{
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($shortcode_id)
+			|| ! is_array($setup_args)
+			|| (
+			   empty($setup_args['shortcode_paths']))
+			   && empty($setup_args['shortcode_fqcns'])
+		) {
+			throw new EE_Error(
+				esc_html__(
+					'In order to register Modules with EE_Register_Shortcode::register(), you must include a "shortcode_id" (a unique identifier for this set of shortcodes), and an array containing the following keys: "shortcode_paths" (an array of full server paths to folders that contain shortcodes, or to the shortcode files themselves)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_settings[ $shortcode_id ])) {
-            return;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_settings[ $shortcode_id ])) {
+			return;
+		}
 
-        // make sure this was called in the right place!
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                esc_html__(
-                    'An attempt to register shortcodes has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register shortcodes.',
-                    'event_espresso'
-                ),
-                '4.3.0'
-            );
-        }
-        // setup $_settings array from incoming values.
-        self::$_settings[ $shortcode_id ] = array(
-            // array of full server paths to any EES_Shortcodes used by the shortcode
-            'shortcode_paths' => isset($setup_args['shortcode_paths'])
-                ? (array) $setup_args['shortcode_paths']
-                : array(),
-            'shortcode_fqcns' => isset($setup_args['shortcode_fqcns'])
-                ? (array) $setup_args['shortcode_fqcns']
-                : array(),
-        );
-        // add to list of shortcodes to be registered
-        add_filter(
-            'FHEE__EE_Config__register_shortcodes__shortcodes_to_register',
-            array('EE_Register_Shortcode', 'add_shortcodes')
-        );
+		// make sure this was called in the right place!
+		if (! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				esc_html__(
+					'An attempt to register shortcodes has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register shortcodes.',
+					'event_espresso'
+				),
+				'4.3.0'
+			);
+		}
+		// setup $_settings array from incoming values.
+		self::$_settings[ $shortcode_id ] = array(
+			// array of full server paths to any EES_Shortcodes used by the shortcode
+			'shortcode_paths' => isset($setup_args['shortcode_paths'])
+				? (array) $setup_args['shortcode_paths']
+				: array(),
+			'shortcode_fqcns' => isset($setup_args['shortcode_fqcns'])
+				? (array) $setup_args['shortcode_fqcns']
+				: array(),
+		);
+		// add to list of shortcodes to be registered
+		add_filter(
+			'FHEE__EE_Config__register_shortcodes__shortcodes_to_register',
+			array('EE_Register_Shortcode', 'add_shortcodes')
+		);
 
-        add_filter(
-            'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
-            array('EE_Register_Shortcode', 'instantiateAndAddToShortcodeCollection')
-        );
-    }
+		add_filter(
+			'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
+			array('EE_Register_Shortcode', 'instantiateAndAddToShortcodeCollection')
+		);
+	}
 
 
-    /**
-     * Filters the list of shortcodes to add ours.
-     * and they're just full filepaths to FOLDERS containing a shortcode class file. Eg.
-     * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/shortcodes/espresso_monkey',...)
-     *
-     * @param array $shortcodes_to_register array of paths to all shortcodes that require registering
-     * @return array
-     */
-    public static function add_shortcodes($shortcodes_to_register)
-    {
-        foreach (self::$_settings as $settings) {
-            $shortcodes_to_register = array_merge($shortcodes_to_register, $settings['shortcode_paths']);
-        }
-        return $shortcodes_to_register;
-    }
+	/**
+	 * Filters the list of shortcodes to add ours.
+	 * and they're just full filepaths to FOLDERS containing a shortcode class file. Eg.
+	 * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/shortcodes/espresso_monkey',...)
+	 *
+	 * @param array $shortcodes_to_register array of paths to all shortcodes that require registering
+	 * @return array
+	 */
+	public static function add_shortcodes($shortcodes_to_register)
+	{
+		foreach (self::$_settings as $settings) {
+			$shortcodes_to_register = array_merge($shortcodes_to_register, $settings['shortcode_paths']);
+		}
+		return $shortcodes_to_register;
+	}
 
 
-    /**
-     * Hooks into
-     * FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection and
-     * registers any provided shortcode fully qualified class names.
-     *
-     * @param CollectionInterface $shortcodes_collection
-     * @return CollectionInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    public static function instantiateAndAddToShortcodeCollection(CollectionInterface $shortcodes_collection)
-    {
-        foreach (self::$_settings as $settings) {
-            if (! empty($settings['shortcode_fqcns'])) {
-                foreach ($settings['shortcode_fqcns'] as $shortcode_fqcn) {
-                    if (! class_exists($shortcode_fqcn)) {
-                        throw new InvalidClassException(
-                            sprintf(
-                                esc_html__(
-                                    'Are you sure %s is the right fully qualified class name for the shortcode class?',
-                                    'event_espresso'
-                                ),
-                                $shortcode_fqcn
-                            )
-                        );
-                    }
-                    if (! EE_Dependency_Map::instance()->has_dependency_for_class($shortcode_fqcn)) {
-                        // register dependencies
-                        EE_Dependency_Map::register_dependencies(
-                            $shortcode_fqcn,
-                            array(
-                                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-                            )
-                        );
-                    }
-                    $shortcodes_collection->add(LoaderFactory::getLoader()->getShared($shortcode_fqcn));
-                }
-            }
-        }
-        return $shortcodes_collection;
-    }
+	/**
+	 * Hooks into
+	 * FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection and
+	 * registers any provided shortcode fully qualified class names.
+	 *
+	 * @param CollectionInterface $shortcodes_collection
+	 * @return CollectionInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	public static function instantiateAndAddToShortcodeCollection(CollectionInterface $shortcodes_collection)
+	{
+		foreach (self::$_settings as $settings) {
+			if (! empty($settings['shortcode_fqcns'])) {
+				foreach ($settings['shortcode_fqcns'] as $shortcode_fqcn) {
+					if (! class_exists($shortcode_fqcn)) {
+						throw new InvalidClassException(
+							sprintf(
+								esc_html__(
+									'Are you sure %s is the right fully qualified class name for the shortcode class?',
+									'event_espresso'
+								),
+								$shortcode_fqcn
+							)
+						);
+					}
+					if (! EE_Dependency_Map::instance()->has_dependency_for_class($shortcode_fqcn)) {
+						// register dependencies
+						EE_Dependency_Map::register_dependencies(
+							$shortcode_fqcn,
+							array(
+								'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+							)
+						);
+					}
+					$shortcodes_collection->add(LoaderFactory::getLoader()->getShared($shortcode_fqcn));
+				}
+			}
+		}
+		return $shortcodes_collection;
+	}
 
 
-    /**
-     * This deregisters a shortcode that was previously registered with a specific $shortcode_id.
-     *
-     * @since    4.3.0
-     * @param string $shortcode_id the name for the shortcode that was previously registered
-     * @return void
-     */
-    public static function deregister($shortcode_id = null)
-    {
-        if (isset(self::$_settings[ $shortcode_id ])) {
-            unset(self::$_settings[ $shortcode_id ]);
-        }
-    }
+	/**
+	 * This deregisters a shortcode that was previously registered with a specific $shortcode_id.
+	 *
+	 * @since    4.3.0
+	 * @param string $shortcode_id the name for the shortcode that was previously registered
+	 * @return void
+	 */
+	public static function deregister($shortcode_id = null)
+	{
+		if (isset(self::$_settings[ $shortcode_id ])) {
+			unset(self::$_settings[ $shortcode_id ]);
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -61,12 +61,12 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_settings[ $shortcode_id ])) {
+        if (isset(self::$_settings[$shortcode_id])) {
             return;
         }
 
         // make sure this was called in the right place!
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
+        if ( ! did_action('AHEE__EE_System__load_espresso_addons')
             || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
         ) {
             EE_Error::doing_it_wrong(
@@ -79,7 +79,7 @@ 
             );
         }
         // setup $_settings array from incoming values.
-        self::$_settings[ $shortcode_id ] = array(
+        self::$_settings[$shortcode_id] = array(
             // array of full server paths to any EES_Shortcodes used by the shortcode
             'shortcode_paths' => isset($setup_args['shortcode_paths'])
                 ? (array) $setup_args['shortcode_paths']
@@ -133,9 +133,9 @@ 
     public static function instantiateAndAddToShortcodeCollection(CollectionInterface $shortcodes_collection)
     {
         foreach (self::$_settings as $settings) {
-            if (! empty($settings['shortcode_fqcns'])) {
+            if ( ! empty($settings['shortcode_fqcns'])) {
                 foreach ($settings['shortcode_fqcns'] as $shortcode_fqcn) {
-                    if (! class_exists($shortcode_fqcn)) {
+                    if ( ! class_exists($shortcode_fqcn)) {
                         throw new InvalidClassException(
                             sprintf(
                                 esc_html__(
@@ -146,7 +146,7 @@ 
                             )
                         );
                     }
-                    if (! EE_Dependency_Map::instance()->has_dependency_for_class($shortcode_fqcn)) {
+                    if ( ! EE_Dependency_Map::instance()->has_dependency_for_class($shortcode_fqcn)) {
                         // register dependencies
                         EE_Dependency_Map::register_dependencies(
                             $shortcode_fqcn,
@@ -172,8 +172,8 @@ 
      */
     public static function deregister($shortcode_id = null)
     {
-        if (isset(self::$_settings[ $shortcode_id ])) {
-            unset(self::$_settings[ $shortcode_id ]);
+        if (isset(self::$_settings[$shortcode_id])) {
+            unset(self::$_settings[$shortcode_id]);
         }
     }
 }

core/libraries/plugin_api/EE_Register_CPT.lib.php

Spacing +11 added lines, -11 removed lines

@@ -73,7 +73,7 @@ 
             );
         }
 
-        if (! is_array($setup_args) || (empty($setup_args['cpts']) && empty($setup_args['cts']))) {
+        if ( ! is_array($setup_args) || (empty($setup_args['cpts']) && empty($setup_args['cts']))) {
             throw new EE_Error(
                 __(
                     'In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.',
@@ -83,13 +83,13 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_registry[ $cpt_ref ])) {
+        if (isset(self::$_registry[$cpt_ref])) {
             return;
         }
 
         // make sure cpt ref is unique.
-        if (isset(self::$_registry[ $cpt_ref ])) {
-            $cpt_ref = uniqid() . '_' . $cpt_ref;
+        if (isset(self::$_registry[$cpt_ref])) {
+            $cpt_ref = uniqid().'_'.$cpt_ref;
         }
 
         // make sure this was called in the right place!
@@ -119,7 +119,7 @@ 
                 : array(),
         );
 
-        self::$_registry[ $cpt_ref ] = $validated;
+        self::$_registry[$cpt_ref] = $validated;
 
         // hook into to cpt system
         add_filter(
@@ -152,7 +152,7 @@ 
     {
         foreach (self::$_registry as $registries) {
             foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
-                $custom_post_type_definitions[ $cpt_name ] = $cpt_settings;
+                $custom_post_type_definitions[$cpt_name] = $cpt_settings;
             }
         }
         return $custom_post_type_definitions;
@@ -171,7 +171,7 @@ 
     {
         foreach (self::$_registry as $registries) {
             foreach ($registries['cts'] as $ct_name => $ct_settings) {
-                $custom_taxonomy_definitions[ $ct_name ] = $ct_settings;
+                $custom_taxonomy_definitions[$ct_name] = $ct_settings;
             }
         }
         return $custom_taxonomy_definitions;
@@ -211,7 +211,7 @@ 
     {
         foreach (self::$_registry as $registries) {
             foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
-                $cpts[ $cpt_name ] = $cpt_settings;
+                $cpts[$cpt_name] = $cpt_settings;
             }
         }
         return $cpts;
@@ -227,7 +227,7 @@ 
     {
         foreach (self::$_registry as $registries) {
             foreach ($registries['cts'] as $ct_name => $ct_settings) {
-                $cts[ $ct_name ] = $ct_settings;
+                $cts[$ct_name] = $ct_settings;
             }
         }
         return $cts;
@@ -262,8 +262,8 @@ 
      */
     public static function deregister($cpt_ref = null)
     {
-        if (! empty(self::$_registry[ $cpt_ref ])) {
-            unset(self::$_registry[ $cpt_ref ]);
+        if ( ! empty(self::$_registry[$cpt_ref])) {
+            unset(self::$_registry[$cpt_ref]);
         }
     }
 }

Indentation +230 added lines, -230 removed lines

@@ -13,257 +13,257 @@
 class EE_Register_CPT implements EEI_Plugin_API
 {
 
-    /**
-     * Holds values for registered variations
-     *
-     * @since 4.5.0
-     *
-     * @var array[][][]
-     */
-    protected static $_registry = array();
+	/**
+	 * Holds values for registered variations
+	 *
+	 * @since 4.5.0
+	 *
+	 * @var array[][][]
+	 */
+	protected static $_registry = array();
 
 
-    /**
-     * Used to register new CPTs and Taxonomies.
-     *
-     * @param string $cpt_ref                 reference used for the addon registering cpts and cts
-     * @param array  $setup_args              {
-     *                                        An array of required values for registering the cpts and taxonomies
-     * @type array   $cpts                    {
-     *                                        An array of cpts and their arguments.(short example below)
-     * @see CustomPostTypeDefinitions::setDefinitions for a more complete example.
-     *                                        'people' => array(
-     *                                        'singular_name' => __('People', 'event_espresso'),
-     *                                        'plural_name' => __('People', 'event_espresso'),
-     *                                        'singular_slug' => __('people', 'event_espresso'),
-     *                                        'plural_slug' => __('peoples', 'event_espresso'),
-     *                                        'class_name' => 'EE_People'
-     *                                        )
-     *                                        },
-     * @type array   $cts                     {
-     *                                        An array of custom taxonomies and their arguments (short example below).
-     * @see CustomTaxonomyDefinitions::setTaxonomies() for a more complete example.
-     *                                        'espresso_people_type' => array(
-     *                                        'singular_name' => __('People Type', 'event_espresso'),
-     *                                        'plural_name' => __('People Types', 'event_espresso'),
-     *                                        'args' => array()
-     *                                        )
-     *                                        },
-     * @type array   $default_terms           {
-     *                                        An array of terms to set as the default for a given taxonomy and the
-     *                                        custom post types applied to.
-     *                                        'taxonomy_name' => array(
-     *                                        'term' => array( 'cpt_a_name', 'cpt_b_name' )
-     *                                        )
-     *                                        }
-     *                                        }
-     * @throws  EE_Error
-     * @return void
-     */
-    public static function register($cpt_ref = null, $setup_args = array())
-    {
+	/**
+	 * Used to register new CPTs and Taxonomies.
+	 *
+	 * @param string $cpt_ref                 reference used for the addon registering cpts and cts
+	 * @param array  $setup_args              {
+	 *                                        An array of required values for registering the cpts and taxonomies
+	 * @type array   $cpts                    {
+	 *                                        An array of cpts and their arguments.(short example below)
+	 * @see CustomPostTypeDefinitions::setDefinitions for a more complete example.
+	 *                                        'people' => array(
+	 *                                        'singular_name' => __('People', 'event_espresso'),
+	 *                                        'plural_name' => __('People', 'event_espresso'),
+	 *                                        'singular_slug' => __('people', 'event_espresso'),
+	 *                                        'plural_slug' => __('peoples', 'event_espresso'),
+	 *                                        'class_name' => 'EE_People'
+	 *                                        )
+	 *                                        },
+	 * @type array   $cts                     {
+	 *                                        An array of custom taxonomies and their arguments (short example below).
+	 * @see CustomTaxonomyDefinitions::setTaxonomies() for a more complete example.
+	 *                                        'espresso_people_type' => array(
+	 *                                        'singular_name' => __('People Type', 'event_espresso'),
+	 *                                        'plural_name' => __('People Types', 'event_espresso'),
+	 *                                        'args' => array()
+	 *                                        )
+	 *                                        },
+	 * @type array   $default_terms           {
+	 *                                        An array of terms to set as the default for a given taxonomy and the
+	 *                                        custom post types applied to.
+	 *                                        'taxonomy_name' => array(
+	 *                                        'term' => array( 'cpt_a_name', 'cpt_b_name' )
+	 *                                        )
+	 *                                        }
+	 *                                        }
+	 * @throws  EE_Error
+	 * @return void
+	 */
+	public static function register($cpt_ref = null, $setup_args = array())
+	{
 
-        // check for required params
-        if (empty($cpt_ref)) {
-            throw new EE_Error(
-                __(
-                    'In order to register custom post types and custom taxonomies, you must include a value to reference what had been registered',
-                    'event_espresso'
-                )
-            );
-        }
+		// check for required params
+		if (empty($cpt_ref)) {
+			throw new EE_Error(
+				__(
+					'In order to register custom post types and custom taxonomies, you must include a value to reference what had been registered',
+					'event_espresso'
+				)
+			);
+		}
 
-        if (! is_array($setup_args) || (empty($setup_args['cpts']) && empty($setup_args['cts']))) {
-            throw new EE_Error(
-                __(
-                    'In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.',
-                    'event_espresso'
-                )
-            );
-        }
+		if (! is_array($setup_args) || (empty($setup_args['cpts']) && empty($setup_args['cts']))) {
+			throw new EE_Error(
+				__(
+					'In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_registry[ $cpt_ref ])) {
-            return;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_registry[ $cpt_ref ])) {
+			return;
+		}
 
-        // make sure cpt ref is unique.
-        if (isset(self::$_registry[ $cpt_ref ])) {
-            $cpt_ref = uniqid() . '_' . $cpt_ref;
-        }
+		// make sure cpt ref is unique.
+		if (isset(self::$_registry[ $cpt_ref ])) {
+			$cpt_ref = uniqid() . '_' . $cpt_ref;
+		}
 
-        // make sure this was called in the right place!
-        if (did_action('AHEE__EE_System__load_CPTs_and_session__complete')) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'EE_Register_CPT has been called and given a reference of "%s".  It may or may not work because it should be called on or before "AHEE__EE_System__load_CPTs_and_session__complete" action hook.',
-                        'event_espresso'
-                    ),
-                    $cpt_ref
-                ),
-                '4.5.0'
-            );
-        }
-        // validate incoming args
-        $validated = array(
-            'cpts'          => isset($setup_args['cpts'])
-                ? (array) $setup_args['cpts']
-                : array(),
-            'cts'           => isset($setup_args['cts'])
-                ? (array) $setup_args['cts']
-                : array(),
-            'default_terms' => isset($setup_args['default_terms'])
-                ? (array) $setup_args['default_terms']
-                : array(),
-        );
+		// make sure this was called in the right place!
+		if (did_action('AHEE__EE_System__load_CPTs_and_session__complete')) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'EE_Register_CPT has been called and given a reference of "%s".  It may or may not work because it should be called on or before "AHEE__EE_System__load_CPTs_and_session__complete" action hook.',
+						'event_espresso'
+					),
+					$cpt_ref
+				),
+				'4.5.0'
+			);
+		}
+		// validate incoming args
+		$validated = array(
+			'cpts'          => isset($setup_args['cpts'])
+				? (array) $setup_args['cpts']
+				: array(),
+			'cts'           => isset($setup_args['cts'])
+				? (array) $setup_args['cts']
+				: array(),
+			'default_terms' => isset($setup_args['default_terms'])
+				? (array) $setup_args['default_terms']
+				: array(),
+		);
 
-        self::$_registry[ $cpt_ref ] = $validated;
+		self::$_registry[ $cpt_ref ] = $validated;
 
-        // hook into to cpt system
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            array(__CLASS__, 'filterCustomPostTypeDefinitions'),
-            5
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            array(__CLASS__, 'filterCustomTaxonomyDefinitions'),
-            5
-        );
-        add_action(
-            'AHEE__EventEspresso_core_domain_services_custom_post_types_RegisterCustomTaxonomyTerms__construct_end',
-            array(__CLASS__, 'registerCustomTaxonomyTerm'),
-            5
-        );
-    }
+		// hook into to cpt system
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			array(__CLASS__, 'filterCustomPostTypeDefinitions'),
+			5
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			array(__CLASS__, 'filterCustomTaxonomyDefinitions'),
+			5
+		);
+		add_action(
+			'AHEE__EventEspresso_core_domain_services_custom_post_types_RegisterCustomTaxonomyTerms__construct_end',
+			array(__CLASS__, 'registerCustomTaxonomyTerm'),
+			5
+		);
+	}
 
 
-    /**
-     * Callback for
-     * FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes
-     * that adds additional custom post types to be registered.
-     *
-     * @param array $custom_post_type_definitions array of cpts that are already set
-     * @return array new array of cpts and their registration information
-     */
-    public static function filterCustomPostTypeDefinitions($custom_post_type_definitions)
-    {
-        foreach (self::$_registry as $registries) {
-            foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
-                $custom_post_type_definitions[ $cpt_name ] = $cpt_settings;
-            }
-        }
-        return $custom_post_type_definitions;
-    }
+	/**
+	 * Callback for
+	 * FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes
+	 * that adds additional custom post types to be registered.
+	 *
+	 * @param array $custom_post_type_definitions array of cpts that are already set
+	 * @return array new array of cpts and their registration information
+	 */
+	public static function filterCustomPostTypeDefinitions($custom_post_type_definitions)
+	{
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
+				$custom_post_type_definitions[ $cpt_name ] = $cpt_settings;
+			}
+		}
+		return $custom_post_type_definitions;
+	}
 
 
-    /**
-     * Callback for
-     * FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies
-     * that adds additional custom taxonomies to be registered.
-     *
-     * @param array $custom_taxonomy_definitions array of cts that are already set.
-     * @return array new array of cts and their registration information.
-     */
-    public static function filterCustomTaxonomyDefinitions($custom_taxonomy_definitions)
-    {
-        foreach (self::$_registry as $registries) {
-            foreach ($registries['cts'] as $ct_name => $ct_settings) {
-                $custom_taxonomy_definitions[ $ct_name ] = $ct_settings;
-            }
-        }
-        return $custom_taxonomy_definitions;
-    }
+	/**
+	 * Callback for
+	 * FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies
+	 * that adds additional custom taxonomies to be registered.
+	 *
+	 * @param array $custom_taxonomy_definitions array of cts that are already set.
+	 * @return array new array of cts and their registration information.
+	 */
+	public static function filterCustomTaxonomyDefinitions($custom_taxonomy_definitions)
+	{
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['cts'] as $ct_name => $ct_settings) {
+				$custom_taxonomy_definitions[ $ct_name ] = $ct_settings;
+			}
+		}
+		return $custom_taxonomy_definitions;
+	}
 
 
-    /**
-     * Callback for
-     * AHEE__EventEspresso_core_domain_services_custom_post_types_RegisterCustomTaxonomyTerms__construct_end
-     * which is used to set the default terms
-     *
-     * @param RegisterCustomTaxonomyTerms $register_custom_taxonomy_terms
-     * @return void
-     */
-    public static function registerCustomTaxonomyTerm(RegisterCustomTaxonomyTerms $register_custom_taxonomy_terms)
-    {
-        foreach (self::$_registry as $registries) {
-            foreach ($registries['default_terms'] as $taxonomy => $terms) {
-                foreach ($terms as $term => $cpts) {
-                    $register_custom_taxonomy_terms->registerCustomTaxonomyTerm(
-                        $taxonomy,
-                        $term,
-                        $cpts
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * Callback for
+	 * AHEE__EventEspresso_core_domain_services_custom_post_types_RegisterCustomTaxonomyTerms__construct_end
+	 * which is used to set the default terms
+	 *
+	 * @param RegisterCustomTaxonomyTerms $register_custom_taxonomy_terms
+	 * @return void
+	 */
+	public static function registerCustomTaxonomyTerm(RegisterCustomTaxonomyTerms $register_custom_taxonomy_terms)
+	{
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['default_terms'] as $taxonomy => $terms) {
+				foreach ($terms as $term => $cpts) {
+					$register_custom_taxonomy_terms->registerCustomTaxonomyTerm(
+						$taxonomy,
+						$term,
+						$cpts
+					);
+				}
+			}
+		}
+	}
 
 
-    /**
-     * @deprecated 4.9.62.p
-     * @param array $cpts array of cpts that are already set
-     * @return array new array of cpts and their registration information
-     */
-    public static function filter_cpts($cpts)
-    {
-        foreach (self::$_registry as $registries) {
-            foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
-                $cpts[ $cpt_name ] = $cpt_settings;
-            }
-        }
-        return $cpts;
-    }
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param array $cpts array of cpts that are already set
+	 * @return array new array of cpts and their registration information
+	 */
+	public static function filter_cpts($cpts)
+	{
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
+				$cpts[ $cpt_name ] = $cpt_settings;
+			}
+		}
+		return $cpts;
+	}
 
 
-    /**
-     * @deprecated 4.9.62.p
-     * @param array $cts array of cts that are already set.
-     * @return array new array of cts and their registration information.
-     */
-    public static function filter_cts($cts)
-    {
-        foreach (self::$_registry as $registries) {
-            foreach ($registries['cts'] as $ct_name => $ct_settings) {
-                $cts[ $ct_name ] = $ct_settings;
-            }
-        }
-        return $cts;
-    }
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param array $cts array of cts that are already set.
+	 * @return array new array of cts and their registration information.
+	 */
+	public static function filter_cts($cts)
+	{
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['cts'] as $ct_name => $ct_settings) {
+				$cts[ $ct_name ] = $ct_settings;
+			}
+		}
+		return $cts;
+	}
 
 
-    /**
-     * @deprecated 4.9.62.p
-     * @param EE_Register_CPTs $cpt_class
-     * @return void
-     */
-    public static function default_terms(EE_Register_CPTs $cpt_class)
-    {
-        foreach (self::$_registry as $registries) {
-            foreach ($registries['default_terms'] as $taxonomy => $terms) {
-                foreach ($terms as $term => $cpts) {
-                    $cpt_class->set_default_term($taxonomy, $term, $cpts);
-                }
-            }
-        }
-    }
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param EE_Register_CPTs $cpt_class
+	 * @return void
+	 */
+	public static function default_terms(EE_Register_CPTs $cpt_class)
+	{
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['default_terms'] as $taxonomy => $terms) {
+				foreach ($terms as $term => $cpts) {
+					$cpt_class->set_default_term($taxonomy, $term, $cpts);
+				}
+			}
+		}
+	}
 
 
-    /**
-     * This deregisters whats been registered on this class (for the given slug).
-     *
-     * @since 4.5.0
-     *
-     * @param string $cpt_ref The reference for the item registered to be removed.
-     *
-     * @return void
-     */
-    public static function deregister($cpt_ref = null)
-    {
-        if (! empty(self::$_registry[ $cpt_ref ])) {
-            unset(self::$_registry[ $cpt_ref ]);
-        }
-    }
+	/**
+	 * This deregisters whats been registered on this class (for the given slug).
+	 *
+	 * @since 4.5.0
+	 *
+	 * @param string $cpt_ref The reference for the item registered to be removed.
+	 *
+	 * @return void
+	 */
+	public static function deregister($cpt_ref = null)
+	{
+		if (! empty(self::$_registry[ $cpt_ref ])) {
+			unset(self::$_registry[ $cpt_ref ]);
+		}
+	}
 }