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/collections/Collection.php

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

@@ -1,8 +1,8 @@
 <?php
 namespace EventEspresso\core\services\collections;
 
-use  EventEspresso\core\exceptions\InvalidEntityException;
-use  EventEspresso\core\exceptions\InvalidInterfaceException;
+use EventEspresso\core\exceptions\InvalidEntityException;
+use EventEspresso\core\exceptions\InvalidInterfaceException;
 use LimitIterator;
 
 if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {

Spacing +63 added lines, -63 removed lines

@@ -5,8 +5,8 @@ 
 use  EventEspresso\core\exceptions\InvalidInterfaceException;
 use LimitIterator;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class Collection
@@ -36,8 +36,8 @@ 
 	  * @param string $collection_interface
 	  * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
 	  */
-	 public function __construct( $collection_interface ) {
-		 $this->setCollectionInterface( $collection_interface );
+	 public function __construct($collection_interface) {
+		 $this->setCollectionInterface($collection_interface);
 	 }
 
 
@@ -49,9 +49,9 @@ 
 	  * @param  string $collection_interface
 	  * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
 	  */
-	 protected function setCollectionInterface( $collection_interface ) {
-		 if ( ! ( interface_exists( $collection_interface ) || class_exists( $collection_interface ) ) ) {
-			 throw new InvalidInterfaceException( $collection_interface );
+	 protected function setCollectionInterface($collection_interface) {
+		 if ( ! (interface_exists($collection_interface) || class_exists($collection_interface))) {
+			 throw new InvalidInterfaceException($collection_interface);
 		 }
 		 $this->collection_interface = $collection_interface;
 	 }
@@ -70,13 +70,13 @@ 
 	  * @return bool
 	  * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	  */
-	 public function add( $object, $identifier = null ) {
-		 if ( ! $object instanceof $this->collection_interface ) {
-			 throw new InvalidEntityException( $object, $this->collection_interface );
+	 public function add($object, $identifier = null) {
+		 if ( ! $object instanceof $this->collection_interface) {
+			 throw new InvalidEntityException($object, $this->collection_interface);
 		 }
-		 $this->attach( $object );
-		 $this->setIdentifier( $object, $identifier );
-		 return $this->contains( $object );
+		 $this->attach($object);
+		 $this->setIdentifier($object, $identifier);
+		 return $this->contains($object);
 	 }
 
 
@@ -92,12 +92,12 @@ 
 	  * @param  mixed $identifier
 	  * @return bool
 	  */
-	 public function setIdentifier( $object, $identifier = null ) {
-		 $identifier = ! empty( $identifier ) ? $identifier : spl_object_hash( $object );
+	 public function setIdentifier($object, $identifier = null) {
+		 $identifier = ! empty($identifier) ? $identifier : spl_object_hash($object);
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $object === $this->current() ) {
-				 $this->setInfo( $identifier );
+		 while ($this->valid()) {
+			 if ($object === $this->current()) {
+				 $this->setInfo($identifier);
 				 $this->rewind();
 				 return true;
 			 }
@@ -117,10 +117,10 @@ 
 	  * @param mixed $identifier
 	  * @return mixed
 	  */
-	 public function get( $identifier ) {
+	 public function get($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 $object = $this->current();
 				 $this->rewind();
 				 return $object;
@@ -142,10 +142,10 @@ 
 	  * @param  mixed $identifier
 	  * @return bool
 	  */
-	 public function has( $identifier ) {
+	 public function has($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 $this->rewind();
 				 return true;
 			 }
@@ -164,8 +164,8 @@ 
 	  * @param $object
 	  * @return bool
 	  */
-	 public function hasObject( $object ) {
-		 return $this->contains( $object );
+	 public function hasObject($object) {
+		 return $this->contains($object);
 	 }
 
 
@@ -178,8 +178,8 @@ 
 	  * @param $object
 	  * @return bool
 	  */
-	 public function remove( $object ) {
-		 $this->detach( $object );
+	 public function remove($object) {
+		 $this->detach($object);
 		 return true;
 	 }
 
@@ -193,10 +193,10 @@ 
 	  * @param mixed $identifier
 	  * @return boolean
 	  */
-	 public function setCurrent( $identifier ) {
+	 public function setCurrent($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 return true;
 			 }
 			 $this->next();
@@ -214,10 +214,10 @@ 
 	  * @param $object
 	  * @return boolean
 	  */
-	 public function setCurrentUsingObject( $object ) {
+	 public function setCurrentUsingObject($object) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $this->current() === $object ) {
+		 while ($this->valid()) {
+			 if ($this->current() === $object) {
 				 return true;
 			 }
 			 $this->next();
@@ -234,12 +234,12 @@ 
 	  * @return mixed
 	  */
 	 public function previous() {
-		 $index = $this->indexOf( $this->current() );
-		 if ( $index === 0 ) {
+		 $index = $this->indexOf($this->current());
+		 if ($index === 0) {
 			 return $this->current();
 		 }
 		 $index--;
-		 return $this->objectAtIndex( $index );
+		 return $this->objectAtIndex($index);
 	 }
 
 
@@ -251,12 +251,12 @@ 
 	  * @param $object
 	  * @return boolean|int|string
 	  */
-	 public function indexOf( $object ) {
-		 if ( ! $this->contains( $object ) ) {
+	 public function indexOf($object) {
+		 if ( ! $this->contains($object)) {
 			 return false;
 		 }
-		 foreach ( $this as $index => $obj ) {
-			 if ( $obj === $object ) {
+		 foreach ($this as $index => $obj) {
+			 if ($obj === $object) {
 				 return $index;
 			 }
 		 }
@@ -272,8 +272,8 @@ 
 	  * @param int $index
 	  * @return mixed
 	  */
-	 public function objectAtIndex( $index ) {
-		 $iterator = new LimitIterator( $this, $index, 1 );
+	 public function objectAtIndex($index) {
+		 $iterator = new LimitIterator($this, $index, 1);
 		 $iterator->rewind();
 		 return $iterator->current();
 	 }
@@ -288,10 +288,10 @@ 
 	  * @param int $length
 	  * @return array
 	  */
-	 public function slice( $offset, $length ) {
+	 public function slice($offset, $length) {
 		 $slice = array();
-		 $iterator = new LimitIterator( $this, $offset, $length );
-		 foreach ( $iterator as $object ) {
+		 $iterator = new LimitIterator($this, $offset, $length);
+		 foreach ($iterator as $object) {
 			 $slice[] = $object;
 		 }
 		 return $slice;
@@ -306,35 +306,35 @@ 
 	  * @param mixed $objects A single object or an array of objects
 	  * @param int $index
 	  */
-	 public function insertAt( $objects, $index ) {
-		 if ( ! is_array( $objects ) ) {
-			 $objects = array( $objects );
+	 public function insertAt($objects, $index) {
+		 if ( ! is_array($objects)) {
+			 $objects = array($objects);
 		 }
 		 // check to ensure that objects don't already exist in the collection
-		 foreach ( $objects as $key => $object ) {
-			 if ( $this->contains( $object ) ) {
-				 unset( $objects[ $key ] );
+		 foreach ($objects as $key => $object) {
+			 if ($this->contains($object)) {
+				 unset($objects[$key]);
 			 }
 		 }
 		 // do we have any objects left?
-		 if ( ! $objects ) {
+		 if ( ! $objects) {
 			 return;
 		 }
 		 // detach any objects at or past this index
 		 $remaining = array();
-		 if ( $index < $this->count() ) {
-			 $remaining = $this->slice( $index, $this->count() - $index );
-			 foreach ( $remaining as $object ) {
-				 $this->detach( $object );
+		 if ($index < $this->count()) {
+			 $remaining = $this->slice($index, $this->count() - $index);
+			 foreach ($remaining as $object) {
+				 $this->detach($object);
 			 }
 		 }
 		 // add the new objects we're splicing in
-		 foreach ( $objects as $object ) {
-			 $this->attach( $object );
+		 foreach ($objects as $object) {
+			 $this->attach($object);
 		 }
 		 // attach the objects we previously detached
-		 foreach ( $remaining as $object ) {
-			 $this->attach( $object );
+		 foreach ($remaining as $object) {
+			 $this->attach($object);
 		 }
 	 }
 
@@ -346,8 +346,8 @@ 
 	  * @see http://stackoverflow.com/a/8736013
 	  * @param int $index
 	  */
-	 public function removeAt( $index ) {
-		 $this->detach( $this->objectAtIndex( $index ) );
+	 public function removeAt($index) {
+		 $this->detach($this->objectAtIndex($index));
 	 }
 
 

Indentation +12 added lines, -13 removed lines

@@ -83,7 +83,6 @@ 
 
 	 /**
 	  * setIdentifier
-
 	  * Sets the data associated with an object in the Collection
 	  * if no $identifier is supplied, then the spl_object_hash() is used
 	  *
@@ -352,18 +351,18 @@ 
 
 
 
-     /**
-      * detaches ALL objects from the Collection
-      */
-     public function detachAll()
-     {
-         $this->rewind();
-         while ($this->valid()) {
-             $object = $this->current();
-             $this->next();
-             $this->detach($object);
-         }
-     }
+	 /**
+	  * detaches ALL objects from the Collection
+	  */
+	 public function detachAll()
+	 {
+		 $this->rewind();
+		 while ($this->valid()) {
+			 $object = $this->current();
+			 $this->next();
+			 $this->detach($object);
+		 }
+	 }
 
 
 

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 	  * by calling EE_Object_Collection::set_identifier()
 	  *
 	  * @access public
-	  * @param        $object
+	  * @param        \EventEspresso\core\services\progress_steps\ProgressStep $object
 	  * @param  mixed $identifier
 	  * @return bool
 	  * @throws \EventEspresso\core\exceptions\InvalidEntityException
@@ -211,7 +211,7 @@ 
 	  * advances pointer to the provided object
 	  *
 	  * @access public
-	  * @param $object
+	  * @param \EventEspresso\core\libraries\form_sections\form_handlers\SequentialStepForm $object
 	  * @return boolean
 	  */
 	 public function setCurrentUsingObject( $object ) {
@@ -249,7 +249,7 @@ 
 	  *
 	  * @see http://stackoverflow.com/a/8736013
 	  * @param $object
-	  * @return boolean|int|string
+	  * @return integer
 	  */
 	 public function indexOf( $object ) {
 		 if ( ! $this->contains( $object ) ) {

core/services/collections/CollectionLoader.php

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

@@ -1,10 +1,10 @@
 <?php
 namespace EventEspresso\core\services\collections;
 
-use  EventEspresso\core\exceptions\InvalidClassException;
-use  EventEspresso\core\exceptions\InvalidDataTypeException;
-use  EventEspresso\core\exceptions\InvalidEntityException;
-use  EventEspresso\core\exceptions\InvalidFilePathException;
+use EventEspresso\core\exceptions\InvalidClassException;
+use EventEspresso\core\exceptions\InvalidDataTypeException;
+use EventEspresso\core\exceptions\InvalidEntityException;
+use EventEspresso\core\exceptions\InvalidFilePathException;
 use EventEspresso\core\services\locators\LocatorInterface;
 use EventEspresso\core\services\locators\FileLocator;
 

Spacing +35 added lines, -35 removed lines

@@ -8,8 +8,8 @@ 
 use EventEspresso\core\services\locators\LocatorInterface;
 use EventEspresso\core\services\locators\FileLocator;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -81,8 +81,8 @@ 
 		LocatorInterface $file_locator = null
 	) {
 		$this->collection_details = $collection_details;
-		if ( ! $collection instanceof CollectionInterface ) {
-			$collection = new Collection( $this->collection_details->getCollectionInterface() );
+		if ( ! $collection instanceof CollectionInterface) {
+			$collection = new Collection($this->collection_details->getCollectionInterface());
 		}
 		$this->collection = $collection;
 		$this->file_locator = $file_locator;
@@ -110,12 +110,12 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
 	protected function loadAllFromFilepaths() {
-		if ( ! $this->file_locator instanceof FileLocator ) {
+		if ( ! $this->file_locator instanceof FileLocator) {
 			$this->file_locator = new FileLocator();
 		}
-		$this->file_locator->setFileMask( $this->collection_details->getFileMask() );
+		$this->file_locator->setFileMask($this->collection_details->getFileMask());
 		// find all of the files that match the file mask in the specified folder
-		$this->file_locator->locate( $this->collection_details->getCollectionPaths() );
+		$this->file_locator->locate($this->collection_details->getCollectionPaths());
 		// filter the results
 		$filepaths = (array) apply_filters(
 			'FHEE__CollectionLoader__loadAllFromFilepath__filepaths',
@@ -123,11 +123,11 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( $filepaths as $filepath ) {
-			$this->loadClassFromFilepath( $filepath );
+		foreach ($filepaths as $filepath) {
+			$this->loadClassFromFilepath($filepath);
 		}
 	}
 
@@ -144,22 +144,22 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidFilePathException
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 */
-	protected function loadClassFromFilepath( $filepath ) {
-		if ( ! is_string( $filepath ) ) {
-			throw new InvalidDataTypeException( '$filepath', $filepath, 'string' );
+	protected function loadClassFromFilepath($filepath) {
+		if ( ! is_string($filepath)) {
+			throw new InvalidDataTypeException('$filepath', $filepath, 'string');
 		}
-		if ( ! is_readable( $filepath ) ) {
-			throw new InvalidFilePathException( $filepath );
+		if ( ! is_readable($filepath)) {
+			throw new InvalidFilePathException($filepath);
 		}
-		require_once( $filepath );
+		require_once($filepath);
 		// extract filename from path
-		$file_name = basename( $filepath );
+		$file_name = basename($filepath);
 		// now remove any file extensions
-		$class_name = \EEH_File::get_classname_from_filepath_with_standard_filename( $file_name );
-		if ( ! class_exists( $class_name ) ) {
-			throw new InvalidClassException( $class_name );
+		$class_name = \EEH_File::get_classname_from_filepath_with_standard_filename($file_name);
+		if ( ! class_exists($class_name)) {
+			throw new InvalidClassException($class_name);
 		}
-		return $this->addEntityToCollection( new $class_name(), $file_name );
+		return $this->addEntityToCollection(new $class_name(), $file_name);
 	}
 
 
@@ -173,15 +173,15 @@ 
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
-	protected function addEntityToCollection( $entity, $identifier ) {
+	protected function addEntityToCollection($entity, $identifier) {
 		do_action(
 			'FHEE__CollectionLoader__addEntityToCollection__entity',
 			$entity,
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		$identifier = $this->setIdentifier( $entity, $identifier );
-		if ( $this->collection->has( $identifier ) ) {
+		$identifier = $this->setIdentifier($entity, $identifier);
+		if ($this->collection->has($identifier)) {
 			do_action(
 				'FHEE__CollectionLoader__addEntityToCollection__entity_already_added',
 				$this,
@@ -190,7 +190,7 @@ 
 			);
 			return CollectionLoader::ENTITY_EXISTS;
 		}
-		if( $this->collection->add( $entity, $identifier ) ) {
+		if ($this->collection->add($entity, $identifier)) {
 			do_action(
 				'FHEE__CollectionLoader__addEntityToCollection__entity_added',
 				$this,
@@ -220,8 +220,8 @@ 
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
-	protected function setIdentifier( $entity, $identifier ) {
-	    switch($this->collection_details->identifierType()) {
+	protected function setIdentifier($entity, $identifier) {
+	    switch ($this->collection_details->identifierType()) {
 	        // every unique object gets added to the collection, but not duplicates of the exact same object
             case CollectionDetails::ID_OBJECT_HASH :
                 $identifier = spl_object_hash($entity);
@@ -278,8 +278,8 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		foreach ( $FQCNs as $FQCN ) {
-			$this->loadClassFromFQCN( $FQCN );
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
 		}
 	}
 
@@ -295,15 +295,15 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 */
-	protected function loadClassFromFQCN( $FQCN ) {
-		if ( ! is_string( $FQCN ) ) {
-			throw new InvalidDataTypeException( '$FQCN', $FQCN, 'string' );
+	protected function loadClassFromFQCN($FQCN) {
+		if ( ! is_string($FQCN)) {
+			throw new InvalidDataTypeException('$FQCN', $FQCN, 'string');
 		}
-		if ( ! class_exists( $FQCN ) ) {
-			throw new InvalidClassException( $FQCN );
+		if ( ! class_exists($FQCN)) {
+			throw new InvalidClassException($FQCN);
 		}
 		return $this->addEntityToCollection(
-			\EE_Registry::instance()->create( $FQCN ),
+			\EE_Registry::instance()->create($FQCN),
 			$FQCN
 		);
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	 *
 	 * @access protected
 	 * @param        $entity
-	 * @param  mixed $identifier
+	 * @param  string $identifier
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */

Indentation +37 added lines, -37 removed lines

@@ -199,13 +199,13 @@ 
 			);
 			return CollectionLoader::ENTITY_ADDED;
 		}
-        do_action(
-            'FHEE__CollectionLoader__addEntityToCollection__entity_not_added',
-            $this,
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-        return CollectionLoader::ENTITY_NOT_ADDED;
+		do_action(
+			'FHEE__CollectionLoader__addEntityToCollection__entity_not_added',
+			$this,
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+		return CollectionLoader::ENTITY_NOT_ADDED;
 	}
 
 
@@ -220,37 +220,37 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
 	protected function setIdentifier( $entity, $identifier ) {
-	    switch($this->collection_details->identifierType()) {
-	        // every unique object gets added to the collection, but not duplicates of the exact same object
-            case CollectionDetails::ID_OBJECT_HASH :
-                $identifier = spl_object_hash($entity);
-                break;
-            // only one entity per class can be added to collection, like a singleton
-            case CollectionDetails::ID_CLASS_NAME :
-                $identifier = get_class($entity);
-                break;
-            // objects added to the collection based on entity callback, so the entity itself decides
-            case CollectionDetails::ID_CALLBACK_METHOD :
-                $identifier_callback = $this->collection_details->identifierCallback();
-                if ( ! method_exists($entity, $identifier_callback)) {
-                    throw new InvalidEntityException(
-                        $entity,
-                        $this->collection_details->getCollectionInterface(),
-                        sprintf(
-                            __(
-                                'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
+		switch($this->collection_details->identifierType()) {
+			// every unique object gets added to the collection, but not duplicates of the exact same object
+			case CollectionDetails::ID_OBJECT_HASH :
+				$identifier = spl_object_hash($entity);
+				break;
+			// only one entity per class can be added to collection, like a singleton
+			case CollectionDetails::ID_CLASS_NAME :
+				$identifier = get_class($entity);
+				break;
+			// objects added to the collection based on entity callback, so the entity itself decides
+			case CollectionDetails::ID_CALLBACK_METHOD :
+				$identifier_callback = $this->collection_details->identifierCallback();
+				if ( ! method_exists($entity, $identifier_callback)) {
+					throw new InvalidEntityException(
+						$entity,
+						$this->collection_details->getCollectionInterface(),
+						sprintf(
+							__(
+								'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
                                 of "%2$s", but does not contain this method.',
-                                'event_espresso'
-                            ),
-                            $identifier_callback,
-                            get_class($entity)
-                        )
-                    );
-                }
-                $identifier = $entity->{$identifier_callback}();
-                break;
-
-        }
+								'event_espresso'
+							),
+							$identifier_callback,
+							get_class($entity)
+						)
+					);
+				}
+				$identifier = $entity->{$identifier_callback}();
+				break;
+
+		}
 		return apply_filters(
 			'FHEE__CollectionLoader__addEntityToCollection__identifier',
 			$identifier,

core/services/locators/FileLocator.php

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

@@ -1,7 +1,7 @@
 <?php
 namespace EventEspresso\core\services\locators;
 
-use  EventEspresso\core\exceptions\InvalidDataTypeException;
+use EventEspresso\core\exceptions\InvalidDataTypeException;
 use FilesystemIterator;
 use GlobIterator;
 

Spacing +17 added lines, -17 removed lines

@@ -5,8 +5,8 @@ 
 use FilesystemIterator;
 use GlobIterator;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -38,9 +38,9 @@ 
 	 * @param string $file_mask
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
-	public function setFileMask( $file_mask ) {
-		if ( ! is_string( $file_mask ) ) {
-			throw new InvalidDataTypeException( '$file_mask', $file_mask, 'string' );
+	public function setFileMask($file_mask) {
+		if ( ! is_string($file_mask)) {
+			throw new InvalidDataTypeException('$file_mask', $file_mask, 'string');
 		}
 		$this->file_mask = $file_mask;
 	}
@@ -63,7 +63,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->filepaths );
+		return count($this->filepaths);
 	}
 
 
@@ -77,13 +77,13 @@ 
 	 * @return \FilesystemIterator
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
-	public function locate( $directory_paths ) {
-		if ( ! ( is_string( $directory_paths ) || is_array( $directory_paths ) ) ) {
-			throw new InvalidDataTypeException( '$directory_paths', $directory_paths, 'string or array' );
+	public function locate($directory_paths) {
+		if ( ! (is_string($directory_paths) || is_array($directory_paths))) {
+			throw new InvalidDataTypeException('$directory_paths', $directory_paths, 'string or array');
 		}
-		foreach ( (array) $directory_paths as $directory_path ) {
-			foreach ( $this->findFilesByPath( $directory_path ) as $key => $file ) {
-				$this->filepaths[ $key ] = \EEH_File::standardise_directory_separators( $file );
+		foreach ((array) $directory_paths as $directory_path) {
+			foreach ($this->findFilesByPath($directory_path) as $key => $file) {
+				$this->filepaths[$key] = \EEH_File::standardise_directory_separators($file);
 			}
 		}
 		return $this->filepaths;
@@ -98,12 +98,12 @@ 
 	 * @param string $directory_path
 	 * @return \FilesystemIterator
 	 */
-	protected function findFilesByPath( $directory_path = '' ) {
-		$iterator = new GlobIterator (
-			\EEH_File::end_with_directory_separator( $directory_path ) . $this->file_mask
+	protected function findFilesByPath($directory_path = '') {
+		$iterator = new GlobIterator(
+			\EEH_File::end_with_directory_separator($directory_path).$this->file_mask
 		);
-		foreach ( $this->flags as $flag ) {
-			$iterator->setFlags( $flag );
+		foreach ($this->flags as $flag) {
+			$iterator->setFlags($flag);
 		}
 		return $iterator;
 	}

core/services/locators/FqcnLocator.php

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

@@ -1,8 +1,8 @@
 <?php
 namespace EventEspresso\core\services\locators;
 
-use  EventEspresso\core\exceptions\InvalidClassException;
-use  EventEspresso\core\exceptions\InvalidDataTypeException;
+use EventEspresso\core\exceptions\InvalidClassException;
+use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\Core\Psr4Autoloader;
 use FilesystemIterator;
 

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 * given a valid namespace, will find all files that match the provided mask
 	 *
 	 * @access public
-	 * @param string|array $namespaces
+	 * @param string $namespaces
 	 * @return FilesystemIterator
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException

Spacing +37 added lines, -37 removed lines

@@ -6,8 +6,8 @@ 
 use EventEspresso\Core\Psr4Autoloader;
 use FilesystemIterator;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -40,14 +40,14 @@ 
 	 * @param string $namespace_base_dir
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
-	protected function setNamespace( $namespace, $namespace_base_dir ) {
-		if ( ! is_string( $namespace ) ) {
-			throw new InvalidDataTypeException( '$namespace', $namespace, 'string' );
+	protected function setNamespace($namespace, $namespace_base_dir) {
+		if ( ! is_string($namespace)) {
+			throw new InvalidDataTypeException('$namespace', $namespace, 'string');
 		}
-		if ( ! is_string( $namespace_base_dir ) ) {
-			throw new InvalidDataTypeException( '$namespace_base_dir', $namespace_base_dir, 'string' );
+		if ( ! is_string($namespace_base_dir)) {
+			throw new InvalidDataTypeException('$namespace_base_dir', $namespace_base_dir, 'string');
 		}
-		$this->namespaces[ $namespace ] = $namespace_base_dir;
+		$this->namespaces[$namespace] = $namespace_base_dir;
 	}
 
 
@@ -67,7 +67,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->FQCNs );
+		return count($this->FQCNs);
 	}
 
 
@@ -82,13 +82,13 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
-	public function locate( $namespaces ) {
-		if ( ! ( is_string( $namespaces ) || is_array( $namespaces ) ) ) {
-			throw new InvalidDataTypeException( '$namespaces', $namespaces, 'string or array' );
+	public function locate($namespaces) {
+		if ( ! (is_string($namespaces) || is_array($namespaces))) {
+			throw new InvalidDataTypeException('$namespaces', $namespaces, 'string or array');
 		}
-		foreach ( (array) $namespaces as $namespace ) {
-			foreach ( $this->FindFQCNsByNamespace( $namespace ) as $key => $file ) {
-				$this->FQCNs[ $key ] = $file;
+		foreach ((array) $namespaces as $namespace) {
+			foreach ($this->FindFQCNsByNamespace($namespace) as $key => $file) {
+				$this->FQCNs[$key] = $file;
 			}
 		}
 		return $this->FQCNs;
@@ -107,24 +107,24 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
-	protected function FindFQCNsByNamespace( $partial_namespace ) {
+	protected function FindFQCNsByNamespace($partial_namespace) {
 		$iterator = new FilesystemIterator(
-			$this->getDirectoryFromPartialNamespace( $partial_namespace )
+			$this->getDirectoryFromPartialNamespace($partial_namespace)
 		);
-		foreach ( $this->flags as $flag ) {
-			$iterator->setFlags( $flag );
+		foreach ($this->flags as $flag) {
+			$iterator->setFlags($flag);
 		}
-		if ( iterator_count( $iterator ) === 0 ) {
+		if (iterator_count($iterator) === 0) {
 			return array();
 		}
-		foreach ( $iterator as $file ) {
-			$file = \EEH_File::standardise_directory_separators( $file );
-			foreach ( $this->namespaces as $namespace => $base_dir ) {
+		foreach ($iterator as $file) {
+			$file = \EEH_File::standardise_directory_separators($file);
+			foreach ($this->namespaces as $namespace => $base_dir) {
 				$namespace .= Psr4Autoloader::NS;
-				if ( strpos( $file, $base_dir ) === 0 ) {
-					$this->FQCNs[] = Psr4Autoloader::NS . str_replace(
-							array( $base_dir, DS, '.php' ),
-							array( $namespace, Psr4Autoloader::NS, '' ),
+				if (strpos($file, $base_dir) === 0) {
+					$this->FQCNs[] = Psr4Autoloader::NS.str_replace(
+							array($base_dir, DS, '.php'),
+							array($namespace, Psr4Autoloader::NS, ''),
 							$file
 						);
 				}
@@ -144,25 +144,25 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 */
-	protected function getDirectoryFromPartialNamespace( $partial_namespace ) {
-		if ( empty( $partial_namespace ) ) {
-			throw new InvalidClassException( $partial_namespace );
+	protected function getDirectoryFromPartialNamespace($partial_namespace) {
+		if (empty($partial_namespace)) {
+			throw new InvalidClassException($partial_namespace);
 		}
 		// load our PSR-4 Autoloader so we can get the list of registered namespaces from it
 		$psr4_loader = \EE_Psr4AutoloaderInit::psr4_loader();
 		// breakup the incoming namespace into segments then loop thru them
-		$namespace_segments = explode( Psr4Autoloader::NS, trim( $partial_namespace, Psr4Autoloader::NS ) );
+		$namespace_segments = explode(Psr4Autoloader::NS, trim($partial_namespace, Psr4Autoloader::NS));
 		// we're only interested in the first element, so pull that from the array
-		$namespace = array_shift( $namespace_segments );
+		$namespace = array_shift($namespace_segments);
 		// check if there's a base directory registered for that namespace
-		$prefix = $psr4_loader->prefixes( $namespace . Psr4Autoloader::NS );
+		$prefix = $psr4_loader->prefixes($namespace.Psr4Autoloader::NS);
 		// nope? then the incoming namespace is invalid
-		if ( empty( $prefix ) || empty( $prefix[0] ) ) {
-			throw new InvalidClassException( $partial_namespace );
+		if (empty($prefix) || empty($prefix[0])) {
+			throw new InvalidClassException($partial_namespace);
 		}
-		$this->setNamespace( $namespace, $prefix[0] );
+		$this->setNamespace($namespace, $prefix[0]);
 		// but if it's good, add that base directory to the rest of the path, and return it
-		return $prefix[0] . implode( DS, $namespace_segments ) . DS;
+		return $prefix[0].implode(DS, $namespace_segments).DS;
 	}
 
 

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/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);
 	}
 
 }