eventespresso / event-espresso-core

core/services/locators/FqcnLocator.php

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/locators/Locator.php

Spacing +8 added lines, -8 removed lines

@@ -5,8 +5,8 @@ 
 use EventEspresso\Core\Exceptions\InvalidDataTypeException;
 use FilesystemIterator;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,15 +35,15 @@ 
 	 * @param array $flags controls how files are found and/or file data is returned
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	public function __construct( $flags = array() ) {
-		if ( empty( $flags ) ) {
+	public function __construct($flags = array()) {
+		if (empty($flags)) {
 			$flags = array(
 				FilesystemIterator::SKIP_DOTS,
 				FilesystemIterator::UNIX_PATHS,
 				FilesystemIterator::CURRENT_AS_PATHNAME
 			);
 		}
-		$this->setFlags( $flags );
+		$this->setFlags($flags);
 	}
 
 
@@ -54,9 +54,9 @@ 
 	 * @param array $flags
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	public function setFlags( $flags ) {
-		if ( ! is_array( $flags ) ) {
-			throw new InvalidDataTypeException( '$flags', $flags, 'array' );
+	public function setFlags($flags) {
+		if ( ! is_array($flags)) {
+			throw new InvalidDataTypeException('$flags', $flags, 'array');
 		}
 		$this->flags = $flags;
 	}

core/services/locators/FileLocator.php

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/LocatorInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\locators;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,7 +22,7 @@ 
 	 * @param array|string $location
 	 * @return \FilesystemIterator
 	 */
-	public function locate( $location );
+	public function locate($location);
 
 }
 // End of file LocatorInterface.php

core/services/collections/CollectionLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	 *
 	 * @access protected
 	 * @param  $entity
-	 * @param  mixed $identifier
+	 * @param  string $identifier
 	 * @return string
 	 */
 	protected function addEntityToCollection( $entity, $identifier ) {

Spacing +34 added lines, -34 removed lines

@@ -7,8 +7,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');
 }
 
 
@@ -79,8 +79,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;
@@ -107,12 +107,12 @@ 
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
 	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",
@@ -120,11 +120,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);
 		}
 	}
 
@@ -140,22 +140,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);
 	}
 
 
@@ -168,15 +168,15 @@ 
 	 * @param  mixed $identifier
 	 * @return string
 	 */
