eventespresso / event-espresso-core

core/services/progress_steps/ProgressStepManager.php

Spacing +41 added lines, -41 removed lines

@@ -10,8 +10,8 @@ 
 use EventEspresso\core\services\collections\CollectionInterface;
 use EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -78,15 +78,15 @@ 
 		CollectionInterface $collection = null,
 		EE_Request $request = null
 	) {
-		$this->setDisplayStrategy( $display_strategy_name );
-		$this->setDefaultStep( $default_step );
-		$this->setFormStepUrlKey( $form_step_url_key );
-		if ( ! $collection instanceof CollectionInterface ) {
-			$collection = new Collection( '\EventEspresso\core\services\progress_steps\ProgressStepInterface' );
+		$this->setDisplayStrategy($display_strategy_name);
+		$this->setDefaultStep($default_step);
+		$this->setFormStepUrlKey($form_step_url_key);
+		if ( ! $collection instanceof CollectionInterface) {
+			$collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
 		}
 		$this->collection = $collection;
-		if ( ! $request instanceof EE_Request ) {
-			$request = \EE_Registry::instance()->load_core( 'Request' );
+		if ( ! $request instanceof EE_Request) {
+			$request = \EE_Registry::instance()->load_core('Request');
 		}
 		$this->request = $request;
 	}
@@ -98,28 +98,28 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidClassException
 	 */
-	protected function setDisplayStrategy( $display_strategy_name = 'number_bubbles' ) {
-		if ( ! is_string( $display_strategy_name ) ) {
-			throw new InvalidDataTypeException( '$display_strategy_name', $display_strategy_name, 'string' );
+	protected function setDisplayStrategy($display_strategy_name = 'number_bubbles') {
+		if ( ! is_string($display_strategy_name)) {
+			throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
 		}
 		// build up FQCN from incoming display strategy folder name
 		$display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
-		$display_strategy_class .= $display_strategy_name . '\\';
-		$display_strategy_class .= str_replace( ' ', '', ucwords( str_replace( '_', ' ', $display_strategy_name ) ) );
+		$display_strategy_class .= $display_strategy_name.'\\';
+		$display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
 		$display_strategy_class .= 'ProgressStepsDisplay';
 		$display_strategy_class = apply_filters(
 			'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
 			$display_strategy_class
 		);
-		if ( ! class_exists( $display_strategy_class ) ) {
-			throw new InvalidClassException( $display_strategy_class );
+		if ( ! class_exists($display_strategy_class)) {
+			throw new InvalidClassException($display_strategy_class);
 		}
 		$display_strategy = new $display_strategy_class();
-		if ( ! $display_strategy instanceof ProgressStepsDisplayInterface ) {
+		if ( ! $display_strategy instanceof ProgressStepsDisplayInterface) {
 			throw new InvalidClassException(
 				$display_strategy_class,
 				sprintf(
-					__( 'The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso' ),
+					__('The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso'),
 					$display_strategy_class,
 					'\EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface'
 				)
@@ -134,9 +134,9 @@ 
 	 * @param string $default_step
 	 * @throws InvalidDataTypeException
 	 */
-	public function setDefaultStep( $default_step ) {
-		if ( ! is_string( $default_step ) ) {
-			throw new InvalidDataTypeException( '$default_step', $default_step, 'string' );
+	public function setDefaultStep($default_step) {
+		if ( ! is_string($default_step)) {
+			throw new InvalidDataTypeException('$default_step', $default_step, 'string');
 		}
 		$this->default_step = $default_step;
 	}
@@ -147,11 +147,11 @@ 
 	 * @param string $form_step_url_key
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormStepUrlKey( $form_step_url_key = 'ee-form-step' ) {
-		if ( ! is_string( $form_step_url_key ) ) {
-			throw new InvalidDataTypeException( '$form_step_key', $form_step_url_key, 'string' );
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step') {
+		if ( ! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
 		}
-		$this->form_step_url_key = ! empty( $form_step_url_key ) ? $form_step_url_key : 'ee-form-step';
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
 	}
 
 
@@ -160,26 +160,26 @@ 
 	 * @param string $step
 	 * @throws InvalidIdentifierException
 	 */
-	public function setCurrentStep( $step = '' ) {
+	public function setCurrentStep($step = '') {
 		// use incoming value if it's set, otherwise use request param if it's set, otherwise use default
-		$step = ! empty( $step )
+		$step = ! empty($step)
 			? $step
-			: $this->request->get( $this->form_step_url_key, $this->default_step );
+			: $this->request->get($this->form_step_url_key, $this->default_step);
 		// grab the step previously known as current, in case we need to revert
 		$current_current_step = $this->collection->current();
 		// verify that requested step exists
-		if ( ! $this->collection->has( $step ) ) {
-			throw new InvalidIdentifierException( $step, $this->default_step );
+		if ( ! $this->collection->has($step)) {
+			throw new InvalidIdentifierException($step, $this->default_step);
 		}
-		if ( $this->collection->setCurrent( $step ) ) {
+		if ($this->collection->setCurrent($step)) {
 			// if the old boss is the same as the new boss, then nothing changes
-			if ( $this->collection->current() !== $current_current_step ) {
-				$current_current_step->setIsCurrent( false );
+			if ($this->collection->current() !== $current_current_step) {
+				$current_current_step->setIsCurrent(false);
 			}
 			$this->collection->current()->setIsCurrent();
 		} else {
-			$this->collection->setCurrent( $current_current_step->id() );
-			$current_current_step->setIsCurrent( true );
+			$this->collection->setCurrent($current_current_step->id());
+			$current_current_step->setIsCurrent(true);
 		}
 	}
 
@@ -191,14 +191,14 @@ 
 	public function setPreviousStepsCompleted() {
 		$current_current_step = $this->collection->current();
 		$this->collection->rewind();
-		while ( $this->collection->valid() ) {
-			if ( $this->collection->current() === $current_current_step ) {
+		while ($this->collection->valid()) {
+			if ($this->collection->current() === $current_current_step) {
 				break;
 			}
 			$this->setCurrentStepCompleted();
 			$this->collection->next();
 		}
-		$this->collection->setCurrentUsingObject( $current_current_step );
+		$this->collection->setCurrentUsingObject($current_current_step);
 		return false;
 	}
 
@@ -239,7 +239,7 @@ 
 	public function displaySteps() {
 		return \EEH_Template::display_template(
 			$this->display_strategy->getTemplate(),
-			array( 'progress_steps' => $this->collection ),
+			array('progress_steps' => $this->collection),
 			true
 		);
 	}
@@ -250,8 +250,8 @@ 
 	 * @param bool $completed
 	 * @return \EventEspresso\core\services\progress_steps\ProgressStepInterface
 	 */
-	public function setCurrentStepCompleted( $completed = true ) {
-		return $this->collection->current()->setIsCompleted( $completed );
+	public function setCurrentStepCompleted($completed = true) {
+		return $this->collection->current()->setIsCompleted($completed);
 	}
 
 

Unused Use Statements +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 namespace EventEspresso\core\services\progress_steps;
 
 use EE_Request;
-use  EventEspresso\core\exceptions\InvalidClassException;
-use  EventEspresso\core\exceptions\InvalidDataTypeException;
-use  EventEspresso\core\exceptions\InvalidIdentifierException;
-use  EventEspresso\core\exceptions\InvalidInterfaceException;
+use EventEspresso\core\exceptions\InvalidClassException;
+use EventEspresso\core\exceptions\InvalidDataTypeException;
+use EventEspresso\core\exceptions\InvalidIdentifierException;
+use EventEspresso\core\exceptions\InvalidInterfaceException;
 use EventEspresso\core\services\collections\Collection;
 use EventEspresso\core\services\collections\CollectionInterface;
 use EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface;

core/services/progress_steps/display_strategies/number_bubbles/NumberBubblesProgressStepsDisplay.php

Spacing +4 added lines, -4 removed lines

@@ -3,8 +3,8 @@ 
 
 use EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -29,7 +29,7 @@ 
 		// core/services/progress_steps/display_strategies/number_bubbles/number_bubbles.css
 		wp_enqueue_style(
 			'ee_progress_steps_display_number_bubbles',
-			plugin_dir_url( __FILE__ ) . 'number_bubbles.css'
+			plugin_dir_url(__FILE__).'number_bubbles.css'
 		);
 	}
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function getTemplate() {
 		// return plugin_dir_path( __FILE__ ) . 'number_bubbles.template.php';
-		return __DIR__ . DS .'number_bubbles.template.php';
+		return __DIR__.DS.'number_bubbles.template.php';
 	}
 
 }

core/services/commands/CommandInterface.php

Spacing +2 added lines, -2 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');
 }
 /**
  * Class EE_Line_Item_Filter_Collection

core/services/commands/InvalidCommandHandlerException.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -25,14 +25,14 @@ 
 	 * @param  int        $code
 	 * @param  \Exception $previous
 	 */
-	public function __construct( $command_name, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($command_name, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
-				__( 'The supplied Command Handler "%1$s" does not have a valid name. It should be in the following format: "{CommandName}Handler" ', 'event_espresso' ),
+				__('The supplied Command Handler "%1$s" does not have a valid name. It should be in the following format: "{CommandName}Handler" ', 'event_espresso'),
 				$command_name
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }

core/services/commands/CommandHandlerInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -19,7 +19,7 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function handle( CommandInterface $command );
+	public function handle(CommandInterface $command);
 
 }
 // End of file CommandHandlerInterface.php

core/services/commands/CommandHandlerManagerInterface.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -19,14 +19,14 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandHandlerInterface $command_handler
 	 * @return mixed
 	 */
-	public function addCommandHandler( CommandHandlerInterface $command_handler );
+	public function addCommandHandler(CommandHandlerInterface $command_handler);
 
 
 	/**
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function getCommandHandler( CommandInterface $command );
+	public function getCommandHandler(CommandInterface $command);
 
 }
 // End of file CommandHandlerManagerInterface.php

core/EE_Dependency_Map.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 * just checks the field isn't blank
 	 *
 	 * @param $normalized_value
-	 * @return bool
+	 * @return boolean|null
 	 * @throws \EE_Validation_Error
 	 */
 	function validate($normalized_value) {

Spacing +44 added lines, -44 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');
 }
 
 
@@ -75,11 +75,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');
 	}
 
 
@@ -101,10 +101,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;
 	}
@@ -116,16 +116,16 @@ 
 	 * @param array  $dependencies
 	 * @return boolean
 	 */
-	public static function register_dependencies( $class, $dependencies ) {
-		if ( ! isset( self::$_instance->_dependency_map[ $class ] ) ) {
+	public static function register_dependencies($class, $dependencies) {
+		if ( ! isset(self::$_instance->_dependency_map[$class])) {
 			// we need to make sure that any aliases used when registering a dependency
 			// get resolved to the correct class name
-			foreach ( (array) $dependencies as $dependency => $load_source ) {
-				$alias = self::$_instance->get_alias( $dependency );
-				unset( $dependencies[ $dependency ] );
-				$dependencies[ $alias ] = $load_source;
+			foreach ((array) $dependencies as $dependency => $load_source) {
+				$alias = self::$_instance->get_alias($dependency);
+				unset($dependencies[$dependency]);
+				$dependencies[$alias] = $load_source;
 			}
-			self::$_instance->_dependency_map[ $class ] = (array) $dependencies;
+			self::$_instance->_dependency_map[$class] = (array) $dependencies;
 			return true;
 		}
 		return false;
@@ -139,19 +139,19 @@ 
 	 * @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
 				)
 			);
 		}
-		$class_name = self::$_instance->get_alias( $class_name );
-		if ( ! isset( self::$_instance->_class_loaders[ $class_name ] ) ) {
-			self::$_instance->_class_loaders[ $class_name ] = $loader;
+		$class_name = self::$_instance->get_alias($class_name);
+		if ( ! isset(self::$_instance->_class_loaders[$class_name])) {
+			self::$_instance->_class_loaders[$class_name] = $loader;
 			return true;
 		}
 		return false;
@@ -174,8 +174,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;
 	}
 
 
@@ -187,9 +187,9 @@ 
 	 * @param string $dependency
 	 * @return bool
 	 */
-	public function has_dependency_for_class( $class_name = '', $dependency = '' ) {
-		$dependency = $this->get_alias( $dependency );
-		return isset( $this->_dependency_map[ $class_name ], $this->_dependency_map[ $class_name ][ $dependency ] )
+	public function has_dependency_for_class($class_name = '', $dependency = '') {
+		$dependency = $this->get_alias($dependency);
+		return isset($this->_dependency_map[$class_name], $this->_dependency_map[$class_name][$dependency])
 			? true
 			: false;
 	}
@@ -203,10 +203,10 @@ 
 	 * @param string $dependency
 	 * @return int
 	 */
-	public function loading_strategy_for_class_dependency( $class_name = '', $dependency = '' ) {
-		$dependency = $this->get_alias( $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 = '') {
+		$dependency = $this->get_alias($dependency);
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[$class_name][$dependency]
 			: EE_Dependency_Map::not_registered;
 	}
 
@@ -216,9 +216,9 @@ 
 	 * @param string $class_name
 	 * @return string | Closure
 	 */
-	public function class_loader( $class_name ) {
-		$class_name = $this->get_alias( $class_name );
-		return isset( $this->_class_loaders[ $class_name ] ) ? $this->_class_loaders[ $class_name ] : '';
+	public function class_loader($class_name) {
+		$class_name = $this->get_alias($class_name);
+		return isset($this->_class_loaders[$class_name]) ? $this->_class_loaders[$class_name] : '';
 	}
 
 
@@ -239,8 +239,8 @@ 
 	 * @param string $alias
 	 * @return bool
 	 */
-	public function add_alias( $class_name, $alias ) {
-		$this->_aliases[ $class_name ] = $alias;
+	public function add_alias($class_name, $alias) {
+		$this->_aliases[$class_name] = $alias;
 	}
 
 
@@ -251,8 +251,8 @@ 
 	 * @param string $class_name
 	 * @return boolean
 	 */
-	public function has_alias( $class_name = '' ) {
-		return isset( $this->_aliases[ $class_name ] ) ? true : false;
+	public function has_alias($class_name = '') {
+		return isset($this->_aliases[$class_name]) ? true : false;
 	}
 
 
@@ -272,9 +272,9 @@ 
 	 * @param string $class_name
 	 * @return boolean
 	 */
-	public function get_alias( $class_name = '' ) {
-		return $this->has_alias( $class_name )
-			? $this->get_alias( $this->_aliases[ $class_name ] )
+	public function get_alias($class_name = '') {
+		return $this->has_alias($class_name)
+			? $this->get_alias($this->_aliases[$class_name])
 			: $class_name;
 	}
 
@@ -461,17 +461,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_Registry.core.php

Indentation +1 added lines, -1 removed lines

@@ -968,7 +968,7 @@
 		$dependency = null;
 		// should dependency be loaded from cache ?
 		$cache_on = $this->_dependency_map->loading_strategy_for_class_dependency( $class_name, $param_class )
-		            !== EE_Dependency_Map::load_new_object
+					!== EE_Dependency_Map::load_new_object
 			? true
 			: false;
 		// we might have a dependency...

Spacing +209 added lines, -209 removed lines

@@ -184,10 +184,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 = new EE_Registry( $dependency_map );
+		if ( ! self::$_instance instanceof EE_Registry) {
+			self::$_instance = new EE_Registry($dependency_map);
 		}
 		return self::$_instance;
 	}
@@ -202,9 +202,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'));
 	}
 
 
@@ -232,19 +232,19 @@ 
 		$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
-		$request_loader = $this->_dependency_map->class_loader( 'EE_Request' );
+		$request_loader = $this->_dependency_map->class_loader('EE_Request');
 		$this->_set_cached_class(
 			$request_loader(),
 			'EE_Request'
 		);
-		$response_loader = $this->_dependency_map->class_loader( 'EE_Response' );
+		$response_loader = $this->_dependency_map->class_loader('EE_Response');
 		$this->_set_cached_class(
 			$response_loader(),
 			'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'));
 	}
 
 
@@ -257,10 +257,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;
 	}
 
 
@@ -271,14 +271,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).'; /* ]]> */';
 	}
 
 
@@ -286,15 +286,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);
 		}
 	}
 
@@ -304,8 +304,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;
 	}
 
 
@@ -319,20 +319,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);
 	}
 
 
@@ -346,15 +346,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);
 	}
 
 
@@ -367,9 +367,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);
 	}
 
 
@@ -384,14 +384,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);
 	}
 
 
@@ -404,11 +404,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);
 	}
 
 
