eventespresso / event-espresso-core

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 +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');
 }
 
 
@@ -80,8 +80,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;
@@ -108,12 +108,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",
@@ -121,11 +121,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);
 		}
 	}
 
@@ -141,22 +141,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);
 	}
 
 
@@ -170,15 +170,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,
@@ -187,7 +187,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,
@@ -217,12 +217,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(),
@@ -232,7 +232,7 @@ 
 							'event_espresso'
 						),
 						$identifier_callback,
-						get_class( $entity )
+						get_class($entity)
 					)
 				);
 			}
@@ -263,8 +263,8 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		foreach ( $FQCNs as $FQCN ) {
-			$this->loadClassFromFQCN( $FQCN );
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
 		}
 	}
 
@@ -279,14 +279,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/helpers/EEH_Template.helper.php

Spacing +202 added lines, -202 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -182,26 +182,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -210,81 +210,81 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 					// hook that can be used to display the full template path that will be used
-					do_action( 'AHEE__EEH_Template__locate_template__full_template_path', $template_path );
+					do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path);
 					break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -297,21 +297,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -323,7 +323,7 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -334,26 +334,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -371,27 +371,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -407,50 +407,50 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
 		$amount = (float) $amount;
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -465,11 +465,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -484,9 +484,9 @@ 
 	 * @param string  $title
 	 * @return string the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '', $title = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '" title="' . $title . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '', $title = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'" title="'.$title.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -503,21 +503,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -529,31 +529,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -561,7 +561,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -582,31 +582,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h3>' . __('Status Legend', 'event_espresso') . '</h3>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h3>'.__('Status Legend', 'event_espresso').'</h3>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -619,8 +619,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	ob_start();
 	if (is_array($data)) {
@@ -633,10 +633,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -650,7 +650,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -680,8 +680,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -705,13 +705,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -719,68 +719,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</span>';
 
-		if ( $current === 1 ) {
+		if ($current === 1) {
 			$disable_first = ' disabled';
 		}
-		if ( $current == $total_pages ) {
+		if ($current == $total_pages) {
 			$disable_last = ' disabled';
 		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( $paged_arg_name, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg($paged_arg_name, $url)),
 			'&laquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field ) {
+		if ( ! $show_num_field) {
 			$html_current_page = $current;
 		} else {
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
 
 		$html_total_pages = sprintf(
 			'<span class="total-pages">%s</span>',
-			number_format_i18n( $total_pages )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -789,29 +789,29 @@ 
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 
@@ -827,7 +827,7 @@ 
 //add_filter( 'FHEE__EEH_Template__format_currency__amount', 'convert_zero_to_free', 10, 2 );
 
 
-if ( ! function_exists( 'espresso_pagination' ) ) {
+if ( ! function_exists('espresso_pagination')) {
 	/**
 	 *    espresso_pagination
 	 *
@@ -839,21 +839,21 @@ 
 		$big = 999999999; // need an unlikely integer
 		$pagination = paginate_links(
 		array(
-		'base'         => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 		'format'       => '?paged=%#%',
-		'current'      => max( 1, get_query_var( 'paged' ) ),
+		'current'      => max(1, get_query_var('paged')),
 		'total'        => $wp_query->max_num_pages,
 		'show_all'     => true,
 		'end_size'     => 10,
 		'mid_size'     => 6,
 		'prev_next'    => true,
-		'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-		'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+		'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+		'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 		'type'         => 'plain',
 		'add_args'     => false,
 		'add_fragment' => ''
 		)
 		);
-		echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 }
\ No newline at end of file

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

Spacing +5 added lines, -5 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,9 +29,9 @@ 
 		// core/services/progress_steps/display_strategies/number_bubbles/number_bubbles.css
 		wp_register_style(
 			'ee_progress_steps_display_number_bubbles',
-			plugin_dir_url( __FILE__ ) . 'number_bubbles.css'
+			plugin_dir_url(__FILE__).'number_bubbles.css'
 		);
-		wp_enqueue_style( 'ee_progress_steps_display_number_bubbles' );
+		wp_enqueue_style('ee_progress_steps_display_number_bubbles');
 	}
 
 
@@ -43,7 +43,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/progress_steps/display_strategies/number_bubbles/number_bubbles.template.php

Spacing +5 added lines, -5 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');
 }
 /**
  * This is the template for the "Number Bubbles" Progress Steps
@@ -14,13 +14,13 @@ 
 <!-- progress step display -->
 <div class="ee-progress-step-main-container">
 	<div class="progress-step-container number-bubbles-container">
-		<?php foreach ( $progress_steps as $progress_step ) : ?>
-		<div data-step-nmbr="<?php echo $progress_step->id();?>" id="progress-step-<?php echo $progress_step->id(); ?>" class="progress-step-number <?php echo $progress_step->htmlClass(); ?>">
+		<?php foreach ($progress_steps as $progress_step) : ?>
+		<div data-step-nmbr="<?php echo $progress_step->id(); ?>" id="progress-step-<?php echo $progress_step->id(); ?>" class="progress-step-number <?php echo $progress_step->htmlClass(); ?>">
 			<div class="progress-step-line"></div>
 			<div class="progress-step-bubble"><p><?php echo $progress_step->id(); ?></p></div>
 			<span class="progress-step-text"><?php echo $progress_step->text(); ?></span>
 		</div>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</div>
 </div>
 

core/services/progress_steps/ProgressStep.php

Spacing +21 added lines, -21 removed lines

@@ -3,8 +3,8 @@ 
 
 use EventEspresso\Core\Exceptions\InvalidDataTypeException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -18,7 +18,7 @@ 
  * @author        Brent Christensen
  * @since         $VID:$
  */
-class ProgressStep implements ProgressStepInterface{
+class ProgressStep implements ProgressStepInterface {
 
 
 	/**
@@ -52,10 +52,10 @@ 
 	 * @param string     $text
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	public function __construct( $id, $html_class, $text ) {
-		$this->setId( $id );
-		$this->setHtmlClass( $html_class );
-		$this->setText( $text );
+	public function __construct($id, $html_class, $text) {
+		$this->setId($id);
+		$this->setHtmlClass($html_class);
+		$this->setText($text);
 	}
 
 
@@ -72,8 +72,8 @@ 
 	/**
 	 * @param boolean $is_current
 	 */
-	public function setIsCurrent( $is_current = true ) {
-		$this->is_current = filter_var( $is_current, FILTER_VALIDATE_BOOLEAN );
+	public function setIsCurrent($is_current = true) {
+		$this->is_current = filter_var($is_current, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -92,9 +92,9 @@ 
 	 * @param int|string $id
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	protected function setId( $id = 0 ) {
-		if ( ! ( is_int( $id ) || is_string( $id ) ) ) {
-			throw new InvalidDataTypeException( '$id', $id, 'integer or string' );
+	protected function setId($id = 0) {
+		if ( ! (is_int($id) || is_string($id))) {
+			throw new InvalidDataTypeException('$id', $id, 'integer or string');
 		}
 		$this->id = $id;
 	}
@@ -105,7 +105,7 @@ 
 	 * @return string
 	 */
 	public function htmlClass() {
-		return $this->is_current ? $this->html_class . ' progress-step-active' : $this->html_class;
+		return $this->is_current ? $this->html_class.' progress-step-active' : $this->html_class;
 	}
 
 
@@ -115,12 +115,12 @@ 
 	 * @param string $html_class
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	protected function setHtmlClass( $html_class ) {
-		if ( ! is_string( $html_class ) ) {
-			throw new InvalidDataTypeException( '$html_class', $html_class, 'string' );
+	protected function setHtmlClass($html_class) {
+		if ( ! is_string($html_class)) {
+			throw new InvalidDataTypeException('$html_class', $html_class, 'string');
 		}
-		if ( strpos( $html_class, 'progress-step-' ) === false ) {
-			$html_class = 'progress-step-' . $html_class;
+		if (strpos($html_class, 'progress-step-') === false) {
+			$html_class = 'progress-step-'.$html_class;
 		}
 		$this->html_class = $html_class;
 	}
@@ -141,9 +141,9 @@ 
 	 * @param string $text
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	protected function setText( $text ) {
-		if ( ! is_string( $text ) ) {
-			throw new InvalidDataTypeException( '$text', $text, 'string' );
+	protected function setText($text) {
+		if ( ! is_string($text)) {
+			throw new InvalidDataTypeException('$text', $text, 'string');
 		}
 		$this->text = $text;
 	}

core/services/progress_steps/ProgressStepCollection.php

Spacing +3 added lines, -3 removed lines

@@ -4,8 +4,8 @@ 
 use EventEspresso\core\services\collections\Collection;
 
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -27,7 +27,7 @@ 
 	 * @throws \EventEspresso\Core\Exceptions\InvalidInterfaceException
 	 */
 	public function __construct() {
-		parent::__construct( '\EventEspresso\core\services\progress_steps\ProgressStepInterface' );
+		parent::__construct('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
 	}
 
 }

core/services/progress_steps/ProgressStepInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\progress_steps;
 
-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 boolean $is_current
 	 */
-	public function setIsCurrent( $is_current = true );
+	public function setIsCurrent($is_current = true);
 
 	/**
 	 * @return int|string

core/services/progress_steps/ProgressStepManager.php

Spacing +24 added lines, -24 removed lines

@@ -9,8 +9,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');
 }
 
 
@@ -65,14 +65,14 @@ 
 		CollectionInterface $collection = null,
 		EE_Request $request = null
 	) {
-		$this->setDisplayStrategy( $display_strategy_name );
-		$this->setDefaultStep( $default_step );
-		if ( ! $collection instanceof CollectionInterface ) {
-			$collection = new Collection( '\EventEspresso\core\services\progress_steps\ProgressStepInterface' );
+		$this->setDisplayStrategy($display_strategy_name);
+		$this->setDefaultStep($default_step);
+		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;
 	}
@@ -84,28 +84,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'
 				)
@@ -120,20 +120,20 @@ 
 	 * @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;
 	}
 
 
 	public function setStep() {
-		$this->collection->current()->setIsCurrent( false );
+		$this->collection->current()->setIsCurrent(false);
 		$set = $this->collection->setCurrent(
-			$this->request->get( 'ee-step', $this->default_step )
+			$this->request->get('ee-step', $this->default_step)
 		);
-		if ( $set ) {
+		if ($set) {
 			$this->collection->current()->setIsCurrent();
 		}
 	}
@@ -175,7 +175,7 @@ 
 	public function displaySteps() {
 		echo \EEH_Template::display_template(
 			$this->display_strategy->getTemplate(),
-			array( 'progress_steps' => $this->collection ),
+			array('progress_steps' => $this->collection),
 			true
 		);
 	}

core/services/collections/CollectionDetails.php

Spacing +37 added lines, -37 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');
 }
 
 
@@ -170,13 +170,13 @@ 
 		$identifier_callback = '',
 		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->setIdentifierCallback( $identifier_callback );
+		$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->setIdentifierCallback($identifier_callback);
 		$this->file_locator = $file_locator;
 	}
 
@@ -197,9 +197,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;
 	}
@@ -225,14 +225,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')
 		);
 	}
 
@@ -253,7 +253,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
@@ -286,9 +286,9 @@ 
 	 * @param string $identifier_callback
 	 * @throws \EventEspresso\Core\Exceptions\InvalidDataTypeException
 	 */
-	protected function setIdentifierCallback( $identifier_callback = 'identifier' ) {
-		if ( ! is_string( $identifier_callback ) ) {
-			throw new InvalidDataTypeException( '$identifier_callback', $identifier_callback, 'string' );
+	protected function setIdentifierCallback($identifier_callback = 'identifier') {
+		if ( ! is_string($identifier_callback)) {
+			throw new InvalidDataTypeException('$identifier_callback', $identifier_callback, 'string');
 		}
 		$this->identifier_callback = $identifier_callback;
 	}
@@ -313,12 +313,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');
 		}
 	}
 
@@ -340,13 +340,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;
 					}
 				}
@@ -363,11 +363,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();
 	}
 
@@ -388,11 +388,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;
 			}