eventespresso / event-espresso-core

core/admin/templates/admin_general_metabox_contents_espresso_links.template.php

Indentation +19 added lines, -19 removed lines

@@ -2,16 +2,16 @@ 
     <ul class="infolinks">
         <li>
             <?php
-            echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'
-                 . __(
-                     'Installation',
-                     'event_espresso'
-                 )
-                 . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'
-                 . __(
-                     'Usage Guide',
-                     'event_espresso'
-                 ) . '</a>'; ?>
+			echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'
+				 . __(
+					 'Installation',
+					 'event_espresso'
+				 )
+				 . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'
+				 . __(
+					 'Usage Guide',
+					 'event_espresso'
+				 ) . '</a>'; ?>
         </li>
         <li>
             <a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -41,15 +41,15 @@ 
         </li>
         <li>
             <?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'
-                       . __(
-                           'Plugins',
-                           'event_espresso'
-                       )
-                       . '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'
-                       . __(
-                           'Add-ons',
-                           'event_espresso'
-                       ) . '</a>'; ?><br/>
+					   . __(
+						   'Plugins',
+						   'event_espresso'
+					   )
+					   . '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'
+					   . __(
+						   'Add-ons',
+						   'event_espresso'
+					   ) . '</a>'; ?><br/>
             <br/>
             <ol>
                 <li>

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
                  . __(
                      'Usage Guide',
                      'event_espresso'
-                 ) . '</a>'; ?>
+                 ).'</a>'; ?>
         </li>
         <li>
             <a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -49,7 +49,7 @@ 
                        . __(
                            'Add-ons',
                            'event_espresso'
-                       ) . '</a>'; ?><br/>
+                       ).'</a>'; ?><br/>
             <br/>
             <ol>
                 <li>

core/admin/templates/status_dropdown.template.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
             <option<?php selected($cur_status, $status); ?>
                 value='<?php echo $status; ?>'><?php echo $label; ?></option>
         <?php
-        endforeach;
-        ?>
+		endforeach;
+		?>
     </select>
 </div>
\ No newline at end of file

core/admin/templates/admin_details_wrapper.template.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 // action for registering metaboxes
 do_action('add_meta_boxes', $post_type, $post);
 ?>
-<?php if (! empty($admin_page_header)) : ?>
+<?php if ( ! empty($admin_page_header)) : ?>
     <div id="admin-page-header">
         <?php echo $admin_page_header; ?>
     </div>
@@ -15,7 +15,7 @@ 
     <!-- admin-page-header -->
     <div id="post-body" class="metabox-holder columns-2">
 
-        <?php if (! empty($post_body_content)) : ?>
+        <?php if ( ! empty($post_body_content)) : ?>
             <div id="post-body-content">
                 <?php echo $post_body_content; ?>
             </div>

core/admin/templates/admin_wrapper_ajax.template.php

Indentation +6 added lines, -6 removed lines

@@ -3,11 +3,11 @@
 
     <div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; ?></div>
     <?php
-    do_action('AHEE__admin_wrapper__template__before_admin_page_content');
-    echo $before_admin_page_content;
-    echo $admin_page_content;
-    echo $after_admin_page_content;
-    do_action('AHEE__admin_wrapper__template__after_admin_page_content');
-    ?>
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
+	echo $before_admin_page_content;
+	echo $admin_page_content;
+	echo $after_admin_page_content;
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
+	?>
 </div>
 <!-- espresso-admin -->
\ No newline at end of file

core/admin/templates/espresso_ratings_request_content.template.php

Indentation +8 added lines, -8 removed lines

@@ -1,9 +1,9 @@ 
 <div class="padding">
     <p><?php
-        _e(
-            'We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.',
-            'event_espresso'
-        ); ?></p>
+		_e(
+			'We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.',
+			'event_espresso'
+		); ?></p>
     <p><?php _e('Rate it five stars today!', 'event_espresso'); ?></p><span
         class="ee-wp-blue dashicons dashicons-star-filled"></span><span
         class="ee-wp-blue dashicons dashicons-star-filled"></span><span
@@ -12,8 +12,8 @@ 
         class="ee-wp-blue dashicons dashicons-star-filled"></span>
     <p><a class="button button-primary"
           href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php