@@ -423,16 +423,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);
 	}
 
 
@@ -445,13 +445,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);
 	}
 
 
@@ -464,15 +464,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);
 	}
 
 
@@ -482,8 +482,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;
 	}
 
 
@@ -498,9 +498,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);
 	}
 
 
@@ -515,9 +515,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);
 	}
 
 
@@ -548,35 +548,35 @@ 
 		$load_only = false,
 		$addon = false
 	) {
-		$class_name = $this->_dependency_map->get_alias( $class_name );
-		if ( ! class_exists( $class_name ) ) {
+		$class_name = $this->_dependency_map->get_alias($class_name);
+		if ( ! class_exists($class_name)) {
 			// maybe the class is registered with a preceding \
-			$class_name = strpos( $class_name, '\\' ) !== 0 ? '\\' . $class_name : $class_name;
+			$class_name = strpos($class_name, '\\') !== 0 ? '\\'.$class_name : $class_name;
 			// still doesn't exist ?
-			if ( ! class_exists( $class_name ) ) {
+			if ( ! class_exists($class_name)) {
 				return null;
 			}
 		}
 		// if we're only loading the class and it already exists, then let's just return true immediately
-		if ( $load_only ) {
+		if ($load_only) {
 			return true;
 		}
 		$addon = $addon ? 'addon' : '';
 		// $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, $addon );
-			if ( $cached_class !== null ) {
+			$cached_class = $this->_get_cached_class($class_name, $addon);
+			if ($cached_class !== null) {
 				return $cached_class;
 			}
 		}
 		// instantiate the requested object
-		$class_obj = $this->_create_object( $class_name, $arguments, $addon, $from_db );
-		if ( $this->_cache_on && $cache ) {
+		$class_obj = $this->_create_object($class_name, $arguments, $addon, $from_db);
+		if ($this->_cache_on && $cache) {
 			// save it for later... kinda like gum  { : $
-			$this->_set_cached_class( $class_obj, $class_name, $addon, $from_db );
+			$this->_set_cached_class($class_obj, $class_name, $addon, $from_db);
 		}
 		$this->_cache_on = true;
 		return $class_obj;
@@ -611,47 +611,47 @@ 
 		$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_name = $this->_dependency_map->get_alias( $class_name );
-		$class_exists = class_exists( $class_name );
+		$class_name = $this->_dependency_map->get_alias($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;
@@ -674,21 +674,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;
@@ -709,20 +709,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;
@@ -744,29 +744,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
@@ -774,7 +774,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 			return false;
 		}
@@ -806,61 +806,61 @@ 
 	 * @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;
 		$instantiation_mode = '0) none';
 		// 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 if possible
-			if ( $reflector->isAbstract() ) {
+			if ($reflector->isAbstract()) {
 				// nothing to instantiate, loading file was enough
 				// does not throw an exception so $instantiation_mode is unused
 				// $instantiation_mode = "1) no constructor abstract class";
 				$class_obj = true;
-			} else if ( $reflector->getConstructor() === null && $reflector->isInstantiable() && empty( $arguments ) ) {
+			} else if ($reflector->getConstructor() === null && $reflector->isInstantiable() && empty($arguments)) {
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				$instantiation_mode = "2) no constructor but instantiable";
 				$class_obj = $reflector->newInstance();
-			} 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 = "3) 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 = "4) 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 = "5) 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 = "6) constructor";
-				$class_obj = $reflector->newInstanceArgs( $arguments );
+				$class_obj = $reflector->newInstanceArgs($arguments);
 			} else {
 				// heh ? something's not right !
 				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 ) {
+		} catch (Exception $e) {
+			if ( ! $e instanceof EE_Error) {
 				$e = new EE_Error(
 					sprintf(
-						__( 'The following error occurred while attempting to instantiate "%1$s": %2$s %3$s %2$s instantiation mode : %4$s', 'event_espresso' ),
+						__('The following error occurred while attempting to instantiate "%1$s": %2$s %3$s %2$s instantiation mode : %4$s', 'event_espresso'),
 						$class_name,
 						'<br />',
 						$e->getMessage(),
@@ -880,8 +880,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;
 	}
 
 
@@ -896,14 +896,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];
 	}
 
 
@@ -928,50 +928,50 @@ 
 	 * @return array
 	 * @throws \ReflectionException
 	 */
-	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;
 			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 {
 				try {
-					$arguments[ $index ] = $param->getDefaultValue();
-				} catch ( ReflectionException $e ) {
+					$arguments[$index] = $param->getDefaultValue();
+				} catch (ReflectionException $e) {
 					throw new ReflectionException(
 						sprintf(
-							__( '%1$s for parameter "$%2$s"', 'event_espresso' ),
+							__('%1$s for parameter "$%2$s"', 'event_espresso'),
 							$e->getMessage(),
 							$param->getName()
 						)
@@ -993,30 +993,30 @@ 
 	 * @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( $class_name, $param_class )
+		$cache_on = $this->_dependency_map->loading_strategy_for_class_dependency($class_name, $param_class)
 		            !== EE_Dependency_Map::load_new_object
 			? true
 			: 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
-				if ( method_exists( $this, $loader ) ) {
+				if (method_exists($this, $loader)) {
 					$dependency = $this->{$loader}($param_class);
 				} else {
 					$dependency = $this->create($param_class, array(), $cache_on);
@@ -1024,12 +1024,12 @@ 
 			}
 		}
 		// 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;
@@ -1054,19 +1054,19 @@ 
 	 * @param bool $from_db
 	 * @return void
 	 */
-	protected function _set_cached_class( $class_obj, $class_name, $class_prefix = '', $from_db = false ) {
-		if ( empty( $class_obj ) ) {
+	protected function _set_cached_class($class_obj, $class_name, $class_prefix = '', $from_db = false) {
+		if (empty($class_obj)) {
 			return;
 		}
 		// 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;
 		}
 	}
@@ -1083,12 +1083,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;
 	}
@@ -1101,9 +1101,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;
 			}
 		}
@@ -1119,8 +1119,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;
 	}
@@ -1135,14 +1135,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};
 	}
@@ -1179,13 +1179,13 @@ 
 	 *
 	 * @return EE_Registry
 	 */
-	public static function reset( $hard = false, $reinstantiate = true, $reset_models = true ) {
+	public static function reset($hard = false, $reinstantiate = true, $reset_models = true) {
 		$instance = self::instance();
 		EEH_Activation::reset();
 
 		//properties that get reset
 		$instance->_cache_on = true;
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate);
 		$instance->CART = null;
 		$instance->MRM = null;
 		$instance->LIB = new stdClass();
@@ -1193,9 +1193,9 @@ 
 		//messages reset
 		EED_Messages::reset();
 
-		if ( $reset_models ) {
-			foreach ( array_keys( $instance->non_abstract_db_models ) as $model_name ) {
-				$instance->reset_model( $model_name );
+		if ($reset_models) {
+			foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+				$instance->reset_model($model_name);
 			}
 		}
 
@@ -1217,7 +1217,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __call( $a, $b ) {
+	final function __call($a, $b) {
 	}
 
 
@@ -1225,7 +1225,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __get( $a ) {
+	final function __get($a) {
 	}
 
 
@@ -1234,7 +1234,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __set( $a, $b ) {
+	final function __set($a, $b) {
 	}
 
 
@@ -1242,7 +1242,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __isset( $a ) {
+	final function __isset($a) {
 	}
 
 
@@ -1250,7 +1250,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __unset( $a ) {
+	final function __unset($a) {
 	}
 
 
@@ -1297,7 +1297,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final static function __callStatic( $a, $b ) {
+	final static function __callStatic($a, $b) {
 	}
 
 	/**
@@ -1306,9 +1306,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/services/commands/CommandHandlerNotFoundException.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -25,14 +25,14 @@ 
 	 * @param  int        $code
 	 * @param  \Exception $previous
 	 */
-	public function __construct( $command_handler_name, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($command_handler_name, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
-				__( 'The requested Command Handler "%1$s" could not be located or does not exist.', 'event_espresso' ),
+				__('The requested Command Handler "%1$s" could not be located or does not exist.', 'event_espresso'),
 				$command_handler_name
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }