eventespresso / event-espresso-core

core/EE_Registry.core.php

Doc Comments +2 added lines, -1 removed lines

@@ -276,6 +276,7 @@ 
 
 	/**
 	 * @param mixed string | EED_Module $module
+	 * @param string $module
 	 */
 	public function add_module( $module ) {
 		if ( $module instanceof EED_Module ) {
@@ -953,7 +954,7 @@ 
 	 *        $this->LIB->{$class_name}     ie:    $this->LIB->Some_Class
 	 *
 	 * @access protected
-	 * @param object $class_obj
+	 * @param string|null $class_obj
 	 * @param string $class_name
 	 * @param string $class_prefix
 	 * @param bool $from_db

Spacing +194 added lines, -194 removed lines

@@ -178,10 +178,10 @@ 
 	 * @param  \EE_Dependency_Map $dependency_map
 	 * @return \EE_Registry instance
 	 */
-	public static function instance( \EE_Dependency_Map $dependency_map = null ) {
+	public static function instance(\EE_Dependency_Map $dependency_map = null) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Registry ) {
-			self::$_instance = apply_filters( 'FHEE__EE_Registry__instance', new EE_Registry( $dependency_map ) );
+		if ( ! self::$_instance instanceof EE_Registry) {
+			self::$_instance = apply_filters('FHEE__EE_Registry__instance', new EE_Registry($dependency_map));
 		}
 		return self::$_instance;
 	}
@@ -196,9 +196,9 @@ 
 	 * @param  \EE_Dependency_Map $dependency_map
 	 * @return \EE_Registry
 	 */
-	protected function __construct( \EE_Dependency_Map $dependency_map ) {
+	protected function __construct(\EE_Dependency_Map $dependency_map) {
 		$this->_dependency_map = $dependency_map;
-		add_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading', array( $this, 'initialize' ) );
+		add_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading', array($this, 'initialize'));
 	}
 
 
@@ -225,17 +225,17 @@ 
 		$this->modules = new stdClass();
 		$this->shortcodes = new stdClass();
 		$this->widgets = new stdClass();
-		$this->load_core( 'Base', array(), true );
+		$this->load_core('Base', array(), true);
 		// add our request and response objects to the cache
 		$this->_set_cached_class(
-			$this->_dependency_map->class_loader( 'EE_Request' ),
+			$this->_dependency_map->class_loader('EE_Request'),
 			'EE_Request'
 		);
 		$this->_set_cached_class(
-			$this->_dependency_map->class_loader( 'EE_Response' ),
+			$this->_dependency_map->class_loader('EE_Response'),
 			'EE_Response'
 		);
-		add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' ) );
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init'));
 	}
 
 
@@ -248,10 +248,10 @@ 
 	 */
 	public function init() {
 		// Get current page protocol
-		$protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://';
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
 		// Output admin-ajax.php URL with same protocol as current page
-		self::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php', $protocol );
-		self::$i18n_js_strings[ 'wp_debug' ] = defined( 'WP_DEBUG' ) ? WP_DEBUG : false;
+		self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol);
+		self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : false;
 	}
 
 
@@ -262,14 +262,14 @@ 
 	 * @return string
 	 */
 	public static function localize_i18n_js_strings() {
-		$i18n_js_strings = (array)EE_Registry::$i18n_js_strings;
-		foreach ( $i18n_js_strings as $key => $value ) {
-			if ( is_scalar( $value ) ) {
-				$i18n_js_strings[ $key ] = html_entity_decode( (string)$value, ENT_QUOTES, 'UTF-8' );
+		$i18n_js_strings = (array) EE_Registry::$i18n_js_strings;
+		foreach ($i18n_js_strings as $key => $value) {
+			if (is_scalar($value)) {
+				$i18n_js_strings[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
-		return "/* <![CDATA[ */ var eei18n = " . wp_json_encode( $i18n_js_strings ) . '; /* ]]> */';
+		return "/* <![CDATA[ */ var eei18n = ".wp_json_encode($i18n_js_strings).'; /* ]]> */';
 	}
 
 
@@ -277,15 +277,15 @@ 
 	/**
 	 * @param mixed string | EED_Module $module
 	 */
-	public function add_module( $module ) {
-		if ( $module instanceof EED_Module ) {
-			$module_class = get_class( $module );
+	public function add_module($module) {
+		if ($module instanceof EED_Module) {
+			$module_class = get_class($module);
 			$this->modules->{$module_class} = $module;
 		} else {
-			if ( ! class_exists( 'EE_Module_Request_Router' ) ) {
-				$this->load_core( 'Module_Request_Router' );
+			if ( ! class_exists('EE_Module_Request_Router')) {
+				$this->load_core('Module_Request_Router');
 			}
-			$this->modules->{$module} = EE_Module_Request_Router::module_factory( $module );
+			$this->modules->{$module} = EE_Module_Request_Router::module_factory($module);
 		}
 	}
 
@@ -295,8 +295,8 @@ 
 	 * @param string $module_name
 	 * @return mixed EED_Module | NULL
 	 */
-	public function get_module( $module_name = '' ) {
-		return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
+	public function get_module($module_name = '') {
+		return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
 	}
 
 
@@ -310,20 +310,20 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_core( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_core($class_name, $arguments = array(), $load_only = false) {
 		$core_paths = apply_filters(
 			'FHEE__EE_Registry__load_core__core_paths',
 			array(
 				EE_CORE,
 				EE_ADMIN,
 				EE_CPTS,
-				EE_CORE . 'data_migration_scripts' . DS,
-				EE_CORE . 'request_stack' . DS,
-				EE_CORE . 'middleware' . DS,
+				EE_CORE.'data_migration_scripts'.DS,
+				EE_CORE.'request_stack'.DS,
+				EE_CORE.'middleware'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only );
+		return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only);
 	}
 
 
@@ -337,15 +337,15 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_service( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_service($class_name, $arguments = array(), $load_only = false) {
 		$service_paths = apply_filters(
 			'FHEE__EE_Registry__load_service__service_paths',
 			array(
-				EE_CORE . 'services' . DS,
+				EE_CORE.'services'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only );
+		return $this->_load($service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only);
 	}
 
 
@@ -358,9 +358,9 @@ 
 	 * @param mixed $arguments
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function load_dms( $class_name, $arguments = array() ) {
+	public function load_dms($class_name, $arguments = array()) {
 		// retrieve instantiated class
-		return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false );
+		return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false);
 	}
 
 
@@ -375,14 +375,14 @@ 
 	 * @param bool $load_only whether or not to just load the file and NOT instantiate, or load AND instantiate (default)
 	 * @return EE_Base_Class | bool
 	 */
-	public function load_class( $class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_class__paths', array(
+	public function load_class($class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_class__paths', array(
 			EE_CORE,
 			EE_CLASSES,
 			EE_BUSINESS
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only);
 	}
 
 
@@ -395,11 +395,11 @@ 
 	 * @param bool $load_only
 	 * @return EEH_Base | bool
 	 */
-	public function load_helper( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_helper($class_name, $arguments = array(), $load_only = true) {
 		// todo: add doing_it_wrong() in a few versions after all addons have had calls to this method removed
-		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array( EE_HELPERS ) );
+		$helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS));
 		// retrieve instantiated class
-		return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only );
+		return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only);
 	}
 
 
@@ -414,16 +414,16 @@ 
 	 * @param bool $cache  whether to cache the object or not.
 	 * @return mixed
 	 */
-	public function load_lib( $class_name, $arguments = array(), $load_only = false, $cache = true ) {
+	public function load_lib($class_name, $arguments = array(), $load_only = false, $cache = true) {
 		$paths = array(
 			EE_LIBRARIES,
-			EE_LIBRARIES . 'messages' . DS,
-			EE_LIBRARIES . 'shortcodes' . DS,
-			EE_LIBRARIES . 'qtips' . DS,
-			EE_LIBRARIES . 'payment_methods' . DS,
+			EE_LIBRARIES.'messages'.DS,
+			EE_LIBRARIES.'shortcodes'.DS,
+			EE_LIBRARIES.'qtips'.DS,
+			EE_LIBRARIES.'payment_methods'.DS,
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'lib', $arguments, false, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, false, $cache, $load_only);
 	}
 
 
@@ -436,13 +436,13 @@ 
 	 * @param bool $load_only
 	 * @return EEM_Base | bool
 	 */
-	public function load_model( $class_name, $arguments = array(), $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_model__paths', array(
+	public function load_model($class_name, $arguments = array(), $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_model__paths', array(
 			EE_MODELS,
 			EE_CORE
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only);
 	}
 
 
@@ -455,15 +455,15 @@ 
 	 * @param bool $load_only
 	 * @return mixed | bool
 	 */
-	public function load_model_class( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_model_class($class_name, $arguments = array(), $load_only = true) {
 		$paths = array(
-			EE_MODELS . 'fields' . DS,
-			EE_MODELS . 'helpers' . DS,
-			EE_MODELS . 'relations' . DS,
-			EE_MODELS . 'strategies' . DS
+			EE_MODELS.'fields'.DS,
+			EE_MODELS.'helpers'.DS,
+			EE_MODELS.'relations'.DS,
+			EE_MODELS.'strategies'.DS
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, '', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, '', $arguments, false, true, $load_only);
 	}
 
 
@@ -473,8 +473,8 @@ 
 	 * @param string $model_name like Event, Attendee, Question_Group_Question, etc.
 	 * @return boolean
 	 */
-	public function is_model_name( $model_name ) {
-		return isset( $this->models[ $model_name ] ) ? true : false;
+	public function is_model_name($model_name) {
+		return isset($this->models[$model_name]) ? true : false;
 	}
 
 
@@ -489,9 +489,9 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_file( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true ) {
+	public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, '', $file_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, '', $file_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -506,9 +506,9 @@ 
 	 * @param bool $load_only
 	 * @return EE_Addon
 	 */
-	public function load_addon( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false ) {
+	public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -539,46 +539,46 @@ 
 		$load_only = false
 	) {
 		// strip php file extension
-		$class_name = str_replace( '.php', '', trim( $class_name ) );
+		$class_name = str_replace('.php', '', trim($class_name));
 		// does the class have a prefix ?
-		if ( ! empty( $class_prefix ) && $class_prefix != 'addon' ) {
+		if ( ! empty($class_prefix) && $class_prefix != 'addon') {
 			// make sure $class_prefix is uppercase
-			$class_prefix = strtoupper( trim( $class_prefix ) );
+			$class_prefix = strtoupper(trim($class_prefix));
 			// add class prefix ONCE!!!
-			$class_name = $class_prefix . str_replace( $class_prefix, '', $class_name );
+			$class_name = $class_prefix.str_replace($class_prefix, '', $class_name);
 		}
-		$class_exists = class_exists( $class_name );
+		$class_exists = class_exists($class_name);
 		// if we're only loading the class and it already exists, then let's just return true immediately
-		if ( $load_only && $class_exists ) {
+		if ($load_only && $class_exists) {
 			return true;
 		}
 		// $this->_cache_on is toggled during the recursive loading that can occur with dependency injection
 		// $cache is controlled by individual calls to separate Registry loader methods like load_class()
 		// $load_only is also controlled by individual calls to separate Registry loader methods like load_file()
-		if ( $this->_cache_on && $cache && ! $load_only ) {
+		if ($this->_cache_on && $cache && ! $load_only) {
 			// return object if it's already cached
-			$cached_class = $this->_get_cached_class( $class_name, $class_prefix );
-			if ( $cached_class !== null ) {
+			$cached_class = $this->_get_cached_class($class_name, $class_prefix);
+			if ($cached_class !== null) {
 				return $cached_class;
 			}
 		}
 		// if the class doesn't already exist.. then we need to try and find the file and load it
-		if ( ! $class_exists ) {
+		if ( ! $class_exists) {
 			// get full path to file
-			$path = $this->_resolve_path( $class_name, $type, $file_paths );
+			$path = $this->_resolve_path($class_name, $type, $file_paths);
 			// load the file
-			$loaded = $this->_require_file( $path, $class_name, $type, $file_paths );
+			$loaded = $this->_require_file($path, $class_name, $type, $file_paths);
 			// if loading failed, or we are only loading a file but NOT instantiating an object
-			if ( ! $loaded || $load_only ) {
+			if ( ! $loaded || $load_only) {
 				// return boolean if only loading, or null if an object was expected
 				return $load_only ? $loaded : null;
 			}
 		}
 		// instantiate the requested object
-		$class_obj = $this->_create_object( $class_name, $arguments, $type, $from_db );
-		if ( $this->_cache_on && $cache ) {
+		$class_obj = $this->_create_object($class_name, $arguments, $type, $from_db);
+		if ($this->_cache_on && $cache) {
 			// save it for later... kinda like gum  { : $
-			$this->_set_cached_class( $class_obj, $class_name, $class_prefix, $from_db );
+			$this->_set_cached_class($class_obj, $class_name, $class_prefix, $from_db);
 		}
 		$this->_cache_on = true;
 		return $class_obj;
@@ -601,21 +601,21 @@ 
 	 * @param string $class_prefix
 	 * @return null|object
 	 */
-	protected function _get_cached_class( $class_name, $class_prefix = '' ) {
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+	protected function _get_cached_class($class_name, $class_prefix = '') {
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 		} else {
 			// have to specify something, but not anything that will conflict
 			$class_abbreviation = 'FANCY_BATMAN_PANTS';
 		}
 		// check if class has already been loaded, and return it if it has been
-		if ( isset( $this->{$class_abbreviation} ) && ! is_null( $this->{$class_abbreviation} ) ) {
+		if (isset($this->{$class_abbreviation} ) && ! is_null($this->{$class_abbreviation} )) {
 			return $this->{$class_abbreviation};
-		} else if ( isset ( $this->{$class_name} ) ) {
+		} else if (isset ($this->{$class_name} )) {
 			return $this->{$class_name};
-		} else if ( isset ( $this->LIB->{$class_name} ) ) {
+		} else if (isset ($this->LIB->{$class_name} )) {
 			return $this->LIB->{$class_name};
-		} else if ( $class_prefix == 'addon' && isset ( $this->addons->{$class_name} ) ) {
+		} else if ($class_prefix == 'addon' && isset ($this->addons->{$class_name} )) {
 			return $this->addons->{$class_name};
 		}
 		return null;
@@ -636,20 +636,20 @@ 
 	 * @param array $file_paths
 	 * @return string | bool
 	 */
-	protected function _resolve_path( $class_name, $type = '', $file_paths = array() ) {
+	protected function _resolve_path($class_name, $type = '', $file_paths = array()) {
 		// make sure $file_paths is an array
-		$file_paths = is_array( $file_paths ) ? $file_paths : array( $file_paths );
+		$file_paths = is_array($file_paths) ? $file_paths : array($file_paths);
 		// cycle thru paths
-		foreach ( $file_paths as $key => $file_path ) {
+		foreach ($file_paths as $key => $file_path) {
 			// convert all separators to proper DS, if no filepath, then use EE_CLASSES
-			$file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES;
+			$file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES;
 			// prep file type
-			$type = ! empty( $type ) ? trim( $type, '.' ) . '.' : '';
+			$type = ! empty($type) ? trim($type, '.').'.' : '';
 			// build full file path
-			$file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php';
+			$file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php';
 			//does the file exist and can be read ?
-			if ( is_readable( $file_paths[ $key ] ) ) {
-				return $file_paths[ $key ];
+			if (is_readable($file_paths[$key])) {
+				return $file_paths[$key];
 			}
 		}
 		return false;
@@ -671,29 +671,29 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	protected function _require_file( $path, $class_name, $type = '', $file_paths = array() ) {
+	protected function _require_file($path, $class_name, $type = '', $file_paths = array()) {
 		// don't give up! you gotta...
 		try {
 			//does the file exist and can it be read ?
-			if ( ! $path ) {
+			if ( ! $path) {
 				// so sorry, can't find the file
-				throw new EE_Error (
+				throw new EE_Error(
 					sprintf(
-						__( 'The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso' ),
-						trim( $type, '.' ),
+						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'),
+						trim($type, '.'),
 						$class_name,
-						'<br />' . implode( ',<br />', $file_paths )
+						'<br />'.implode(',<br />', $file_paths)
 					)
 				);
 			}
 			// get the file
-			require_once( $path );
+			require_once($path);
 			// if the class isn't already declared somewhere
-			if ( class_exists( $class_name, false ) === false ) {
+			if (class_exists($class_name, false) === false) {
 				// so sorry, not a class
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s does not appear to contain the %s Class.', 'event_espresso' ),
+						__('The %s file %s does not appear to contain the %s Class.', 'event_espresso'),
 						$type,
 						$path,
 						$class_name
@@ -701,7 +701,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 			return false;
 		}
@@ -733,55 +733,55 @@ 
 	 * @return null | object
 	 * @throws \EE_Error
 	 */
-	protected function _create_object( $class_name, $arguments = array(), $type = '', $from_db = false ) {
+	protected function _create_object($class_name, $arguments = array(), $type = '', $from_db = false) {
 		$class_obj = null;
 		// don't give up! you gotta...
 		try {
 			// create reflection
-			$reflector = $this->get_ReflectionClass( $class_name );
+			$reflector = $this->get_ReflectionClass($class_name);
 			// make sure arguments are an array
-			$arguments = is_array( $arguments ) ? $arguments : array( $arguments );
+			$arguments = is_array($arguments) ? $arguments : array($arguments);
 			// and if arguments array is numerically and sequentially indexed, then we want it to remain as is,
 			// else wrap it in an additional array so that it doesn't get split into multiple parameters
-			$arguments = $this->_array_is_numerically_and_sequentially_indexed( $arguments )
+			$arguments = $this->_array_is_numerically_and_sequentially_indexed($arguments)
 				? $arguments
-				: array( $arguments );
+				: array($arguments);
 			// attempt to inject dependencies ?
-			if ( $this->_dependency_map->has( $class_name ) ) {
-				$arguments = $this->_resolve_dependencies( $reflector, $class_name, $arguments );
+			if ($this->_dependency_map->has($class_name)) {
+				$arguments = $this->_resolve_dependencies($reflector, $class_name, $arguments);
 			}
 			// instantiate the class and add to the LIB array for tracking
 			// EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db)
-			if ( $reflector->getConstructor() === null || $reflector->isAbstract() ) {
+			if ($reflector->getConstructor() === null || $reflector->isAbstract()) {
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				//$instantiation_mode = "no constructor";
 				$class_obj = true;
-			} else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) {
+			} else if ($from_db && method_exists($class_name, 'new_instance_from_db')) {
 				//$instantiation_mode = "new_instance_from_db";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments );
-			} else if ( method_exists( $class_name, 'new_instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments);
+			} else if (method_exists($class_name, 'new_instance')) {
 				//$instantiation_mode = "new_instance";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance' ), $arguments );
-			} else if ( method_exists( $class_name, 'instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments);
+			} else if (method_exists($class_name, 'instance')) {
 				//$instantiation_mode = "instance";
-				$class_obj = call_user_func_array( array( $class_name, 'instance' ), $arguments );
-			} else if ( $reflector->isInstantiable() ) {
+				$class_obj = call_user_func_array(array($class_name, 'instance'), $arguments);
+			} else if ($reflector->isInstantiable()) {
 				//$instantiation_mode = "isInstantiable";
-				$class_obj = $reflector->newInstanceArgs( $arguments );
+				$class_obj = $reflector->newInstanceArgs($arguments);
 			} else {
 				// heh ? something's not right !
 				//$instantiation_mode = 'none';
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s could not be instantiated.', 'event_espresso' ),
+						__('The %s file %s could not be instantiated.', 'event_espresso'),
 						$type,
 						$class_name
 					)
 				);
 			}
-		} catch ( Exception $e ) {
-			if ( ! $e instanceof EE_Error ) {
-				$e = new EE_Error( $e->getMessage() );
+		} catch (Exception $e) {
+			if ( ! $e instanceof EE_Error) {
+				$e = new EE_Error($e->getMessage());
 			}
 			$e->get_error();
 		}
@@ -795,8 +795,8 @@ 
 	 * @param array $array
 	 * @return bool
 	 */
-	protected function _array_is_numerically_and_sequentially_indexed( array $array ) {
-		return ! empty( $array ) ? array_keys( $array ) === range( 0, count( $array ) - 1 ) : true;
+	protected function _array_is_numerically_and_sequentially_indexed(array $array) {
+		return ! empty($array) ? array_keys($array) === range(0, count($array) - 1) : true;
 	}
 
 
@@ -811,14 +811,14 @@ 
 	 * @param string $class_name
 	 * @return ReflectionClass
 	 */
-	public function get_ReflectionClass( $class_name ) {
+	public function get_ReflectionClass($class_name) {
 		if (
-			! isset( $this->_reflectors[ $class_name ] )
-			|| ! $this->_reflectors[ $class_name ] instanceof ReflectionClass
+			! isset($this->_reflectors[$class_name])
+			|| ! $this->_reflectors[$class_name] instanceof ReflectionClass
 		) {
-			$this->_reflectors[ $class_name ] = new ReflectionClass( $class_name );
+			$this->_reflectors[$class_name] = new ReflectionClass($class_name);
 		}
-		return $this->_reflectors[ $class_name ];
+		return $this->_reflectors[$class_name];
 	}
 
 
@@ -843,48 +843,48 @@ 
 	 * @param array $arguments
 	 * @return array
 	 */
-	protected function _resolve_dependencies( ReflectionClass $reflector, $class_name, $arguments = array() ) {
+	protected function _resolve_dependencies(ReflectionClass $reflector, $class_name, $arguments = array()) {
 		// let's examine the constructor
 		$constructor = $reflector->getConstructor();
 		// whu? huh? nothing?
-		if ( ! $constructor ) {
+		if ( ! $constructor) {
 			return $arguments;
 		}
 		// get constructor parameters
 		$params = $constructor->getParameters();
 		// and the keys for the incoming arguments array so that we can compare existing arguments with what is expected
-		$argument_keys = array_keys( $arguments );
+		$argument_keys = array_keys($arguments);
 		// now loop thru all of the constructors expected parameters
-		foreach ( $params as $index => $param ) {
+		foreach ($params as $index => $param) {
 			// is this a dependency for a specific class ?
 			$param_class = $param->getClass() ? $param->getClass()->name : null;
 			// you want a piece of me ?
-			if ( $param_class === 'EE_Registry' ) {
-				$arguments[ $index ] = $this;
+			if ($param_class === 'EE_Registry') {
+				$arguments[$index] = $this;
 			} else if (
 				// param is not even a class
-				empty( $param_class )
+				empty($param_class)
 				// and something already exists in the incoming arguments for this param
-				&& isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
+				&& isset($argument_keys[$index], $arguments[$argument_keys[$index]])
 			) {
 				// so let's skip this argument and move on to the next
 				continue;
 			} else if (
 				// parameter is type hinted as a class, exists as an incoming argument, AND it's the correct class
-				! empty( $param_class )
-				&& isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
-				&& $arguments[ $argument_keys[ $index ] ] instanceof $param_class
+				! empty($param_class)
+				&& isset($argument_keys[$index], $arguments[$argument_keys[$index]])
+				&& $arguments[$argument_keys[$index]] instanceof $param_class
 			) {
 				// skip this argument and move on to the next
 				continue;
 			} else if (
 				// parameter is type hinted as a class, and should be injected
-				! empty( $param_class )
-				&& $this->_dependency_map->has_dependency_for_class( $class_name, $param_class )
+				! empty($param_class)
+				&& $this->_dependency_map->has_dependency_for_class($class_name, $param_class)
 			) {
-				$arguments = $this->_resolve_dependency( $class_name, $param_class, $arguments, $index );
+				$arguments = $this->_resolve_dependency($class_name, $param_class, $arguments, $index);
 			} else {
-				$arguments[ $index ] = $param->getDefaultValue();
+				$arguments[$index] = $param->getDefaultValue();
 			}
 
 		}
@@ -901,7 +901,7 @@ 
 	 * @param mixed $index
 	 * @return array
 	 */
-	protected function _resolve_dependency( $class_name, $param_class , $arguments, $index ) {
+	protected function _resolve_dependency($class_name, $param_class, $arguments, $index) {
 		$dependency = null;
 		// should dependency be loaded from cache ?
 		$cache_on = $this->_dependency_map->loading_strategy_for_class_dependency(
@@ -911,30 +911,30 @@ 
 			: false;
 		// we might have a dependency...
 		// let's MAYBE try and find it in our cache if that's what's been requested
-		$cached_class = $cache_on ? $this->_get_cached_class( $param_class ) : null;
+		$cached_class = $cache_on ? $this->_get_cached_class($param_class) : null;
 		// and grab it if it exists
-		if ( $cached_class instanceof $param_class ) {
+		if ($cached_class instanceof $param_class) {
 			$dependency = $cached_class;
-		} else if ( $param_class != $class_name ) {
+		} else if ($param_class != $class_name) {
 			// obtain the loader method from the dependency map
-			$loader = $this->_dependency_map->class_loader( $param_class );
+			$loader = $this->_dependency_map->class_loader($param_class);
 			// is loader a custom closure ?
-			if ( $loader instanceof Closure ) {
+			if ($loader instanceof Closure) {
 				$dependency = $loader();
 			} else {
 				// set the cache on property for the recursive loading call
 				$this->_cache_on = $cache_on;
 				// if not, then let's try and load it via the registry
-				$dependency = $this->{$loader}( $param_class );
+				$dependency = $this->{$loader}($param_class);
 			}
 		}
 		// did we successfully find the correct dependency ?
-		if ( $dependency instanceof $param_class ) {
+		if ($dependency instanceof $param_class) {
 			// then let's inject it into the incoming array of arguments at the correct location
-			if ( isset( $argument_keys[ $index ] ) ) {
-				$arguments[ $argument_keys[ $index ] ] = $dependency;
+			if (isset($argument_keys[$index])) {
+				$arguments[$argument_keys[$index]] = $dependency;
 			} else {
-				$arguments[ $index ] = $dependency;
+				$arguments[$index] = $dependency;
 			}
 		}
 		return $arguments;
@@ -959,16 +959,16 @@ 
 	 * @param bool $from_db
 	 * @return void
 	 */
-	protected function _set_cached_class( $class_obj, $class_name, $class_prefix = '', $from_db = false ) {
+	protected function _set_cached_class($class_obj, $class_name, $class_prefix = '', $from_db = false) {
 		// return newly instantiated class
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 			$this->{$class_abbreviation} = $class_obj;
-		} else if ( property_exists( $this, $class_name ) ) {
+		} else if (property_exists($this, $class_name)) {
 			$this->{$class_name} = $class_obj;
-		} else if ( $class_prefix == 'addon' ) {
+		} else if ($class_prefix == 'addon') {
 			$this->addons->{$class_name} = $class_obj;
-		} else if ( ! $from_db ) {
+		} else if ( ! $from_db) {
 			$this->LIB->{$class_name} = $class_obj;
 		}
 	}
@@ -985,12 +985,12 @@ 
 	 * @param array  $arguments
 	 * @return object
 	 */
-	public static function factory( $classname, $arguments = array() ) {
-		$loader = self::instance()->_dependency_map->class_loader( $classname );
-		if ( $loader instanceof Closure ) {
-			return $loader( $arguments );
-		} else if ( method_exists( EE_Registry::instance(), $loader ) ) {
-			return EE_Registry::instance()->{$loader}( $classname, $arguments );
+	public static function factory($classname, $arguments = array()) {
+		$loader = self::instance()->_dependency_map->class_loader($classname);
+		if ($loader instanceof Closure) {
+			return $loader($arguments);
+		} else if (method_exists(EE_Registry::instance(), $loader)) {
+			return EE_Registry::instance()->{$loader}($classname, $arguments);
 		}
 		return null;
 	}
@@ -1003,9 +1003,9 @@ 
 	 * @param string $name
 	 * @return EE_Addon
 	 */
-	public function get_addon_by_name( $name ) {
-		foreach ( $this->addons as $addon ) {
-			if ( $addon->name() == $name ) {
+	public function get_addon_by_name($name) {
+		foreach ($this->addons as $addon) {
+			if ($addon->name() == $name) {
 				return $addon;
 			}
 		}
@@ -1021,8 +1021,8 @@ 
 	 */
 	public function get_addons_by_name() {
 		$addons = array();
-		foreach ( $this->addons as $addon ) {
-			$addons[ $addon->name() ] = $addon;
+		foreach ($this->addons as $addon) {
+			$addons[$addon->name()] = $addon;
 		}
 		return $addons;
 	}
@@ -1037,14 +1037,14 @@ 
 	 * @return \EEM_Base
 	 * @throws \EE_Error
 	 */
-	public function reset_model( $model_name ) {
-		$model = $this->load_model( $model_name );
-		$model_class_name = get_class( $model );
+	public function reset_model($model_name) {
+		$model = $this->load_model($model_name);
+		$model_class_name = get_class($model);
 		//get that model reset it and make sure we nuke the old reference to it
-		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
+		if ($model instanceof $model_class_name && is_callable(array($model_class_name, 'reset'))) {
 			$this->LIB->{$model_class_name} = $model::reset();
 		} else {
-			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
+			throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name));
 		}
 		return $this->LIB->{$model_class_name};
 	}
@@ -1062,17 +1062,17 @@ 
 	 * currently reinstantiate the singletons at the moment)
 	 * @return EE_Registry
 	 */
-	public static function reset( $hard = false, $reinstantiate = true ) {
+	public static function reset($hard = false, $reinstantiate = true) {
 		self::$_instance = null;
-		$instance = self::instance( EE_Dependency_Map::instance() );
+		$instance = self::instance(EE_Dependency_Map::instance());
 		$instance->initialize();
 		EEH_Activation::reset();
 		$instance->_cache_on = true;
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate, $instance );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate, $instance);
 		$instance->LIB->EE_Data_Migration_Manager = EE_Data_Migration_Manager::reset();
 		$instance->LIB = new stdClass();
-		foreach ( array_keys( $instance->non_abstract_db_models ) as $model_name ) {
-			$instance->reset_model( $model_name );
+		foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+			$instance->reset_model($model_name);
 		}
 		return $instance;
 	}
@@ -1092,7 +1092,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __call( $a, $b ) {
+	final function __call($a, $b) {
 	}
 
 
@@ -1100,7 +1100,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __get( $a ) {
+	final function __get($a) {
 	}
 
 
@@ -1109,7 +1109,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __set( $a, $b ) {
+	final function __set($a, $b) {
 	}
 
 
@@ -1117,7 +1117,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __isset( $a ) {
+	final function __isset($a) {
 	}
 
 
@@ -1125,7 +1125,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __unset( $a ) {
+	final function __unset($a) {
 	}
 
 
@@ -1172,7 +1172,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final static function __callStatic( $a, $b ) {
+	final static function __callStatic($a, $b) {
 	}
 
 	/**
@@ -1181,9 +1181,9 @@ 
 	 */
 	public function cpt_models() {
 		$cpt_models = array();
-		foreach( $this->non_abstract_db_models as $short_name => $classname ) {
-			if( is_subclass_of(  $classname, 'EEM_CPT_Base' ) ) {
-				$cpt_models[ $short_name ] = $classname;
+		foreach ($this->non_abstract_db_models as $short_name => $classname) {
+			if (is_subclass_of($classname, 'EEM_CPT_Base')) {
+				$cpt_models[$short_name] = $classname;
 			}
 		}
 		return $cpt_models;

core/EE_Load_Espresso_Core.core.php

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -65,27 +65,27 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
-		do_action( 'AHEE__EE_Load_Espresso_Core__handle_request__start', $this );
+		do_action('AHEE__EE_Load_Espresso_Core__handle_request__start', $this);
 		// info about how to load classes required by other classes
 		$this->dependency_map = $this->_load_dependency_map();
 		// central repository for classes
 		$this->registry = $this->_load_registry();
-		do_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading', $this );
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading', $this);
 		// PSR4 Autoloaders
-		$this->registry->load_core( 'EE_Psr4AutoloaderInit' );
+		$this->registry->load_core('EE_Psr4AutoloaderInit');
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// WP cron jobs
-		$this->registry->load_core( 'Cron_Tasks' );
-		$this->registry->load_core( 'EE_Request_Handler' );
-		$this->registry->load_core( 'EE_System' );
+		$this->registry->load_core('Cron_Tasks');
+		$this->registry->load_core('EE_Request_Handler');
+		$this->registry->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -115,11 +115,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function dependency_map() {
-		if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
+		if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
-					print_r( $this->dependency_map, true )
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
 				)
 			);
 		}
@@ -133,11 +133,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function registry() {
-		if ( ! $this->registry instanceof EE_Registry ) {
+		if ( ! $this->registry instanceof EE_Registry) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Registry: "%1$s"', 'event_espresso' ),
-					print_r( $this->registry, true )
+					__('Invalid EE_Registry: "%1$s"', 'event_espresso'),
+					print_r($this->registry, true)
 				)
 			);
 		}
@@ -153,17 +153,17 @@ 
 	 * 	@return EE_Dependency_Map
 	 */
 	private function _load_dependency_map() {
-		if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
+		if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
+		require_once(EE_CORE.'EE_Dependency_Map.core.php');
 		return apply_filters(
 			'FHEE__EE_Load_Espresso_Core___load_dependency_map',
-			EE_Dependency_Map::instance( $this->request, $this->response )
+			EE_Dependency_Map::instance($this->request, $this->response)
 		);
 	}
 
@@ -176,17 +176,17 @@ 
 	 * 	@return EE_Registry
 	 */
 	private function _load_registry() {
-		if ( ! is_readable( EE_CORE . 'EE_Registry.core.php' )) {
+		if ( ! is_readable(EE_CORE.'EE_Registry.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Registry.core.php' );
+		require_once(EE_CORE.'EE_Registry.core.php');
 		return apply_filters(
 			'FHEE__EE_Load_Espresso_Core___load_registry',
-			EE_Registry::instance( $this->dependency_map )
+			EE_Registry::instance($this->dependency_map)
 		);
 	}
 
@@ -198,13 +198,13 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( ! is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
+		if ( ! is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
 			EE_Error::add_error(
-				__( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 	}
 
 
@@ -218,9 +218,9 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+	public function handle_response(EE_Request $request, EE_Response $response) {
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 

core/EE_Dependency_Map.core.php

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -70,11 +70,11 @@ 
 	 * @param  \EE_Request  $request
 	 * @param  \EE_Response $response
 	 */
-	protected function __construct( EE_Request $request, EE_Response $response ) {
+	protected function __construct(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
-		add_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading', array( $this, 'initialize' ) );
-		do_action( 'EE_Dependency_Map____construct' );
+		add_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading', array($this, 'initialize'));
+		do_action('EE_Dependency_Map____construct');
 	}
 
 
@@ -95,10 +95,10 @@ 
 	 * @param  \EE_Response $response
 	 * @return \EE_Dependency_Map instance
 	 */
-	public static function instance( EE_Request $request = null, EE_Response $response = null ) {
+	public static function instance(EE_Request $request = null, EE_Response $response = null) {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Dependency_Map ) {
-			self::$_instance = new EE_Dependency_Map( $request, $response );
+		if ( ! self::$_instance instanceof EE_Dependency_Map) {
+			self::$_instance = new EE_Dependency_Map($request, $response);
 		}
 		return self::$_instance;
 	}
@@ -110,9 +110,9 @@ 
 	 * @param array  $dependencies
 	 * @return boolean
 	 */
-	public static function register_dependencies( $class, $dependencies ) {
-		if ( ! isset( self::$_instance->_dependency_map[ $class ] ) ) {
-			self::$_instance->_dependency_map[ $class ] = (array)$dependencies;
+	public static function register_dependencies($class, $dependencies) {
+		if ( ! isset(self::$_instance->_dependency_map[$class])) {
+			self::$_instance->_dependency_map[$class] = (array) $dependencies;
 			return true;
 		}
 		return false;
@@ -126,18 +126,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function register_class_loader( $class_name, $loader = 'load_core' ) {
+	public static function register_class_loader($class_name, $loader = 'load_core') {
 		// check that loader method starts with "load_" and exists in EE_Registry
-		if ( strpos( $loader, 'load_' ) !== 0 || ! method_exists( 'EE_Registry', $loader ) ) {
+		if (strpos($loader, 'load_') !== 0 || ! method_exists('EE_Registry', $loader)) {
 			throw new EE_Error(
 				sprintf(
-					__( '"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso' ),
+					__('"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso'),
 					$loader
 				)
 			);
 		}
-		if ( ! isset( self::$_instance->_class_loaders[ $class_name ] ) ) {
-			self::$_instance->_class_loaders[ $class_name ] = $loader;
+		if ( ! isset(self::$_instance->_class_loaders[$class_name])) {
+			self::$_instance->_class_loaders[$class_name] = $loader;
 			return true;
 		}
 		return false;
@@ -160,8 +160,8 @@ 
 	 * @param string $class_name
 	 * @return boolean
 	 */
-	public function has( $class_name = '' ) {
-		return isset( $this->_dependency_map[ $class_name ] ) ? true : false;
+	public function has($class_name = '') {
+		return isset($this->_dependency_map[$class_name]) ? true : false;
 	}
 
 
@@ -173,8 +173,8 @@ 
 	 * @param string $dependency
 	 * @return bool
 	 */
-	public function has_dependency_for_class( $class_name = '', $dependency = '' ) {
-		return isset( $this->_dependency_map[ $class_name ], $this->_dependency_map[ $class_name ][ $dependency ] )
+	public function has_dependency_for_class($class_name = '', $dependency = '') {
+		return isset($this->_dependency_map[$class_name], $this->_dependency_map[$class_name][$dependency])
 			? true
 			: false;
 	}
@@ -188,9 +188,9 @@ 
 	 * @param string $dependency
 	 * @return int
 	 */
-	public function loading_strategy_for_class_dependency( $class_name = '', $dependency = '' ) {
-		return $this->has_dependency_for_class( $class_name, $dependency )
-			? $this->_dependency_map[ $class_name ][ $dependency ]
+	public function loading_strategy_for_class_dependency($class_name = '', $dependency = '') {
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[$class_name][$dependency]
 			: EE_Dependency_Map::not_registered;
 	}
 
@@ -200,8 +200,8 @@ 
 	 * @param string $class_name
 	 * @return string | Closure
 	 */
-	public function class_loader( $class_name ) {
-		return isset( $this->_class_loaders[ $class_name ] ) ? $this->_class_loaders[ $class_name ] : '';
+	public function class_loader($class_name) {
+		return isset($this->_class_loaders[$class_name]) ? $this->_class_loaders[$class_name] : '';
 	}
 
 
@@ -326,13 +326,13 @@ 
 		$this->_class_loaders = array_merge(
 			$this->_class_loaders,
 			array(
-				'EE_Request'  => function () use ( &$request ) {
+				'EE_Request'  => function() use (&$request) {
 					return $request;
 				},
-				'EE_Response' => function () use ( &$response ) {
+				'EE_Response' => function() use (&$response) {
 					return $response;
 				},
-				'EE_Dependency_Map' => function () use ( &$dep_map ) {
+				'EE_Dependency_Map' => function() use (&$dep_map) {
 					return $dep_map;
 				},
 				//load_core
@@ -356,17 +356,17 @@ 
 				'EE_Messages_Data_Handler_Collection'  => 'load_lib',
 				'EE_Message_Template_Group_Collection' => 'load_lib',
 				'EE_Messages_Generator' => function() {
-					return EE_Registry::instance()->load_lib( 'Messages_Generator', array(), false, false );
+					return EE_Registry::instance()->load_lib('Messages_Generator', array(), false, false);
 				},
-				'EE_Messages_Template_Defaults' => function( $arguments = array() ) {
-					return EE_Registry::instance()->load_lib( 'Messages_Template_Defaults', $arguments, false, false );
+				'EE_Messages_Template_Defaults' => function($arguments = array()) {
+					return EE_Registry::instance()->load_lib('Messages_Template_Defaults', $arguments, false, false);
 				},
 				//load_model
 				'EEM_Message_Template_Group'           => 'load_model',
 				'EEM_Message_Template'                 => 'load_model',
 				//load_helper
 				'EEH_Parse_Shortcodes'                 => function() {
-					if ( EE_Registry::instance()->load_helper( 'Parse_Shortcodes' ) ) {
+					if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
 						return new EEH_Parse_Shortcodes();
 					}
 					return null;

core/EE_Front_Controller.core.php

Spacing +116 added lines, -116 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * Event Espresso
  *
@@ -75,37 +75,37 @@ 
 		$this->Request_Handler = $Request_Handler;
 		$this->Module_Request_Router = $Module_Request_Router;
 		// make sure template tags are loaded immediately so that themes don't break
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'load_espresso_template_tags' ), 10 );
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
 		// determine how to integrate WP_Query with the EE models
-		add_action( 'AHEE__EE_System__initialize', array( $this, 'employ_CPT_Strategy' ));
+		add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
 		// load other resources and begin to actually run shortcodes and modules
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 5 );
+		add_action('wp_loaded', array($this, 'wp_loaded'), 5);
 		// analyse the incoming WP request
-		add_action( 'parse_request', array( $this, 'get_request' ), 1, 1 );
+		add_action('parse_request', array($this, 'get_request'), 1, 1);
 		// process any content shortcodes
-		add_action( 'parse_request', array( $this, '_initialize_shortcodes' ), 5 );
+		add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
 		// process request with module factory
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 );
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
 		// before headers sent
-		add_action( 'wp', array( $this, 'wp' ), 5 );
+		add_action('wp', array($this, 'wp'), 5);
 		// load css and js
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 1 );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
 		// header
-		add_action('wp_head', array( $this, 'header_meta_tag' ), 5 );
-		add_filter( 'template_include', array( $this, 'template_include' ), 1 );
+		add_action('wp_head', array($this, 'header_meta_tag'), 5);
+		add_filter('template_include', array($this, 'template_include'), 1);
 		// display errors
-		add_action('loop_start', array( $this, 'display_errors' ), 2 );
+		add_action('loop_start', array($this, 'display_errors'), 2);
 		// the content
 		// add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
 		//exclude our private cpt comments
-		add_filter( 'comments_clauses', array( $this, 'filter_wp_comments'), 10, 1 );
+		add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
 		//make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
-		add_filter( 'admin_url', array( $this, 'maybe_force_admin_ajax_ssl' ), 200, 1 );
+		add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
 		// action hook EE
-		do_action( 'AHEE__EE_Front_Controller__construct__done',$this );
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
 		// for checking that browser cookies are enabled
-		if ( apply_filters( 'FHEE__EE_Front_Controller____construct__set_test_cookie', true )) {
-			setcookie( 'ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/' );
+		if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
+			setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
 		}
 	}
 
@@ -141,8 +141,8 @@ 
 	 * 	@return void
 	 */
 	public function load_espresso_template_tags() {
-		if ( is_readable( EE_PUBLIC . 'template_tags.php' )) {
-			require_once( EE_PUBLIC . 'template_tags.php' );
+		if (is_readable(EE_PUBLIC.'template_tags.php')) {
+			require_once(EE_PUBLIC.'template_tags.php');
 		}
 	}
 
@@ -157,12 +157,12 @@ 
 	 * @param  array $clauses array of comment clauses setup by WP_Comment_Query
 	 * @return array array of comment clauses with modifications.
 	 */
-	public function filter_wp_comments( $clauses ) {
+	public function filter_wp_comments($clauses) {
 		global $wpdb;
-		if ( strpos( $clauses['join'], $wpdb->posts ) !== FALSE ) {
+		if (strpos($clauses['join'], $wpdb->posts) !== FALSE) {
 			$cpts = EE_Register_CPTs::get_private_CPTs();
-			foreach ( $cpts as $cpt => $details ) {
-				$clauses['where'] .= $wpdb->prepare( " AND $wpdb->posts.post_type != %s", $cpt );
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
 			}
 		}
 		return $clauses;
@@ -179,8 +179,8 @@ 
 	 *  @return 	void
 	 */
 	public function employ_CPT_Strategy() {
-		if ( apply_filters( 'FHEE__EE_Front_Controller__employ_CPT_Strategy',true) ){
-			$this->Registry->load_core( 'CPT_Strategy' );
+		if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
+			$this->Registry->load_core('CPT_Strategy');
 		}
 	}
 
@@ -192,9 +192,9 @@ 
 	 * @param  string $url    incoming url
 	 * @return string         final assembled url
 	 */
-	public function maybe_force_admin_ajax_ssl( $url ) {
-		if ( is_ssl() && preg_match( '/admin-ajax.php/', $url )) {
-			$url = str_replace( 'http://', 'https://', $url );
+	public function maybe_force_admin_ajax_ssl($url) {
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
 		}
 		return $url;
 	}
@@ -231,10 +231,10 @@ 
 	 * @param WP $WP
 	 * @return void
 	 */
-	public function get_request( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__get_request__start' );
-		$this->Request_Handler->parse_request( $WP );
-		do_action( 'AHEE__EE_Front_Controller__get_request__complete' );
+	public function get_request(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__get_request__start');
+		$this->Request_Handler->parse_request($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
 	}
 
 
@@ -248,24 +248,24 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function _initialize_shortcodes( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this );
-		$this->Request_Handler->set_request_vars( $WP );
+	public function _initialize_shortcodes(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
+		$this->Request_Handler->set_request_vars($WP);
 		// grab post_name from request
 		$current_post = apply_filters(
 			'FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name',
-			$this->Request_Handler->get( 'post_name' )
+			$this->Request_Handler->get('post_name')
 		);
-		$show_on_front = get_option( 'show_on_front' );
+		$show_on_front = get_option('show_on_front');
 		// if it's not set, then check if frontpage is blog
-		if ( empty( $current_post ) ) {
+		if (empty($current_post)) {
 			// yup.. this is the posts page, prepare to load all shortcode modules
 			$current_post = 'posts';
 			// unless..
-			if ( $show_on_front === 'page' ) {
+			if ($show_on_front === 'page') {
 				// some other page is set as the homepage
-				$page_on_front = get_option( 'page_on_front' );
-				if ( $page_on_front ) {
+				$page_on_front = get_option('page_on_front');
+				if ($page_on_front) {
 					// k now we need to find the post_name for this page
 					global $wpdb;
 					$page_on_front = $wpdb->get_var(
@@ -282,16 +282,16 @@ 
 		// where are posts being displayed ?
 		$page_for_posts = EE_Config::get_page_for_posts();
 		// in case $current_post is hierarchical like: /parent-page/current-page
-		$current_post = basename( $current_post );
+		$current_post = basename($current_post);
 		// are we on a category page?
-		$term_exists = is_array( term_exists( $current_post, 'category' ) ) || $this->_is_espresso_category( $WP );
+		$term_exists = is_array(term_exists($current_post, 'category')) || $this->_is_espresso_category($WP);
 		// make sure shortcodes are set
-		if ( isset( $this->Registry->CFG->core->post_shortcodes )) {
-			if ( ! isset( $this->Registry->CFG->core->post_shortcodes[ $page_for_posts ] ) ) {
-				$this->Registry->CFG->core->post_shortcodes[ $page_for_posts ] = array();
+		if (isset($this->Registry->CFG->core->post_shortcodes)) {
+			if ( ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])) {
+				$this->Registry->CFG->core->post_shortcodes[$page_for_posts] = array();
 			}
 			// cycle thru all posts with shortcodes set
-			foreach ( $this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			foreach ($this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
 				$this->_process_post_shortcodes(
 					$post_shortcodes,
 					$term_exists,
@@ -302,7 +302,7 @@ 
 				);
 			}
 		}
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__end', $this );
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
 	}
 
 
@@ -313,11 +313,11 @@ 
 	 * @param WP $WP
 	 * @return bool
 	 */
-	protected function _is_espresso_category( WP $WP ) {
+	protected function _is_espresso_category(WP $WP) {
 		$taxonomies = EE_Register_CPTs::get_taxonomies();
 		// $taxonomies = array_keys( $taxonomies );
-		foreach ( (array) $WP->query_vars as $query_var => $category ) {
-			if ( isset( $taxonomies[ $query_var ] ) ) {
+		foreach ((array) $WP->query_vars as $query_var => $category) {
+			if (isset($taxonomies[$query_var])) {
 				return true;
 			}
 		}
@@ -346,7 +346,7 @@ 
 		$page_for_posts,
 		$post_name,
 		$WP
-	){
+	) {
 		static $processed = array();
 		// filter shortcodes so
 		$post_shortcodes = (array) apply_filters(
@@ -354,10 +354,10 @@ 
 			$post_shortcodes
 		);
 		// now cycle thru shortcodes...
-		foreach ( $post_shortcodes as $shortcode_name => $post_id ) {
+		foreach ($post_shortcodes as $shortcode_name => $post_id) {
 			if (
 				// but IF... we have processed this shortcode already in this request
-				isset( $processed[ $shortcode_name ] )
+				isset($processed[$shortcode_name])
 				|| (
 					// or we're on a tag or category page
 					$term_exists
@@ -377,7 +377,7 @@ 
 				continue;
 			}
 			// are we on this page ? or on the blog page ? or an EE CPT category page ?
-			if ( $current_post === $post_name || $term_exists ) {
+			if ($current_post === $post_name || $term_exists) {
 				// maybe init the shortcode
 				if (
 					$this->initialize_shortcode_if_active_on_page(
@@ -389,18 +389,18 @@ 
 						$WP
 					)
 				) {
-					$processed[ $shortcode_name ] = true;
+					$processed[$shortcode_name] = true;
 				}
 				// if this is NOT the "Posts page" and we have a valid entry
 				// for the "Posts page" in our tracked post_shortcodes array
 				// but the shortcode is not being tracked for this page
 			} else if (
 				$post_name !== $page_for_posts
-				&& isset( $this->Registry->CFG->core->post_shortcodes[ $page_for_posts ] )
-				&& ! isset( $this->Registry->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode_name ] )
+				&& isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])
+				&& ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts][$shortcode_name])
 			) {
 				// then remove the "fallback" shortcode processor
-				remove_shortcode( $shortcode_name );
+				remove_shortcode($shortcode_name);
 			}
 		}
 	}
@@ -429,8 +429,8 @@ 
 		$WP
 	) {
 		// verify shortcode is in list of registered shortcodes
-		if ( ! isset( $this->Registry->shortcodes->{$shortcode_name} ) ) {
-			if ( $current_post !== $page_for_posts && current_user_can( 'edit_post', $post_id ) ) {
+		if ( ! isset($this->Registry->shortcodes->{$shortcode_name} )) {
+			if ($current_post !== $page_for_posts && current_user_can('edit_post', $post_id)) {
 				EE_Error::add_error(
 					sprintf(
 						__(
@@ -443,9 +443,9 @@ 
 					__FUNCTION__,
 					__LINE__
 				);
-				add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+				add_filter('FHEE_run_EE_the_content', '__return_true');
 			}
-			add_shortcode( $shortcode_name, array( 'EES_Shortcode', 'invalid_shortcode_processor' ) );
+			add_shortcode($shortcode_name, array('EES_Shortcode', 'invalid_shortcode_processor'));
 			return false;
 		}
 		// is this shortcode set:
@@ -455,13 +455,13 @@ 
 			// for the WP "Posts" page (blog) ?
 			|| $current_post === $page_for_posts
 			// exclusively for this post ?
-			|| isset( $this->Registry->CFG->core->post_shortcodes[ $current_post ] )
+			|| isset($this->Registry->CFG->core->post_shortcodes[$current_post])
 		) {
 			// let's pause to reflect on this...
-			$sc_reflector = new ReflectionClass( 'EES_' . $shortcode_name );
+			$sc_reflector = new ReflectionClass('EES_'.$shortcode_name);
 			// ensure that class is actually a shortcode
-			if ( ! $sc_reflector->isSubclassOf( 'EES_Shortcode' ) ) {
-				if ( defined( 'WP_DEBUG' ) && WP_DEBUG === true  ) {
+			if ( ! $sc_reflector->isSubclassOf('EES_Shortcode')) {
+				if (defined('WP_DEBUG') && WP_DEBUG === true) {
 					EE_Error::add_error(
 						sprintf(
 							__(
@@ -474,7 +474,7 @@ 
 						__FUNCTION__,
 						__LINE__
 					);
-					add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+					add_filter('FHEE_run_EE_the_content', '__return_true');
 				}
 				return false;
 			}
@@ -489,7 +489,7 @@ 
 				)
 			) {
 				// fire the shortcode class's run method, so that it can activate resources
-				$this->Registry->shortcodes->{$shortcode_name}->run( $WP );
+				$this->Registry->shortcodes->{$shortcode_name}->run($WP);
 			}
 			return true;
 		}
@@ -505,19 +505,19 @@ 
 	 * @param   WP_Query    $WP_Query
 	 * @return    void
 	 */
-	public function pre_get_posts( $WP_Query ) {
+	public function pre_get_posts($WP_Query) {
 		// only load Module_Request_Router if this is the main query
 		if (
 			$this->Module_Request_Router instanceof EE_Module_Request_Router
 			&& $WP_Query->is_main_query()
 		) {
 				// cycle thru module routes
-				while ( $route = $this->Module_Request_Router->get_route( $WP_Query )) {
+				while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
 					// determine module and method for route
-					$module = $this->Module_Request_Router->resolve_route( $route[0], $route[1] );
-					if( $module instanceof EED_Module ) {
+					$module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
+					if ($module instanceof EED_Module) {
 						// get registered view for route
-						$this->_template_path = $this->Module_Request_Router->get_view( $route );
+						$this->_template_path = $this->Module_Request_Router->get_view($route);
 						// grab module name
 						$module_name = $module->module_name();
 						// map the module to the module objects
@@ -559,29 +559,29 @@ 
 	public function wp_enqueue_scripts() {
 
 		// css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
-		if ( apply_filters( 'FHEE_load_css', TRUE ) ) {
+		if (apply_filters('FHEE_load_css', TRUE)) {
 
 			$this->Registry->CFG->template_settings->enable_default_style = TRUE;
 			//Load the ThemeRoller styles if enabled
-			if ( isset( $this->Registry->CFG->template_settings->enable_default_style ) && $this->Registry->CFG->template_settings->enable_default_style ) {
+			if (isset($this->Registry->CFG->template_settings->enable_default_style) && $this->Registry->CFG->template_settings->enable_default_style) {
 
 				//Load custom style sheet if available
-				if ( isset( $this->Registry->CFG->template_settings->custom_style_sheet )) {
-					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION );
+				if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
+					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL.'css/'.$this->Registry->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION);
 					wp_enqueue_style('espresso_custom_css');
 				}
 
-				if ( is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )) {
-					wp_register_style( 'espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+				if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) {
+					wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				} else {
-					wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+					wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				}
 				wp_enqueue_style('espresso_default');
 
-				if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css' )) {
-					wp_register_style( 'espresso_style', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+				if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) {
+					wp_register_style('espresso_style', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				} else {
-					wp_register_style( 'espresso_style', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+					wp_register_style('espresso_style', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				}
 
 			}
@@ -589,38 +589,38 @@ 
 		}
 
 		// js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
-		if ( apply_filters( 'FHEE_load_js', TRUE ) ) {
+		if (apply_filters('FHEE_load_js', TRUE)) {
 
-			wp_enqueue_script( 'jquery' );
+			wp_enqueue_script('jquery');
 			//let's make sure that all required scripts have been setup
-			if ( function_exists( 'wp_script_is' ) && ! wp_script_is( 'jquery' )) {
+			if (function_exists('wp_script_is') && ! wp_script_is('jquery')) {
 				$msg = sprintf(
-					__( '%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso' ),
+					__('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso'),
 					'<em><br />',
 					'</em>'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 			// load core js
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'espresso_core' );
-			wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('espresso_core');
+			wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 		}
 
 		//qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 
 
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			$acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			$acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js';
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 
 			$currency_config = array(
 				'currency' => array(
@@ -643,21 +643,21 @@ 
 			wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
 		}
 
-		if ( ! function_exists( 'wp_head' )) {
+		if ( ! function_exists('wp_head')) {
 			$msg = sprintf(
-				__( '%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( ! function_exists( 'wp_footer' )) {
+		if ( ! function_exists('wp_footer')) {
 			$msg = sprintf(
-				__( '%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 	}
@@ -671,7 +671,7 @@ 
 	 *  @return 	void
 	 */
 	public function header_meta_tag() {
-		print( apply_filters("FHEE__EE_Front_Controller__header_meta_tag","<meta name='generator' content='Event Espresso Version " . EVENT_ESPRESSO_VERSION . "' />"));
+		print(apply_filters("FHEE__EE_Front_Controller__header_meta_tag", "<meta name='generator' content='Event Espresso Version ".EVENT_ESPRESSO_VERSION."' />"));
 	}
 
 
@@ -712,10 +712,10 @@ 
 	 */
 	public function display_errors() {
 		static $shown_already = FALSE;
-		do_action( 'AHEE__EE_Front_Controller__display_errors__begin' );
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
 		if (
 			! $shown_already
-			&& apply_filters( 'FHEE__EE_Front_Controller__display_errors', TRUE )
+			&& apply_filters('FHEE__EE_Front_Controller__display_errors', TRUE)
 			&& is_main_query()
 			&& ! is_feed()
 			&& in_the_loop()
@@ -723,9 +723,9 @@ 
 		) {
 			echo EE_Error::get_notices();
 			$shown_already = TRUE;
-			EEH_Template::display_template( EE_TEMPLATES . 'espresso-ajax-notices.template.php' );
+			EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php');
 		}
-		do_action( 'AHEE__EE_Front_Controller__display_errors__end' );
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
 	}
 
 
@@ -740,12 +740,12 @@ 
 	 * @param   string $template_include_path
 	 * @return    string
 	 */
-	public function template_include( $template_include_path = NULL ) {
-		if ( $this->Request_Handler->is_espresso_page() ) {
-			$this->_template_path = ! empty( $this->_template_path ) ? basename( $this->_template_path ) : basename( $template_include_path );
-			$template_path = EEH_Template::locate_template( $this->_template_path, array(), false );
-			$this->_template_path = ! empty( $template_path ) ? $template_path : $template_include_path;
-			$this->_template = basename( $this->_template_path );
+	public function template_include($template_include_path = NULL) {
+		if ($this->Request_Handler->is_espresso_page()) {
+			$this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
+			$template_path = EEH_Template::locate_template($this->_template_path, array(), false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template = basename($this->_template_path);
 			return $this->_template_path;
 		}
 		return $template_include_path;
@@ -760,7 +760,7 @@ 
 	 * @param bool $with_path
 	 * @return    string
 	 */
-	public function get_selected_template( $with_path = FALSE ) {
+	public function get_selected_template($with_path = FALSE) {
 		return $with_path ? $this->_template_path : $this->_template;
 	}