-            _e(
-                'Rate It!',
-                'event_espresso'
-            ); ?></a></p>
+			_e(
+				'Rate It!',
+				'event_espresso'
+			); ?></a></p>
 </div>
\ No newline at end of file

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 <div id="<?php echo $admin_page_wrapper_div_id; ?>">
     <div id="post-body" class="metabox-holder columns-1">
 
-        <?php if (! empty($admin_page_header)) : ?>
+        <?php if ( ! empty($admin_page_header)) : ?>
             <div id="admin-page-header">
                 <?php echo $admin_page_header; ?>
             </div>

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

Indentation +117 added lines, -117 removed lines

@@ -32,126 +32,126 @@
 class EEE_Base_Class
 {
 
-    const extending_method_prefix = 'ext_';
-    const dynamic_callback_method_prefix = 'dynamic_callback_method_';
-    /**
-     * The model name that is extended (not classname)
-     *
-     * @var string
-     */
-    protected $_model_name_extended = null;
-    /**
-     * The model this extends
-     *
-     * @var EE_Base_Class
-     */
-    protected $_ = null;
+	const extending_method_prefix = 'ext_';
+	const dynamic_callback_method_prefix = 'dynamic_callback_method_';
+	/**
+	 * The model name that is extended (not classname)
+	 *
+	 * @var string
+	 */
+	protected $_model_name_extended = null;
+	/**
+	 * The model this extends
+	 *
+	 * @var EE_Base_Class
+	 */
+	protected $_ = null;
 
-    public function __construct()
-    {
-        if (! $this->_model_name_extended) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "When declaring a class extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
-                        "event_espresso"
-                    )
-                )
-            );
-        }
-        if (did_action('AHEE__EE_' . $this->_model_name_extended . '__construct__end')) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "Hooked in model object extension '%s' too late! The model object %s has already been used!",
-                        "event_espresso"
-                    ),
-                    get_class($this),
-                    $this->_model_name_extended
-                )
-            );
-        }
-        $this->_register_extending_methods();
-    }
+	public function __construct()
+	{
+		if (! $this->_model_name_extended) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"When declaring a class extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
+						"event_espresso"
+					)
+				)
+			);
+		}
+		if (did_action('AHEE__EE_' . $this->_model_name_extended . '__construct__end')) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"Hooked in model object extension '%s' too late! The model object %s has already been used!",
+						"event_espresso"
+					),
+					get_class($this),
+					$this->_model_name_extended
+				)
+			);
+		}
+		$this->_register_extending_methods();
+	}
 
-    /**
-     * 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__EE_{$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 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__EE_{$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()
-    {
-        $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__EE_{$this->_model_name_extended}__$method_name_on_model";
-                remove_filter(
-                    $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
-                    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()
+	{
+		$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__EE_{$this->_model_name_extended}__$method_name_on_model";
+				remove_filter(
+					$callback_name,
+					array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+					10
+				);
+			}
+		}
+	}
 
 
-    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);
-            $original_return_val = $args[0];
-            $model_called = $args[1];
-            // phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
-            $this->_ = $model_called;
-            // phpcs:enable
-            $args_provided_to_method_on_model = $args[2];
-            $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)
-                )
-            );
-        }
-    }
+	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);
+			$original_return_val = $args[0];
+			$model_called = $args[1];
+			// phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
+			$this->_ = $model_called;
+			// phpcs:enable
+			$args_provided_to_method_on_model = $args[2];
+			$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 +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 
     public function __construct()
     {
-        if (! $this->_model_name_extended) {
+        if ( ! $this->_model_name_extended) {
             throw new EE_Error(
                 sprintf(
                     __(
@@ -59,7 +59,7 @@ 
                 )
             );
         }
-        if (did_action('AHEE__EE_' . $this->_model_name_extended . '__construct__end')) {
+        if (did_action('AHEE__EE_'.$this->_model_name_extended.'__construct__end')) {
             throw new EE_Error(
                 sprintf(
                     __(
@@ -87,7 +87,7 @@ 
                 $callback_name = "FHEE__EE_{$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
                 );
@@ -108,7 +108,7 @@ 
                 $callback_name = "FHEE__EE_{$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
                 );
             }
@@ -127,7 +127,7 @@ 
             $this->_ = $model_called;
             // phpcs:enable
             $args_provided_to_method_on_model = $args[2];
-            $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/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]);
         }
     }
 }