eventespresso / event-espresso-core

core/services/progress_steps/display_strategies/ProgressStepsDisplayInterface.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 namespace EventEspresso\core\services\progress_steps\display_strategies;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 

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');
 }
 
 
@@ -28,7 +28,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/ProgressStep.php

Spacing +28 added lines, -28 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');
 }
 
 
@@ -19,7 +19,7 @@ 
  * @author        Brent Christensen
  * @since         4.9.0
  */
-class ProgressStep implements ProgressStepInterface{
+class ProgressStep implements ProgressStepInterface {
 
 
 	/**
@@ -65,11 +65,11 @@ 
 	 * @param string $text
 	 * @throws InvalidDataTypeException
 	 */
-	public function __construct( $order, $id, $html_class, $text ) {
-		$this->setOrder( $order );
-		$this->setId( $id );
-		$this->setHtmlClass( $html_class );
-		$this->setText( $text );
+	public function __construct($order, $id, $html_class, $text) {
+		$this->setOrder($order);
+		$this->setId($id);
+		$this->setHtmlClass($html_class);
+		$this->setText($text);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	/**
 	 * @param boolean $current
 	 */
-	public function setIsCurrent( $current = true ) {
-		$this->current = filter_var( $current, FILTER_VALIDATE_BOOLEAN );
+	public function setIsCurrent($current = true) {
+		$this->current = filter_var($current, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	/**
 	 * @param boolean $completed
 	 */
-	public function setIsCompleted( $completed = true ) {
-		$this->completed = filter_var( $completed, FILTER_VALIDATE_BOOLEAN );
+	public function setIsCompleted($completed = true) {
+		$this->completed = filter_var($completed, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -124,9 +124,9 @@ 
 	 * @param string $id
 	 * @throws InvalidDataTypeException
 	 */
-	protected function setId( $id = '' ) {
-		if ( ! is_string( $id ) ) {
-			throw new InvalidDataTypeException( '$id', $id, 'string' );
+	protected function setId($id = '') {
+		if ( ! is_string($id)) {
+			throw new InvalidDataTypeException('$id', $id, 'string');
 		}
 		$this->id = $id;
 	}
@@ -148,9 +148,9 @@ 
 	 * @param int $order
 	 * @throws InvalidDataTypeException
 	 */
-	protected function setOrder( $order = 0 ) {
-		if ( ! is_int( $order ) ) {
-			throw new InvalidDataTypeException( '$order', $order, 'integer' );
+	protected function setOrder($order = 0) {
+		if ( ! is_int($order)) {
+			throw new InvalidDataTypeException('$order', $order, 'integer');
 		}
 		$this->order = $order;
 	}
@@ -162,9 +162,9 @@ 
 	 */
 	public function htmlClass() {
 		$html_class = $this->html_class;
-		if ( $this->isCurrent() ) {
+		if ($this->isCurrent()) {
 			$html_class .= ' progress-step-active';
-		} else if ( $this->isCompleted() ) {
+		} else if ($this->isCompleted()) {
 			$html_class .= ' progress-step-completed';
 		}
 		return $html_class;
@@ -177,12 +177,12 @@ 
 	 * @param string $html_class
 	 * @throws 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;
 	}
@@ -203,9 +203,9 @@ 
 	 * @param string $text
 	 * @throws 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/ProgressStepsConfigInterface.php

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

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');
 }
 
 
@@ -24,7 +24,7 @@ 
 	/**
 	 * @param boolean $is_current
 	 */
-	public function setIsCurrent( $is_current = true );
+	public function setIsCurrent($is_current = true);
 
 	/**
 	 * @return string

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/domain/services/DomainService.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 namespace EventEspresso\core\domain\services;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 

core/helpers/EEH_Class_Tools.helper.php

Spacing +34 added lines, -34 removed lines

@@ -35,35 +35,35 @@ 
 	 */
 	public static function get_called_class() {
 		$backtrace = debug_backtrace();
-		if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['class'] ) && ! isset( $backtrace[2]['file'] )) {
+		if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
 			return $backtrace[2]['class'];
-		} else if ( isset( $backtrace[3] ) && is_array( $backtrace[3] ) && isset( $backtrace[3]['class'] ) && ! isset( $backtrace[3]['file'] )) {
+		} else if (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
 			return $backtrace[3]['class'];
-		} else if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['file'] ) && isset( $backtrace[2]['line'] )) {
-			if ( self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line'] ) {
+		} else if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
+			if (self::$file_line == $backtrace[2]['file'].$backtrace[2]['line']) {
 				self::$i++;
 			} else {
 				self::$i = 0;
-				self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
+				self::$file_line = $backtrace[2]['file'].$backtrace[2]['line'];
 			}
 			// was  class method called via call_user_func ?
-			if ( $backtrace[2]['function'] == 'call_user_func' && isset( $backtrace[2]['args'] ) && is_array( $backtrace[2]['args'] )){
-				if ( isset( $backtrace[2]['args'][0] ) && isset( $backtrace[2]['args'][0][0] )) {
+			if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
+				if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
 					$called_class = $backtrace[2]['args'][0][0];
 					// is it an EE function ?
-					if ( strpos( $called_class, 'EE' ) === 0 ) {
-						$prefix_chars = strpos( $called_class, '_' ) + 1;
-						$prefix = substr( $called_class, 0, $prefix_chars );
-						$classname = substr( $called_class, $prefix_chars, strlen( $called_class ));
-						$classname = $prefix . str_replace( ' ', '_', ucwords( strtolower( str_replace( '_', ' ', $classname  ))));
+					if (strpos($called_class, 'EE') === 0) {
+						$prefix_chars = strpos($called_class, '_') + 1;
+						$prefix = substr($called_class, 0, $prefix_chars);
+						$classname = substr($called_class, $prefix_chars, strlen($called_class));
+						$classname = $prefix.str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
 						return $classname;
 					}
 				}
 			} else {
-				$lines = file( $backtrace[2]['file'] );
-				preg_match_all( '/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[$backtrace[2]['line']-1], $matches );
-				if ( isset( $matches[1] ) && isset( $matches[1][ self::$i ] )) {
-					return $matches[1][ self::$i ];
+				$lines = file($backtrace[2]['file']);
+				preg_match_all('/([a-zA-Z0-9\_]+)::'.$backtrace[2]['function'].'/', $lines[$backtrace[2]['line'] - 1], $matches);
+				if (isset($matches[1]) && isset($matches[1][self::$i])) {
+					return $matches[1][self::$i];
 				}
 			}
 		}
@@ -80,22 +80,22 @@ 
 	 * 	@param 	string 	$hook
 	 * 	@return 	array
 	 */
-	public static function get_class_names_for_all_callbacks_on_hook( $hook = NULL ) {
+	public static function get_class_names_for_all_callbacks_on_hook($hook = NULL) {
 		global $wp_filter;
 		$class_names = array();
 		// are any callbacks registered for this hook ?
-		if ( isset( $wp_filter[ $hook ] )) {
+		if (isset($wp_filter[$hook])) {
 			// loop thru all of the callbacks attached to the deprecated hookpoint
-			foreach( $wp_filter[ $hook ] as $priority ) {
-				foreach( $priority as $callback ) {
+			foreach ($wp_filter[$hook] as $priority) {
+				foreach ($priority as $callback) {
 					// is the callback a non-static class method ?
-					if ( isset( $callback['function'] ) && is_array( $callback['function'] )) {
-						if ( isset( $callback['function'][0] ) && is_object( $callback['function'][0] )) {
-							$class_names[] = get_class( $callback['function'][0] );
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
 						}
 					// test for static method
-					} else if ( strpos( $callback['function'], '::' ) !== FALSE ) {
-						$class = explode( '::', $callback['function'] );
+					} else if (strpos($callback['function'], '::') !== FALSE) {
+						$class = explode('::', $callback['function']);
 						$class_names[] = $class[0];
 					} else {
 						// just a function
@@ -116,24 +116,24 @@ 
 	 * 	@param		string 	$property
 	 * 	@return 		boolean
 	 */
-	public static function has_property( $class = NULL, $property = NULL ) {
+	public static function has_property($class = NULL, $property = NULL) {
 		// if $class or $property don't exist, then get out, cuz that would be like... fatal dude
-		if ( empty( $class ) || empty( $property )) {
+		if (empty($class) || empty($property)) {
 			return FALSE;
 		}
 		// if your hosting company doesn't cut the mustard
-		if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+		if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 			// just in case $class is an actual instantiated object
-			if ( is_object( $class )) {
-				return isset( $class->{$property} ) ? TRUE : FALSE;
+			if (is_object($class)) {
+				return isset($class->{$property} ) ? TRUE : FALSE;
 			} else {
 				// use reflection for < PHP 5.3 to get details using just the class name
-				$reflector = new ReflectionClass( $class );
-				return $reflector->hasProperty( $property );
+				$reflector = new ReflectionClass($class);
+				return $reflector->hasProperty($property);
 			}
 		} else {
 			// or try regular property exists method which works as expected in PHP 5.3+
-			return property_exists( $class, $property );
+			return property_exists($class, $property);
 		}
 	}
 
@@ -143,7 +143,7 @@ 
 
 
 // if PHP version < 5.3
-if ( ! function_exists( 'get_called_class' )) {
+if ( ! function_exists('get_called_class')) {
 	/**
 	 * @return string
 	 */

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/helpers/EEH_Sideloader.helper.php

Spacing +37 added lines, -37 removed lines

@@ -28,7 +28,7 @@ 
 
 
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 class EEH_Sideloader extends EEH_Base {
 
 	private $_upload_to;
@@ -43,8 +43,8 @@ 
 	 * @access public
 	 * @param array $init array fo initializing the sideloader if keys match the properties.
 	 */
-	public function __construct( $init = array() ) {
-		$this->_init( $init );
+	public function __construct($init = array()) {
+		$this->_init($init);
 	}
 
 
@@ -55,24 +55,24 @@ 
 	 * @param  array  $init array on init (keys match properties others ignored)
 	 * @return void
 	 */
-	private function _init( $init ) {
+	private function _init($init) {
 		$defaults = array(
 			'_upload_to' => $this->_get_wp_uploads_dir(),
 			'_upload_from' => '',
 			'_permissions' => 0644,
-			'_new_file_name' => 'EE_Sideloader_' . uniqid() . '.default'
+			'_new_file_name' => 'EE_Sideloader_'.uniqid().'.default'
 			);
 
-		$props = array_merge( $defaults, $init );
+		$props = array_merge($defaults, $init);
 
-		foreach ( $props as $key => $val ) {
-			if ( EEH_Class_Tools::has_property( $this, $key ) ) {
+		foreach ($props as $key => $val) {
+			if (EEH_Class_Tools::has_property($this, $key)) {
 				$this->{$key} = $val;
 			}
 		}
 
 		//make sure we include the required wp file for needed functions
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		require_once(ABSPATH.'wp-admin/includes/file.php');
 	}
 
 
@@ -80,16 +80,16 @@ 
 	private function _get_wp_uploads_dir() {}
 
 	//setters
-	public function set_upload_to( $upload_to_folder ) {
+	public function set_upload_to($upload_to_folder) {
 		$this->_upload_to = $upload_to_folder;
 	}
-	public function set_upload_from( $upload_from_folder ) {
+	public function set_upload_from($upload_from_folder) {
 		$this->_upload_from_folder = $upload_from_folder;
 	}
-	public function set_permissions( $permissions ) {
+	public function set_permissions($permissions) {
 		$this->_permissions = $permissions;
 	}
-	public function set_new_file_name( $new_file_name ) {
+	public function set_new_file_name($new_file_name) {
 		$this->_new_file_name = $new_file_name;
 	}
 
@@ -111,34 +111,34 @@ 
 	//upload methods
 	public function sideload() {
 		//setup temp dir
-		$temp_file = wp_tempnam( $this->_upload_from );
+		$temp_file = wp_tempnam($this->_upload_from);
 
-		if ( !$temp_file ) {
-			EE_Error::add_error( __('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $temp_file) {
+			EE_Error::add_error(__('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		do_action( 'AHEE__EEH_Sideloader__sideload__before', $this, $temp_file );
+		do_action('AHEE__EEH_Sideloader__sideload__before', $this, $temp_file);
 
-		$wp_remote_args = apply_filters( 'FHEE__EEH_Sideloader__sideload__wp_remote_args', array( 'timeout' => 500, 'stream' => true, 'filename' => $temp_file ), $this, $temp_file );
+		$wp_remote_args = apply_filters('FHEE__EEH_Sideloader__sideload__wp_remote_args', array('timeout' => 500, 'stream' => true, 'filename' => $temp_file), $this, $temp_file);
 
-		$response = wp_safe_remote_get( $this->_upload_from, $wp_remote_args );
+		$response = wp_safe_remote_get($this->_upload_from, $wp_remote_args);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $temp_file );
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				EE_Error::add_error( sprintf( __('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export( $response, true ), $this->_upload_from ), __FILE__, __FUNCTION__, __LINE__ );
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
+			unlink($temp_file);
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				EE_Error::add_error(sprintf(__('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export($response, true), $this->_upload_from), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return false;
 		}
 
 		//possible md5 check
-		$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-		if ( $content_md5 ) {
-			$md5_check = verify_file_md5( $temp_file, $content_md5 );
-			if ( is_wp_error( $md5_check ) ) {
-				unlink( $temp_file );
-				EE_Error::add_error( $md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+		$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+		if ($content_md5) {
+			$md5_check = verify_file_md5($temp_file, $content_md5);
+			if (is_wp_error($md5_check)) {
+				unlink($temp_file);
+				EE_Error::add_error($md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -146,24 +146,24 @@ 
 		$file = $temp_file;
 
 		//now we have the file, let's get it in the right directory with the right name.
-		$path = apply_filters( 'FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to . $this->_new_file_name, $this );
+		$path = apply_filters('FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to.$this->_new_file_name, $this);
 
 		//move file in
-		if ( false === @ rename( $file, $path ) ) {
-			unlink( $temp_file );
-			EE_Error::add_error(  sprintf( __('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso' ), $path ), __FILE__, __FUNCTION__, __LINE__ );
+		if (false === @ rename($file, $path)) {
+			unlink($temp_file);
+			EE_Error::add_error(sprintf(__('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso'), $path), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//set permissions
-		$permissions = apply_filters( 'FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this );
-		chmod( $path, $permissions );
+		$permissions = apply_filters('FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this);
+		chmod($path, $permissions);
 
 		//that's it.  let's allow for actions after file uploaded.
-		do_action( 'AHEE__EE_Sideloader__sideload_after', $this, $path );
+		do_action('AHEE__EE_Sideloader__sideload_after', $this, $path);
 
 		//unlink tempfile
-		@unlink( $temp_file );
+		@unlink($temp_file);
 		return true;
 	}