eventespresso / event-espresso-core

core/exceptions/InvalidIdentifierException.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\Core\Exceptions;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class InvalidIdentifierException
@@ -23,8 +23,8 @@ 
 	  * @param int        $code
 	  * @param \Exception $previous
 	  */
-	 public function __construct( $actual, $expected, $message = '', $code = 0, \Exception $previous = null ) {
-		 if ( empty( $message ) ) {
+	 public function __construct($actual, $expected, $message = '', $code = 0, \Exception $previous = null) {
+		 if (empty($message)) {
 			 $message = sprintf(
 				 __(
 					 'The supplied identifier "%1$s" is invalid. A value like "%2$s" was expected.',
@@ -34,7 +34,7 @@ 
 				 $expected
 			 );
 		 }
-		 parent::__construct( $message, $code, $previous );
+		 parent::__construct($message, $code, $previous);
 	 }
 
  }

core/exceptions/InvalidEntityException.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\Core\Exceptions;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class InvalidIdentifierException
@@ -23,8 +23,8 @@ 
 	  * @param int        $code
 	  * @param \Exception $previous
 	  */
-	 public function __construct( $actual, $expected, $message = '', $code = 0, \Exception $previous = null ) {
-		 if ( empty( $message ) ) {
+	 public function __construct($actual, $expected, $message = '', $code = 0, \Exception $previous = null) {
+		 if (empty($message)) {
 			 $message = sprintf(
 				 __(
 					 'The supplied identifier "%1$s" is invalid. A value like "%2$s" was expected.',
@@ -34,7 +34,7 @@ 
 				 $expected
 			 );
 		 }
-		 parent::__construct( $message, $code, $previous );
+		 parent::__construct($message, $code, $previous);
 	 }
 
  }

admin_pages/registrations/templates/reg_admin_details_main_meta_box_reg_details.template.php

Spacing +19 added lines, -19 removed lines

@@ -1,37 +1,37 @@ 
 <div id="admin-primary-mbox-reg-details-dv" class="admin-primary-mbox-dv">
 
-	<?php do_action( 'AHEE__reg_admin_details_main_meta_box_reg_details__top', $REG_ID ); ?>
+	<?php do_action('AHEE__reg_admin_details_main_meta_box_reg_details__top', $REG_ID); ?>
 	<?php echo $resend_registration_button; ?>
 	<?php echo $view_transaction_button; ?>
 	<br/>
 
-	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e( 'Registration Items', 'event_espresso' );?></h3>
+	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e('Registration Items', 'event_espresso'); ?></h3>
 
 	<?php echo $line_item_table; ?>
 
 	<?php
-	if ( WP_DEBUG ) {
-		$delivered_messages = get_option( 'EED_Messages__maybe_registration', array() );
-		if ( isset( $delivered_messages[ $REG_ID ] )) {
+	if (WP_DEBUG) {
+		$delivered_messages = get_option('EED_Messages__maybe_registration', array());
+		if (isset($delivered_messages[$REG_ID])) {
 	?>
-	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Registrant', 'event_espresso' );?></h4>
+	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Registrant', 'event_espresso'); ?></h4>
 
 	<div class="admin-primary-mbox-tbl-wrap">
 		<table class="admin-primary-mbox-tbl">
 			<thead>
 				<tr>
-					<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'REG Status Upon Sending', 'event_espresso' );?></th>
+					<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('REG Status Upon Sending', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-				<?php foreach ( $delivered_messages[ $REG_ID ] as $timestamp => $delivered_message ) :
+				<?php foreach ($delivered_messages[$REG_ID] as $timestamp => $delivered_message) :
 					?>
 					<tr>
-						<td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
-						<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
-						<td class="jst-left"><?php echo isset( $delivered_message['reg_status'] ) ? $delivered_message['reg_status'] : '';?></td>
+						<td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
+						<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
+						<td class="jst-left"><?php echo isset($delivered_message['reg_status']) ? $delivered_message['reg_status'] : ''; ?></td>
 					</tr>
 				<?php endforeach; // $delivered_messages?>
 			</tbody>
@@ -43,27 +43,27 @@ 
 	?>
 
 	<a id="display-additional-registration-session-info" class="display-the-hidden smaller-text" rel="additional-registration-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional registration session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional registration session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-registration-session-info-dv" class="hidden">
 
 		<a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-registration-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional registration session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional registration session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h3 class="admin-primary-mbox-h4"><?php _e( 'Registration Session Details', 'event_espresso' );?></h3>
+		<h3 class="admin-primary-mbox-h4"><?php _e('Registration Session Details', 'event_espresso'); ?></h3>
 
 		<table id="admin-primary-mbox-reg-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $reg_details as $key => $reg_detail ) : ?>
+			<?php foreach ($reg_details as $key => $reg_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $reg_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $reg_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $reg_detail['value'];?>
+						<?php echo $reg_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $reg_details?>

core/Psr4Autoloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 	 * Loads the class file for a given class name.
 	 *
 	 * @param string $class The fully-qualified class name.
-	 * @return mixed The mapped file name on success, or boolean false on
+	 * @return string|false The mapped file name on success, or boolean false on
 	 * failure.
 	 */
 	public function loadClass( $class ) {
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param string $prefix The namespace prefix.
 	 * @param string $relative_class The relative class name.
-	 * @return mixed Boolean false if no mapped file can be loaded, or the
+	 * @return string|false Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
 	protected function loadMappedFile( $prefix, $relative_class ) {

Spacing +25 added lines, -25 removed lines

@@ -77,10 +77,10 @@ 
 	 * @param string $prefix
 	 * @return array
 	 */
-	public function prefixes( $prefix = '' ) {
-		if ( ! empty( $prefix ) ) {
+	public function prefixes($prefix = '') {
+		if ( ! empty($prefix)) {
 			// are there any base directories for this namespace prefix?
-			return isset( $this->prefixes[ $prefix ] ) ? $this->prefixes[ $prefix ] : array();
+			return isset($this->prefixes[$prefix]) ? $this->prefixes[$prefix] : array();
 		}
 		return $this->prefixes;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return void
 	 */
 	public function register() {
-		spl_autoload_register( array( $this, 'loadClass' ) );
+		spl_autoload_register(array($this, 'loadClass'));
 	}
 
 
@@ -109,20 +109,20 @@ 
 	 * than last.
 	 * @return void
 	 */
-	public function addNamespace( $prefix, $base_dir, $prepend = false ) {
+	public function addNamespace($prefix, $base_dir, $prepend = false) {
 		// normalize namespace prefix
-		$prefix = trim( $prefix, Psr4Autoloader::NS ) . Psr4Autoloader::NS;
+		$prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS;
 		// normalize the base directory with a trailing separator
-		$base_dir = \EEH_File::standardise_and_end_with_directory_separator( $base_dir );
+		$base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir);
 		// initialize the namespace prefix array
-		if ( isset( $this->prefixes[ $prefix ] ) === false ) {
-			$this->prefixes[ $prefix ] = array();
+		if (isset($this->prefixes[$prefix]) === false) {
+			$this->prefixes[$prefix] = array();
 		}
 		// retain the base directory for the namespace prefix
-		if ( $prepend ) {
-			array_unshift( $this->prefixes[ $prefix ], $base_dir );
+		if ($prepend) {
+			array_unshift($this->prefixes[$prefix], $base_dir);
 		} else {
-			$this->prefixes[ $prefix ][] = $base_dir;
+			$this->prefixes[$prefix][] = $base_dir;
 		}
 	}
 
@@ -135,24 +135,24 @@ 
 	 * @return mixed The mapped file name on success, or boolean false on
 	 * failure.
 	 */
-	public function loadClass( $class ) {
+	public function loadClass($class) {
 		// the current namespace prefix
 		$prefix = $class;
 		// work backwards through the namespace names of the fully-qualified
 		// class name to find a mapped file name
-		while ( false !== $pos = strrpos( $prefix, Psr4Autoloader::NS ) ) {
+		while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
 			// retain the trailing namespace separator in the prefix
-			$prefix = substr( $class, 0, $pos + 1 );
+			$prefix = substr($class, 0, $pos + 1);
 			// the rest is the relative class name
-			$relative_class = substr( $class, $pos + 1 );
+			$relative_class = substr($class, $pos + 1);
 			// try to load a mapped file for the prefix and relative class
-			$mapped_file = $this->loadMappedFile( $prefix, $relative_class );
-			if ( $mapped_file ) {
+			$mapped_file = $this->loadMappedFile($prefix, $relative_class);
+			if ($mapped_file) {
 				return $mapped_file;
 			}
 			// remove the trailing namespace separator for the next iteration
 			// of strrpos()
-			$prefix = rtrim( $prefix, Psr4Autoloader::NS );
+			$prefix = rtrim($prefix, Psr4Autoloader::NS);
 		}
 		// never found a mapped file
 		return false;
@@ -168,17 +168,17 @@ 
 	 * @return mixed Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
-	protected function loadMappedFile( $prefix, $relative_class ) {
+	protected function loadMappedFile($prefix, $relative_class) {
 		// look through base directories for this namespace prefix
-		foreach ( $this->prefixes( $prefix ) as $base_dir ) {
+		foreach ($this->prefixes($prefix) as $base_dir) {
 			// replace the namespace prefix with the base directory,
 			// replace namespace separators with directory separators
 			// in the relative class name, append with .php
 			$file = $base_dir
-				. str_replace( Psr4Autoloader::NS, DS, $relative_class )
+				. str_replace(Psr4Autoloader::NS, DS, $relative_class)
 				. '.php';
 			// if the mapped file exists, require it
-			if ( $this->requireFile( $file ) ) {
+			if ($this->requireFile($file)) {
 				// yes, we're done
 				return $file;
 			}
@@ -195,8 +195,8 @@ 
 	 * @param string $file The file to require.
 	 * @return bool True if the file exists, false if not.
 	 */
-	protected function requireFile( $file ) {
-		if ( file_exists( $file ) ) {
+	protected function requireFile($file) {
+		if (file_exists($file)) {
 			require $file;
 			return true;
 		}

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

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;
 

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

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;
 

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 ) {

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 +39 added lines, -39 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,12 +220,12 @@ 
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
-	protected function setIdentifier( $entity, $identifier ) {
-		if ( $this->collection_details->identifierType() === CollectionDetails::ID_OBJECT_HASH ) {
-			$identifier = spl_object_hash( $entity );
-		} elseif ( $this->collection_details->identifierType() === CollectionDetails::ID_CALLBACK_METHOD ) {
+	protected function setIdentifier($entity, $identifier) {
+		if ($this->collection_details->identifierType() === CollectionDetails::ID_OBJECT_HASH) {
+			$identifier = spl_object_hash($entity);
+		} elseif ($this->collection_details->identifierType() === CollectionDetails::ID_CALLBACK_METHOD) {
 			$identifier_callback = $this->collection_details->identifierCallback();
-			if ( ! method_exists( $entity, $identifier_callback ) ) {
+			if ( ! method_exists($entity, $identifier_callback)) {
 				throw new InvalidEntityException(
 					$entity,
 					$this->collection_details->getCollectionInterface(),
@@ -235,7 +235,7 @@ 
 							'event_espresso'
 						),
 						$identifier_callback,
-						get_class( $entity )
+						get_class($entity)
 					)
 				);
 			}
@@ -267,8 +267,8 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		foreach ( $FQCNs as $FQCN ) {
-			$this->loadClassFromFQCN( $FQCN );
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
 		}
 	}
 
@@ -284,15 +284,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
 		);
 	}