-	protected function addEntityToCollection( $entity, $identifier ) {
+	protected function addEntityToCollection($entity, $identifier) {
 		do_action(
 			"FHEE__CollectionLoader__addEntityToCollection__entity",
 			$entity,
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		if ( $this->collection_details->identifierType() === CollectionDetails::ID_OBJECT_HASH ) {
-			$identifier = spl_object_hash( $entity );
+		if ($this->collection_details->identifierType() === CollectionDetails::ID_OBJECT_HASH) {
+			$identifier = spl_object_hash($entity);
 		}
 		$identifier = apply_filters(
 			"FHEE__CollectionLoader__addEntityToCollection__identifier",
@@ -184,7 +184,7 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		if ( $this->collection->has( $identifier ) ) {
+		if ($this->collection->has($identifier)) {
 			do_action(
 				"FHEE__CollectionLoader__addEntityToCollection__entity_already_added",
 				$this,
@@ -193,7 +193,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,
@@ -229,8 +229,8 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		foreach ( $FQCNs as $FQCN ) {
-			$this->loadClassFromFQCN( $FQCN );
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
 		}
 	}
 
@@ -245,14 +245,14 @@ 
 	 * @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( new $FQCN(), $FQCN );
+		return $this->addEntityToCollection(new $FQCN(), $FQCN);
 	}
 
 

core/services/collections/CollectionDetailsInterface.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/collections/CollectionInterface.php

Spacing +10 added lines, -10 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\collection_loaders;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -25,7 +25,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function add( $object, $identifier = null );
+	public function add($object, $identifier = null);
 
 	/**
 	 * setIdentifier
@@ -37,7 +37,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function setIdentifier( $object, $identifier = null );
+	public function setIdentifier($object, $identifier = null);
 
 	/**
 	 * get
@@ -48,7 +48,7 @@ 
 	 * @param mixed $identifier
 	 * @return mixed
 	 */
-	public function get( $identifier );
+	public function get($identifier);
 
 	/**
 	 * has
@@ -60,7 +60,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function has( $identifier );
+	public function has($identifier);
 
 	/**
 	 * hasObject
@@ -70,7 +70,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function hasObject( $object );
+	public function hasObject($object);
 
 	/**
 	 * remove
@@ -80,7 +80,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object );
+	public function remove($object);
 
 	/**
 	 * setCurrent
@@ -90,7 +90,7 @@ 
 	 * @param mixed $identifier
 	 * @return void
 	 */
-	public function setCurrent( $identifier ) ;
+	public function setCurrent($identifier);
 
 	/**
 	 * setCurrentUsingObject
@@ -100,7 +100,7 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function setCurrentUsingObject( $object );
+	public function setCurrentUsingObject($object);
 
 }
 // End of file CollectionInterface.php

core/services/collections/Collection.php

Indentation -1 removed lines

@@ -799,7 +799,6 @@
 
 
 	/**
-
 	 *
 	 * 	 If the the first date starts at midnight on one day, and the next date ends at midnight on the
 	 * 	 very next day then this method will return true.

Spacing +34 added lines, -34 removed lines

@@ -4,8 +4,8 @@ 
 use EventEspresso\Core\Exceptions\InvalidEntityException;
 use EventEspresso\Core\Exceptions\InvalidInterfaceException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class Collection
@@ -34,8 +34,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);
 	 }
 
 
@@ -47,9 +47,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;
 	 }
@@ -68,13 +68,13 @@ 
 	  * @return bool
 	  * @throws \EventEspresso\Core\Exceptions\InvalidEntityException
 	  */
-	 public function add( $object, $identifier = null ) {
-		 if ( ! $object instanceof $this->collection_interface ) {
-			 throw new InvalidEntityException( get_class( $object ), $this->collection_interface );
+	 public function add($object, $identifier = null) {
+		 if ( ! $object instanceof $this->collection_interface) {
+			 throw new InvalidEntityException(get_class($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);
 	 }
 
 
@@ -90,12 +90,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;
 			 }
@@ -115,10 +115,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;
@@ -140,10 +140,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;
 			 }
@@ -162,8 +162,8 @@ 
 	  * @param $object
 	  * @return bool
 	  */
-	 public function hasObject( $object ) {
-		 return $this->contains( $object );
+	 public function hasObject($object) {
+		 return $this->contains($object);
 	 }
 
 
@@ -176,8 +176,8 @@ 
 	  * @param $object
 	  * @return bool
 	  */
-	 public function remove( $object ) {
-		 $this->detach( $object );
+	 public function remove($object) {
+		 $this->detach($object);
 		 return true;
 	 }
 
@@ -191,10 +191,10 @@ 
 	  * @param mixed $identifier
 	  * @return void
 	  */
-	 public function setCurrent( $identifier ) {
+	 public function setCurrent($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 break;
 			 }
 			 $this->next();
@@ -211,10 +211,10 @@ 
 	  * @param $object
 	  * @return void
 	  */
-	 public function setCurrentUsingObject( $object ) {
+	 public function setCurrentUsingObject($object) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $this->current() === $object ) {
+		 while ($this->valid()) {
+			 if ($this->current() === $object) {
 				 break;
 			 }
 			 $this->next();

core/services/collections/CollectionDetails.php

Indentation -1 removed lines

@@ -799,7 +799,6 @@
 
 
 	/**
-
 	 *
 	 * 	 If the the first date starts at midnight on one day, and the next date ends at midnight on the
 	 * 	 very next day then this method will return true.

Spacing +33 added lines, -33 removed lines

@@ -8,8 +8,8 @@ 
 use EventEspresso\core\services\locators\FqcnLocator;
 use EventEspresso\core\services\locators\LocatorInterface;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -153,12 +153,12 @@ 
 		$identifier_type = CollectionDetails::ID_OBJECT_HASH,
 		LocatorInterface $file_locator = null
 	) {
-		$this->setCollectionName( $collection_name );
-		$this->setCollectionInterface( $collection_interface );
-		$this->setCollectionFQCNs( $collection_FQCNs );
-		$this->setCollectionPaths( $collection_paths );
-		$this->setFileMasks( $file_mask );
-		$this->setIdentifierType( $identifier_type );
+		$this->setCollectionName($collection_name);
+		$this->setCollectionInterface($collection_interface);
+		$this->setCollectionFQCNs($collection_FQCNs);
+		$this->setCollectionPaths($collection_paths);
+		$this->setFileMasks($file_mask);
+		$this->setIdentifierType($identifier_type);
 		$this->file_locator = $file_locator;
 	}
 
@@ -179,9 +179,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;
 	}
@@ -207,14 +207,14 @@ 
 	 * @param string $collection_name
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	protected function setCollectionName( $collection_name ) {
-		if ( ! is_string( $collection_name ) ) {
-			throw new InvalidDataTypeException( '$collection_name', $collection_name, 'string' );
+	protected function setCollectionName($collection_name) {
+		if ( ! is_string($collection_name)) {
+			throw new InvalidDataTypeException('$collection_name', $collection_name, 'string');
 		}
 		$this->collection_name = str_replace(
 			'-',
 			'_',
-			sanitize_title_with_dashes( $collection_name, '', 'save' )
+			sanitize_title_with_dashes($collection_name, '', 'save')
 		);
 	}
 
@@ -235,7 +235,7 @@ 
 	 * @param string $identifier_type
 	 * @throws \EventEspresso\Core\Exceptions\InvalidIdentifierException
 	 */
-	protected function setIdentifierType( $identifier_type ) {
+	protected function setIdentifierType($identifier_type) {
 		if (
 			! (
 				$identifier_type === CollectionDetails::ID_CLASS_NAME
@@ -270,12 +270,12 @@ 
 	 * @param string $file_mask
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	protected function setFileMasks( $file_mask ) {
-		$this->file_mask = ! empty( $file_mask ) ? $file_mask : '*.php';
+	protected function setFileMasks($file_mask) {
+		$this->file_mask = ! empty($file_mask) ? $file_mask : '*.php';
 		// we know our default is a string, so if it's not a string now,
 		// then that means the incoming parameter was something else
-		if ( ! is_string( $this->file_mask ) ) {
-			throw new InvalidDataTypeException( '$file_mask', $this->file_mask, 'string' );
+		if ( ! is_string($this->file_mask)) {
+			throw new InvalidDataTypeException('$file_mask', $this->file_mask, 'string');
 		}
 	}
 
@@ -297,13 +297,13 @@ 
 	 * @throws \EventEspresso\Core\Exceptions\InvalidClassException
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	public function setCollectionFQCNs( $collection_FQCNs ) {
-		foreach ( (array) $collection_FQCNs as $collection_FQCN ) {
-			if ( ! empty( $collection_FQCN ) ) {
-				if ( class_exists( $collection_FQCN ) ) {
+	public function setCollectionFQCNs($collection_FQCNs) {
+		foreach ((array) $collection_FQCNs as $collection_FQCN) {
+			if ( ! empty($collection_FQCN)) {
+				if (class_exists($collection_FQCN)) {
 					$this->collection_FQCNs[] = $collection_FQCN;
 				} else {
-					foreach ( $this->getFQCNsFromPartialNamespace( $collection_FQCN ) as $FQCN ) {
+					foreach ($this->getFQCNsFromPartialNamespace($collection_FQCN) as $FQCN) {
 						$this->collection_FQCNs[] = $FQCN;
 					}
 				}
@@ -320,11 +320,11 @@ 
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 * @throws \EventEspresso\Core\Exceptions\InvalidClassException
 	 */
-	protected function getFQCNsFromPartialNamespace( $partial_FQCN ) {
-		if ( ! $this->file_locator instanceof FqcnLocator ) {
+	protected function getFQCNsFromPartialNamespace($partial_FQCN) {
+		if ( ! $this->file_locator instanceof FqcnLocator) {
 			$this->file_locator = new FqcnLocator();
 		}
-		$this->file_locator->locate( $partial_FQCN );
+		$this->file_locator->locate($partial_FQCN);
 		return $this->file_locator->getFQCNs();
 	}
 
@@ -345,11 +345,11 @@ 
 	 * @param string|array $collection_paths
 	 * @throws \EventEspresso\Core\Exceptions\InvalidFilePathException
 	 */
-	public function setCollectionPaths( $collection_paths ) {
-		foreach ( (array) $collection_paths as $collection_path ) {
-			if ( ! empty( $collection_path ) ) {
-				if ( ! is_readable( $collection_path ) ) {
-					throw new InvalidFilePathException( $collection_path );
+	public function setCollectionPaths($collection_paths) {
+		foreach ((array) $collection_paths as $collection_path) {
+			if ( ! empty($collection_path)) {
+				if ( ! is_readable($collection_path)) {
+					throw new InvalidFilePathException($collection_path);
 				}
 				$this->collection_paths[] = $collection_path;
 			}