eventespresso / event-espresso-core

core/libraries/plugin_api/EE_Register_Messages_Template_Variations.lib.php

Spacing +41 added lines, -41 removed lines

@@ -68,38 +68,38 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $variation_ref = NULL,  $setup_args = array() ) {
+	public static function register($variation_ref = NULL, $setup_args = array()) {
 
 		//check for required params
-		if ( empty( $variation_ref ) ) {
+		if (empty($variation_ref)) {
 			throw new EE_Error(
 				__('In order to register variations for a EE_Message_Template_Pack, you must include a value to reference the variations being registered', 'event_espresso')
 				);
 		}
 
-		if ( ! is_array( $setup_args ) || empty( $setup_args['variations'] ) || empty( $setup_args['base_path'] ) || empty( $setup_args['base_url'] ) ) {
+		if ( ! is_array($setup_args) || empty($setup_args['variations']) || empty($setup_args['base_path']) || empty($setup_args['base_url'])) {
 			throw new EE_Error(
 				__('In order to register variations for a EE_Message_Template_Pack, you must include an array containing the following keys: "variations", "base_path", "base_url", "extension"', 'event_espresso')
 				);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $variation_ref ] ) ){
+		if (isset(self::$_registry[$variation_ref])) {
 			return;
 		}
 
 		//make sure variation ref is unique.
-		if ( isset( self::$_registry[$variation_ref] ) ) {
-			$variation_ref = uniqid() . '_' . $variation_ref;
+		if (isset(self::$_registry[$variation_ref])) {
+			$variation_ref = uniqid().'_'.$variation_ref;
 		}
 
 
 		//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' )) {
+		 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(
-					__('Messages Templates Variations given the reference "%s" has been attempted to be registered with the EE Messages Template Pack System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.','event_espresso'),
+					__('Messages Templates Variations given the reference "%s" has been attempted to be registered with the EE Messages Template Pack System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.', 'event_espresso'),
 					$variation_ref
 				),
 				'4.5.0'
@@ -115,11 +115,11 @@ 
 
 
 		//check that no reserved variation names are in use and also checks if there are already existing variation names for a given template pack.  The former will throw an error.  The latter will remove the conflicting variation name but still register the others and will add EE_Error notice.
-		$validated = self::_verify_variations( $variation_ref, $validated );
+		$validated = self::_verify_variations($variation_ref, $validated);
 		self::$_registry[$variation_ref] = $validated;
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variations', array( 'EE_Register_Messages_Template_Variations', 'get_variations' ), 10, 4 );
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( 'EE_Register_Messages_Template_Variations', 'get_variation' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variations', array('EE_Register_Messages_Template_Variations', 'get_variations'), 10, 4);
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array('EE_Register_Messages_Template_Variations', 'get_variation'), 10, 8);
 	}
 
 
@@ -136,13 +136,13 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	private static function _verify_variations( $variation_ref, $validated_variations ) {
-		foreach ( self::$_registry as $variation_ref => $settings ) {
-			foreach ( $settings['variations'] as $template_pack => $messenger ) {
-				foreach ( $messenger as $all_variations ) {
-					if ( isset( $all_variations['default'] ) ) {
+	private static function _verify_variations($variation_ref, $validated_variations) {
+		foreach (self::$_registry as $variation_ref => $settings) {
+			foreach ($settings['variations'] as $template_pack => $messenger) {
+				foreach ($messenger as $all_variations) {
+					if (isset($all_variations['default'])) {
 						throw new EE_Error(
-							sprintf( __('Variations registered through the EE_Register_Messages_Template_Variations api cannot override the default variation for the default template.  Please check the code registering variations with this reference, "%s" and modify.', 'event_espresso' ), $variation_ref )
+							sprintf(__('Variations registered through the EE_Register_Messages_Template_Variations api cannot override the default variation for the default template.  Please check the code registering variations with this reference, "%s" and modify.', 'event_espresso'), $variation_ref)
 							);
 					}
 				}
@@ -150,13 +150,13 @@ 
 		}
 
 		//is there already a variation registered with a given variation slug?
-		foreach ( $validated_variations['variations'] as $template_pack => $messenger  ) {
-			foreach ( $messenger as $message_type => $variations ) {
-				foreach( $variations as $slug => $label ) {
-					foreach ( self::$_registry as $registered_var => $reg_settings ) {
-						if ( isset( $reg_settings['variations'][$template_pack][$messenger][$message_type][$slug] ) ) {
-							unset( $validated_variations['variations'][$template_pack][$messenger][$message_type][$slug] );
-							EE_Error::add_error( sprintf( __('Unable to register the %s variation for the %s template pack with the %s messenger and %s message_type because a variation with this slug was already registered for this template pack and messenger and message type by an addon using this key %s.', 'event_espresso' ), $label, $template_pack, $messenger, $message_type, $registered_var  ) );
+		foreach ($validated_variations['variations'] as $template_pack => $messenger) {
+			foreach ($messenger as $message_type => $variations) {
+				foreach ($variations as $slug => $label) {
+					foreach (self::$_registry as $registered_var => $reg_settings) {
+						if (isset($reg_settings['variations'][$template_pack][$messenger][$message_type][$slug])) {
+							unset($validated_variations['variations'][$template_pack][$messenger][$message_type][$slug]);
+							EE_Error::add_error(sprintf(__('Unable to register the %s variation for the %s template pack with the %s messenger and %s message_type because a variation with this slug was already registered for this template pack and messenger and message type by an addon using this key %s.', 'event_espresso'), $label, $template_pack, $messenger, $message_type, $registered_var));
 						}
 					}
 				}
@@ -185,15 +185,15 @@ 
 	 *
 	 * @return string                    The path to the requested variation.
 	 */
-	public static function get_variation( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public static function get_variation($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 
 		//so let's loop through our registered variations and then pull any details matching the request.
-		foreach ( self::$_registry as $registry_slug => $registry_settings ) {
+		foreach (self::$_registry as $registry_slug => $registry_settings) {
 			$base = $url ? $registry_settings['base_url'] : $registry_settings['base_path'];
-			$file_string = $messenger . '_' . $type. '_' . $variation . $file_extension;
+			$file_string = $messenger.'_'.$type.'_'.$variation.$file_extension;
 			//see if this file exists
-			if ( is_readable( $registry_settings['base_path'] . $file_string ) ) {
-				return $base . $file_string;
+			if (is_readable($registry_settings['base_path'].$file_string)) {
+				return $base.$file_string;
 			}
 		}
 
@@ -217,21 +217,21 @@ 
 	 *
 	 * @return array                   new variations array (or existing one if nothing registered)
 	 */
-	public static function get_variations( $variations, $messenger,  $message_type, EE_Messages_Template_Pack $template_pack ) {
+	public static function get_variations($variations, $messenger, $message_type, EE_Messages_Template_Pack $template_pack) {
 		//first let's check if we even have registered variations and get out early.
-		if ( empty( self::$_registry ) ) {
+		if (empty(self::$_registry)) {
 			return $variations;
 		}
 
 		//do we have any new variations for the given messenger, $message_type, and template packs
-		foreach ( self::$_registry as $registry_slug => $registry_settings ) {
+		foreach (self::$_registry as $registry_slug => $registry_settings) {
 			//allow for different conditions.
-			if ( empty( $messenger) ) {
-				$variations =  array_merge( $registry_settings['variations'], $variations );
-			} else if ( ! empty( $messenger ) && empty( $message_type ) && ! empty( $registry_settings['variations'][$template_pack->dbref][$messenger] ) ) {
-				$variations =  array_merge( $registry_settings['variations'][$template_pack->dbref][$messenger], $variations );
-			} else if ( ! empty( $messenger ) && ! empty( $message_type ) && ! empty( $registry_settings['variations'][$template_pack->dbref][$messenger][$message_type] ) ) {
-				$variations = array_merge( $registry_settings['variations'][$template_pack->dbref][$messenger][$message_type], $variations );
+			if (empty($messenger)) {
+				$variations = array_merge($registry_settings['variations'], $variations);
+			} else if ( ! empty($messenger) && empty($message_type) && ! empty($registry_settings['variations'][$template_pack->dbref][$messenger])) {
+				$variations = array_merge($registry_settings['variations'][$template_pack->dbref][$messenger], $variations);
+			} else if ( ! empty($messenger) && ! empty($message_type) && ! empty($registry_settings['variations'][$template_pack->dbref][$messenger][$message_type])) {
+				$variations = array_merge($registry_settings['variations'][$template_pack->dbref][$messenger][$message_type], $variations);
 			}
 		}
 		return $variations;
@@ -250,9 +250,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function deregister( $variation_ref = NULL ) {
-		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
+	public static function deregister($variation_ref = NULL) {
+		if ( ! empty(self::$_registry[$variation_ref])) {
+    			unset(self::$_registry[$variation_ref]);
     		}
 	}
 

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Indentation +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@
 	 */
 	public static function deregister( $variation_ref = NULL ) {
 		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
-    		}
+				unset( self::$_registry[$variation_ref] );
+			}
 	}
 }

core/libraries/plugin_api/EE_Register_Model.lib.php

Indentation +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 		}
 
 		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(
+			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'),
@@ -63,7 +63,7 @@ 
 				),
 				'4.5'
 			);
-        }
+		}
 		self::$_model_registry[$model_id] = $config;
 
 		EE_Registry::instance()->load_helper('File');

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -43,22 +43,22 @@ 
 	 * }
 	 * @throws EE_Error
 	 */
-	public static function register( $model_id = NULL, $config = array() ){
+	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' ));
+		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 ] ) ){
+		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' )) {
+		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'),
+					__('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'
@@ -67,42 +67,42 @@ 
 		self::$_model_registry[$model_id] = $config;
 
 		EE_Registry::instance()->load_helper('File');
-		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']) && ! 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'])){
+		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'] );
+			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;
+			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'));
+			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'])){
+		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'] );
+			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'));
+			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));
+		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));
 		}
 	}
 
@@ -111,9 +111,9 @@ 
 	 * @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);
+	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;
 	}
@@ -122,10 +122,10 @@ 
 	 * @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']);
+	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;
@@ -135,10 +135,10 @@ 
 	 * @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'] );
+	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;
@@ -150,10 +150,10 @@ 
 	 * 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 ] );
+	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]);
 		}
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/libraries/plugin_api/EE_Register_Model_Extensions.lib.php

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage plugin api
  */
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit('NO direct script access allowed'); }
+if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
 /**
  * EE_Register_Model_Extensions
@@ -34,26 +34,26 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register( $model_id = NULL, $config = array() ) {
+	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_extension_paths'] ) && empty( $config['class_extension_paths'] ) ) ) {
-			throw new EE_Error( __( 'In order to register Model extensions with EE_Register_Model_Extensions::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_extension_paths" (an array of full server paths to folders that contain model extensions), and "class_extension_paths" (an array of full server paths to folders that contain class extensions)', 'event_espresso' ));
+		if (empty($model_id) || ! is_array($config) || (empty($config['model_extension_paths']) && empty($config['class_extension_paths']))) {
+			throw new EE_Error(__('In order to register Model extensions with EE_Register_Model_Extensions::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_extension_paths" (an array of full server paths to folders that contain model extensions), and "class_extension_paths" (an array of full server paths to folders that contain class extensions)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $model_id ] ) ){
+		if (isset(self::$_registry[$model_id])) {
 			return;
 		}
 		//check correct loading
-		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(
-					__('An attempt was made to register "%1$s" as a Model extension has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.%2$s Hook Status: %2$s "AHEE__EE_System__load_espresso_addons" : %3$s %2$s "AHEE__EE_Admin__loaded" : %4$s%2$s','event_espresso'),
+					__('An attempt was made to register "%1$s" as a Model extension has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.%2$s Hook Status: %2$s "AHEE__EE_System__load_espresso_addons" : %3$s %2$s "AHEE__EE_Admin__loaded" : %4$s%2$s', 'event_espresso'),
 					$model_id,
 					'<br />',
-					did_action( 'AHEE__EE_System__load_espresso_addons' ) ? 'action done' : 'action NOT done',
-					did_action( 'AHEE__EE_Admin__loaded' ) ? 'action done' : 'action NOT done'
+					did_action('AHEE__EE_System__load_espresso_addons') ? 'action done' : 'action NOT done',
+					did_action('AHEE__EE_Admin__loaded') ? 'action done' : 'action NOT done'
 				),
 				'4.3'
 			);
@@ -63,26 +63,26 @@ 
 		self::$_extensions[$model_id] = array();
 		EE_Registry::instance()->load_helper('File');
 
-		if(isset($config['model_extension_paths'])){
+		if (isset($config['model_extension_paths'])) {
 			require_once(EE_LIBRARIES.'plugin_api/db/EEME_Base.lib.php');
 			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['model_extension_paths']);
 			EEH_Autoloader::register_autoloader($class_to_filepath_map);
-			foreach(array_keys($class_to_filepath_map) as $classname){
+			foreach (array_keys($class_to_filepath_map) as $classname) {
 				self::$_extensions[$model_id]['models'][$classname] = new $classname;
 			}
 			unset($config['model_extension_paths']);
 		}
-		if(isset($config['class_extension_paths'])){
+		if (isset($config['class_extension_paths'])) {
 			require_once(EE_LIBRARIES.'plugin_api/db/EEE_Base_Class.lib.php');
 			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_extension_paths']);
 			EEH_Autoloader::register_autoloader($class_to_filepath_map);
-			foreach(array_keys($class_to_filepath_map) as $classname){
+			foreach (array_keys($class_to_filepath_map) as $classname) {
 				self::$_extensions[$model_id]['classes'][$classname] = new $classname;
 			}
 			unset($config['class_extension_paths']);
 		}
-		foreach($config as $unknown_key => $unknown_config){
-			throw new EE_Error(sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"),$unknown_key));
+		foreach ($config as $unknown_key => $unknown_config) {
+			throw new EE_Error(sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key));
 		}
 	}
 
@@ -91,11 +91,11 @@ 
 	 * deregister
 	 * @param string $model_id
 	 */
-	public static function deregister( $model_id = NULL ){
-		if(isset(self::$_registry[$model_id])){
+	public static function deregister($model_id = NULL) {
+		if (isset(self::$_registry[$model_id])) {
 			unset(self::$_registry[$model_id]);
-			foreach(self::$_extensions[$model_id] as $extension_of_type){
-				foreach($extension_of_type as $extension ){
+			foreach (self::$_extensions[$model_id] as $extension_of_type) {
+				foreach ($extension_of_type as $extension) {
 					$extension->deregister();
 				}
 			}

core/libraries/plugin_api/EE_Register_Module.lib.php

Spacing +15 added lines, -15 removed lines

@@ -44,33 +44,33 @@ 
 	 * @type array module_paths 	an array of full server paths to folders containing any EED_Modules, or to the EED_Module files themselves
 	 * @return void
 	 */
-	public static function register( $module_id = NULL, $setup_args = array()  ) {
+	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' ));
+		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 ] ) ){
+		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' )) {
+		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'),
+				__('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(
+		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(),
+			'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' ));
+		add_filter('FHEE__EE_Config__register_modules__modules_to_register', array('EE_Register_Module', 'add_modules'));
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @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'] );
+	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;
 	}
@@ -101,9 +101,9 @@ 
 	 * @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 ] );
+	public static function deregister($module_id = NULL) {
+		if (isset(self::$_settings[$module_id])) {
+			unset(self::$_settings[$module_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Payment_Method.lib.php

Spacing +17 added lines, -17 removed lines

@@ -48,33 +48,33 @@ 
 	 * @type array payment_method_paths 	an array of full server paths to folders containing any EE_PMT_Base children, or to the EED_Module files themselves
 	 * @return void
 	 */
-	public static function register( $payment_method_id = NULL, $setup_args = array()  ) {
+	public static function register($payment_method_id = NULL, $setup_args = array()) {
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $payment_method_id ) || ! is_array( $setup_args ) || empty( $setup_args['payment_method_paths'] )) {
-			throw new EE_Error( __( 'In order to register Payment Methods with EE_Register_Payment_Method::register(), you must include a "payment_method_id" (a unique identifier for this set of modules), and an array containing the following keys: "payment_method_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)', 'event_espresso' ));
+		if (empty($payment_method_id) || ! is_array($setup_args) || empty($setup_args['payment_method_paths'])) {
+			throw new EE_Error(__('In order to register Payment Methods with EE_Register_Payment_Method::register(), you must include a "payment_method_id" (a unique identifier for this set of modules), and an array containing the following keys: "payment_method_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[ $payment_method_id ] ) ){
+		if (isset(self::$_settings[$payment_method_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' )) {
+		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'),
+				__('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[ $payment_method_id ] = array(
+		self::$_settings[$payment_method_id] = array(
 			// array of full server paths to any EE_PMT_Base children used
-			'payment_method_paths'  => isset( $setup_args['payment_method_paths'] ) ? (array)$setup_args['payment_method_paths'] : array(),
+			'payment_method_paths'  => isset($setup_args['payment_method_paths']) ? (array) $setup_args['payment_method_paths'] : array(),
 		);
 		// add to list of modules to be registered
-		add_filter( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array( 'EE_Register_Payment_Method', 'add_payment_methods' ));
+		add_filter('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array('EE_Register_Payment_Method', 'add_payment_methods'));
 
 		/**
 		 * If EE_Payment_Method_Manager::register_payment_methods has already been called, we need it to be called again
@@ -82,9 +82,9 @@ 
 		 * will be called only once per payment method from an addon, so going with that assumption we should always do this.
 		 * If that assumption is false, we should verify this newly-registered paymetn method isn't on the EE_Payment_Method_Manager::_payment_method_types array before calling this (this code should be changed to improve performance)
 		 */
-		if ( did_action( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods' ) ) {
+		if (did_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods')) {
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			EE_Payment_Method_Manager::instance()->maybe_register_payment_methods( TRUE );
+			EE_Payment_Method_Manager::instance()->maybe_register_payment_methods(TRUE);
 		}
 	}
 
@@ -97,9 +97,9 @@ 
 	 * @param array $payment_method_folders  array of paths to all payment methods that require registering
 	 * @return array
 	 */
-	public static function add_payment_methods( $payment_method_folders ){
-		foreach( self::$_settings as $settings ) {
-			$payment_method_folders = array_merge( $payment_method_folders, $settings['payment_method_paths'] );
+	public static function add_payment_methods($payment_method_folders) {
+		foreach (self::$_settings as $settings) {
+			$payment_method_folders = array_merge($payment_method_folders, $settings['payment_method_paths']);
 		}
 		return $payment_method_folders;
 	}
@@ -114,9 +114,9 @@ 
 	 * @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 ] );
+	public static function deregister($module_id = NULL) {
+		if (isset(self::$_settings[$module_id])) {
+			unset(self::$_settings[$module_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Shortcode.lib.php

Spacing +15 added lines, -15 removed lines

@@ -44,33 +44,33 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $shortcode_id = NULL, $setup_args = array()  ) {
+	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'] )) {
-			throw new EE_Error( __( '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' ));
+		if (empty($shortcode_id) || ! is_array($setup_args) || empty($setup_args['shortcode_paths'])) {
+			throw new EE_Error(__('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 ] ) ){
+		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' )) {
+		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 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'),
+				__('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(
+		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_paths'  => isset($setup_args['shortcode_paths']) ? (array) $setup_args['shortcode_paths'] : 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__EE_Config__register_shortcodes__shortcodes_to_register', array('EE_Register_Shortcode', 'add_shortcodes'));
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @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'] );
+	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;
 	}
@@ -100,9 +100,9 @@ 
 	 * @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 ] );
+	public static function deregister($shortcode_id = NULL) {
+		if (isset(self::$_settings[$shortcode_id])) {
+			unset(self::$_settings[$shortcode_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Widget.lib.php

Spacing +15 added lines, -15 removed lines

@@ -44,34 +44,34 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $widget_id = NULL, $setup_args = array()  ) {
+	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' ));
+		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 ] ) ){
+		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' )) {
+		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'),
+				__('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(
+		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(),
+			'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' ));
+		add_filter('FHEE__EE_Config__register_widgets__widgets_to_register', array('EE_Register_Widget', 'add_widgets'));
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @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'] );
+	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;
 	}
@@ -101,9 +101,9 @@ 
 	 * @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 ] );
+	public static function deregister($widget_id = NULL) {
+		if (isset(self::$_settings[$widget_id])) {
+			unset(self::$_settings[$widget_id]);
 		}
 	}
 

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

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -47,12 +47,12 @@ 
 	 */
 	protected $_ = NULL;
 
-	public function __construct(){
-		if( ! $this->_model_name_extended){
+	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));
+		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();
 	}
@@ -61,13 +61,13 @@ 
 	 * 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(){
+	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){
+		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);
+				add_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10, 10);
 			}
 		}
 	}
@@ -75,20 +75,20 @@ 
 	 * 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(){
+	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){
+		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);
+				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){
+	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];
@@ -96,14 +96,14 @@ 
 			$this->_ = $model_called;
 			$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));
+			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)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"), $callback_method_name, get_class($this)));
 		}
 	}
 

Braces +4 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  *
@@ -159,11 +160,11 @@ 
 			$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{
+			} 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{
+		} else{
 			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"),$callback_method_name,get_class($this)));
 		}
 	}

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

Braces +4 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  *
@@ -159,11 +160,11 @@ 
 			$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{
+			} 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{
+		} else{
 			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"),$callback_method_name,get_class($this)));
 		}
 	}

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -69,58 +69,58 @@ 
 	/**
 	 * @throws \EE_Error
 	 */
-	public function __construct(){
-		if( ! $this->_model_name_extended){
+	public function __construct() {
+		if ( ! $this->_model_name_extended) {
 			throw new EE_Error(sprintf(__("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 )) {
+		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"),
+					__("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'));
+		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();
 	}
 
-	public function add_extra_tables_on_filter( $existing_tables ){
-		$tables = array_merge( $existing_tables, $this->_extra_tables );
+	public function add_extra_tables_on_filter($existing_tables) {
+		$tables = array_merge($existing_tables, $this->_extra_tables);
 		return $tables;
 	}
-	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();
+	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($existing_fields[$table_alias],$this->_extra_fields[$table_alias]);
+				$existing_fields[$table_alias] = array_merge($existing_fields[$table_alias], $this->_extra_fields[$table_alias]);
 
 			}
 		}
 		return $existing_fields;
 	}
-	public function add_extra_relations_on_filter($existing_relations){
-		$relations =  array_merge($existing_relations,$this->_extra_relations);
+	public function add_extra_relations_on_filter($existing_relations) {
+		$relations = array_merge($existing_relations, $this->_extra_relations);
 		return $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(){
+	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){
+		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);
+				add_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10, 10);
 			}
 		}
 	}
@@ -129,27 +129,27 @@ 
 	 * 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'));
+	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){
+		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);
+				remove_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10);
 			}
 		}
-		$model_to_reset = 'EEM_' . $this->_model_name_extended;
-		if ( class_exists( $model_to_reset ) ) {
+		$model_to_reset = 'EEM_'.$this->_model_name_extended;
+		if (class_exists($model_to_reset)) {
 			$model_to_reset::reset();
 		}
 	}
 
 
-	public function __call($callback_method_name,$args){
-		if(strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0){
+	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];
@@ -157,14 +157,14 @@ 
 			$this->_ = $model_called;
 			$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));
+			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)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"), $callback_method_name, get_class($this)));
 		}
 	}