eventespresso / event-espresso-core

core/services/locators/FqcnLocator.php

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

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +37 added lines, -37 removed lines

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

core/services/commands/InvalidCommandHandlerException.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -25,14 +25,14 @@ 
 	 * @param  int        $code
 	 * @param  \Exception $previous
 	 */
-	public function __construct( $command_name, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($command_name, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
-				__( 'The supplied Command Handler "%1$s" does not have a valid name. It should be in the following format: "{CommandName}Handler" ', 'event_espresso' ),
+				__('The supplied Command Handler "%1$s" does not have a valid name. It should be in the following format: "{CommandName}Handler" ', 'event_espresso'),
 				$command_name
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }

core/services/commands/CommandHandlerInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -19,7 +19,7 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function handle( CommandInterface $command );
+	public function handle(CommandInterface $command);
 
 }
 // End of file CommandHandlerInterface.php

core/services/commands/CommandHandlerManagerInterface.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -19,14 +19,14 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandHandlerInterface $command_handler
 	 * @return mixed
 	 */
-	public function addCommandHandler( CommandHandlerInterface $command_handler );
+	public function addCommandHandler(CommandHandlerInterface $command_handler);
 
 
 	/**
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function getCommandHandler( CommandInterface $command );
+	public function getCommandHandler(CommandInterface $command);
 
 }
 // End of file CommandHandlerManagerInterface.php

core/services/commands/CommandHandlerNotFoundException.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -25,14 +25,14 @@ 
 	 * @param  int        $code
 	 * @param  \Exception $previous
 	 */
-	public function __construct( $command_handler_name, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($command_handler_name, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
-				__( 'The requested Command Handler "%1$s" could not be located or does not exist.', 'event_espresso' ),
+				__('The requested Command Handler "%1$s" could not be located or does not exist.', 'event_espresso'),
 				$command_handler_name
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }

core/libraries/form_sections/strategies/layout/EE_Form_Section_Layout_Base.strategy.php

Spacing +34 added lines, -34 removed lines

@@ -8,7 +8,7 @@ 
  * stating where the proper subsections should be placed (but usually leaving them to layout
  * their own headers and footers etc).
  */
-abstract class EE_Form_Section_Layout_Base{
+abstract class EE_Form_Section_Layout_Base {
 
 	/**
 	 * Form form section to lay out
@@ -21,7 +21,7 @@ 
 	/**
 	 * 	__construct
 	 */
-	function __construct(){
+	function __construct() {
 	}
 
 
@@ -30,7 +30,7 @@ 
 	 * The form section on which this strategy is to perform
 	 * @param EE_Form_Section_Proper $form
 	 */
-	function _construct_finalize(EE_Form_Section_Proper $form){
+	function _construct_finalize(EE_Form_Section_Proper $form) {
 		$this->_form_section = $form;
 	}
 
@@ -53,28 +53,28 @@ 
 	 * Returns the HTML
 	 * @return string HTML for displaying
 	 */
-	function layout_form(){
+	function layout_form() {
 		$html = '';
 		// layout_form_begin
 		$html .= apply_filters(
-			'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(),
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_'.$this->_form_section->name(),
 			$this->layout_form_begin(),
 			$this->_form_section
 		);
 		// layout_form_loop
 		$html .= apply_filters(
-			'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(),
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_'.$this->_form_section->name(),
 			$this->layout_form_loop(),
 			$this->_form_section
 		);
 		// layout_form_end
 		$html .= apply_filters(
-			'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(),
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_'.$this->_form_section->name(),
 			$this->layout_form_end(),
 			$this->_form_section
 		);
 
-		$html = $this->add_form_section_hooks_and_filters( $html );
+		$html = $this->add_form_section_hooks_and_filters($html);
 		return $html;
 	}
 
@@ -83,20 +83,20 @@ 
 	/**
 	 * @return string
 	 */
-	function layout_form_loop(){
+	function layout_form_loop() {
 		$html = '';
-		foreach( $this->_form_section->subsections() as $name => $subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
+		foreach ($this->_form_section->subsections() as $name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
 				$html .= apply_filters(
-					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_' . $name . '__in_' . $this->_form_section->name(),
-					$this->layout_input( $subsection ),
+					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'.$name.'__in_'.$this->_form_section->name(),
+					$this->layout_input($subsection),
 					$this->_form_section,
 					$subsection
 				);
-			} elseif ( $subsection instanceof EE_Form_Section_Base ){
+			} elseif ($subsection instanceof EE_Form_Section_Base) {
 				$html .= apply_filters(
-					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_' . $name . '__in_' . $this->_form_section->name(),
-					$this->layout_subsection( $subsection ),
+					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'.$name.'__in_'.$this->_form_section->name(),
+					$this->layout_subsection($subsection),
 					$this->_form_section,
 					$subsection
 				);
@@ -144,7 +144,7 @@ 
 	 * @param EE_Form_Section_Base $subsection
 	 * @return string html
 	 */
-	abstract function layout_subsection( $subsection );
+	abstract function layout_subsection($subsection);
 
 
 
@@ -153,10 +153,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function display_label($input){
-		$class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class();
-		$label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text();
-		return '<label id="' . $input->html_label_id() . '" class="' . $class . '" style="' . $input->html_label_style() . '" for="' . $input->html_name() . '">' .  $label_text . '</label>';
+	public function display_label($input) {
+		$class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class();
+		$label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text();
+		return '<label id="'.$input->html_label_id().'" class="'.$class.'" style="'.$input->html_label_style().'" for="'.$input->html_name().'">'.$label_text.'</label>';
 	}
 
 
@@ -169,10 +169,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function display_errors($input){
-		if( $input->get_validation_errors() ){
-			return  "<label  id='" . $input->html_id() . "-error' class='error' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</label>";
-		}else{
+	public function display_errors($input) {
+		if ($input->get_validation_errors()) {
+			return  "<label  id='".$input->html_id()."-error' class='error' for='{$input->html_name()}'>".$input->get_validation_error_string()."</label>";
+		} else {
 			return '';
 		}
 	}
@@ -182,10 +182,10 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function display_help_text( $input ){
-		if ( $input->html_help_text() != '' ) {
+	public function display_help_text($input) {
+		if ($input->html_help_text() != '') {
 			$tag = is_admin() ? 'p' : 'span';
-			return '<' . $tag . ' id="' . $input->html_id() . '-help" class="' . $input->html_help_class() . '" style="' . $input->html_help_style() . '">' . $input->html_help_text() . '</' . $tag . '>';
+			return '<'.$tag.' id="'.$input->html_id().'-help" class="'.$input->html_help_class().'" style="'.$input->html_help_style().'">'.$input->html_help_text().'</'.$tag.'>';
 		}
 		return '';
 	}
@@ -197,13 +197,13 @@ 
 	 * @param string $html
 	 * @return string
 	 */
-	public function add_form_section_hooks_and_filters( $html ){
+	public function add_form_section_hooks_and_filters($html) {
 		// replace dashes and spaces with underscores
-		$hook_name = str_replace( array( '-', ' ' ), '_', $this->_form_section->html_id() );
-		do_action( 'AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section );
-		$html = apply_filters( 'AFEE__Form_Section_Layout__' . $hook_name . '__html', $html, $this->_form_section );
-		$html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->';
-		$html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->';
+		$hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id());
+		do_action('AHEE__Form_Section_Layout__'.$hook_name, $this->_form_section);
+		$html = apply_filters('AFEE__Form_Section_Layout__'.$hook_name.'__html', $html, $this->_form_section);
+		$html .= EEH_HTML::nl().'<!-- AHEE__Form_Section_Layout__'.$hook_name.'__html -->';
+		$html .= EEH_HTML::nl().'<!-- AFEE__Form_Section_Layout__'.$hook_name.' -->';
 		return $html;
 	}
 

Braces +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 	public function display_errors($input){
 		if( $input->get_validation_errors() ){
 			return  "<label  id='" . $input->html_id() . "-error' class='error' for='{$input->html_name()}'>" . $input->get_validation_error_string() . "</label>";
-		}else{
+		} else{
 			return '';
 		}
 	}

admin_pages/registrations/templates/reg_status_change_buttons.template.php

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@ 
 <div id="reg-admin-approve-decline-reg-status-dv">
 
 	<h2 id="reg-admin-reg-details-reg-status-hdr">
-		<?php echo __( 'Current Registration Status : ', 'event_espresso' ); ?>
+		<?php echo __('Current Registration Status : ', 'event_espresso'); ?>
 		<span class="<?php echo $reg_status_class; ?> bigger-text"><?php echo $reg_status_value; ?></span>
 	</h2>
-	<?php do_action( 'AHEE__reg_status_change_buttons__after_header', $REG_ID ); ?>
+	<?php do_action('AHEE__reg_status_change_buttons__after_header', $REG_ID); ?>
 
 	<h3 id="reg-admin-reg-details-reg-status-hdr">
-		<?php echo __( 'Change Registration Status to :', 'event_espresso' ); ?>
+		<?php echo __('Change Registration Status to :', 'event_espresso'); ?>
 	</h3>
 
 	<form id="reg_status_change_form" method="POST" action="<?php echo $form_url; ?>">
@@ -16,15 +16,15 @@ 
 		<input type="hidden" name="return" value="view_registration">
 		<?php echo $nonce; ?>
 		<?php echo $status_buttons; ?>
-		<?php if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'registration_message_type' ) ) : ?>
+		<?php if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'registration_message_type')) : ?>
 			<span id="send-related-messages-dv">
-			<label for="txn-reg-status-send-notifications-inp" class="important-notice"><?php _e( '...and send related messages ?', 'event_espresso' ); ?>
+			<label for="txn-reg-status-send-notifications-inp" class="important-notice"><?php _e('...and send related messages ?', 'event_espresso'); ?>
 				<input type="checkbox" value="1" id="txn-reg-status-send-notifications-inp" name="txn_reg_status_change[send_notifications]">
 			</label>
 			<br/>
 		</span>
 			<br/>
-			<p class="description"><?php _e( 'If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.', 'event_espresso' ); ?></p>
+			<p class="description"><?php _e('If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.', 'event_espresso'); ?></p>
 		<?php endif; ?>
 	</form>
 </div>

core/exceptions/ExceptionStackTraceDisplay.php

Indentation +24 added lines, -24 removed lines

@@ -118,10 +118,10 @@ 
 			// add generic non-identifying messages for non-privileged users
 			if ( ! WP_DEBUG ) {
 				$output .= '<span class="ee-error-user-msg-spn">'
-				           . trim( $msg )
-				           . '</span> &nbsp; <sup>'
-				           . $code
-				           . '</sup><br />';
+						   . trim( $msg )
+						   . '</span> &nbsp; <sup>'
+						   . $code
+						   . '</sup><br />';
 			} else {
 				// or helpful developer messages if debugging is on
 				$output .= '
@@ -130,39 +130,39 @@ 
 				'
 				. sprintf(
 					__( '%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso' ),
-				    '<strong class="ee-error-dev-msg-str">',
+					'<strong class="ee-error-dev-msg-str">',
 					get_class( $exception ),
 					'</strong>  &nbsp; <span>',
 					$code . '</span>'
 				)
 				. '<br />
 				<span class="big-text">"'
-				           . trim( $msg )
-				           . '"</span><br/>
+						   . trim( $msg )
+						   . '"</span><br/>
 				<a id="display-ee-error-trace-1'
-				           . $time
-				           . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-1'
-				           . $time
-				           . '">
+						   . $time
+						   . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-1'
+						   . $time
+						   . '">
 					'
-				           . __( 'click to view backtrace and class/method details', 'event_espresso' )
-				           . '
+						   . __( 'click to view backtrace and class/method details', 'event_espresso' )
+						   . '
 				</a><br />
 				'
-				           . $exception->getFile()
-				           . sprintf(
-					           __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ),
-					           ' &nbsp; <span class="small-text lt-grey-text">',
-					           $exception->getLine(),
-					           '</span>'
-				           )
-				           . '
+						   . $exception->getFile()
+						   . sprintf(
+							   __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ),
+							   ' &nbsp; <span class="small-text lt-grey-text">',
+							   $exception->getLine(),
+							   '</span>'
+						   )
+						   . '
 			</p>
 			<div id="ee-error-trace-1'
-				           . $time
-				           . '-dv" class="ee-error-trace-dv" style="display: none;">
+						   . $time
+						   . '-dv" class="ee-error-trace-dv" style="display: none;">
 				'
-				           . $trace_details;
+						   . $trace_details;
 				if ( ! empty( $class ) ) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #999; background:#fff; border-radius:3px;">

Spacing +99 added lines, -99 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');
 }
 
 
@@ -22,9 +22,9 @@ 
 	/**
 	 * @param \Exception $exception
 	 */
-	public function __construct( \Exception $exception ) {
-		if ( WP_DEBUG ) {
-			$this->displayException( $exception );
+	public function __construct(\Exception $exception) {
+		if (WP_DEBUG) {
+			$this->displayException($exception);
 		}
 	}
 
@@ -34,27 +34,27 @@ 
 	 * @access protected
 	 * @param \Exception $exception
 	 */
-	protected function displayException( \Exception $exception ) {
+	protected function displayException(\Exception $exception) {
 
 		$error_code = '';
 		$trace_details = '';
 		$time = time();
 		$trace = $exception->getTrace();
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $exception->getMessage() );
+		$msg = explode('||', $exception->getMessage());
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// start gathering output
 		$output = $this->exceptionStyles();
 		$output .= '
 <div id="ee-error-message" class="error">';
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	<p>';
 		}
 			// process trace info
-			if ( empty( $trace ) ) {
+			if (empty($trace)) {
 				$trace_details .= __(
 					'Sorry, but no trace information was available for this exception.',
 					'event_espresso'
@@ -67,47 +67,47 @@ 
 					<th scope="col" align="right" style="width:2.5%;">#</th>
 					<th scope="col" align="right" style="width:3.5%;">Line</th>
 					<th scope="col" align="left" style="width:40%;">File</th>
-					<th scope="col" align="left">' . __( 'Class', 'event_espresso' ) . '->' . __( 'Method( arguments )', 'event_espresso' ) . '</th>
+					<th scope="col" align="left">' . __('Class', 'event_espresso').'->'.__('Method( arguments )', 'event_espresso').'</th>
 				</tr>';
-				$last_on_stack = count( $trace ) - 1;
+				$last_on_stack = count($trace) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $trace );
-				foreach ( $sorted_trace as $nmbr => $trace ) {
-					$file = isset( $trace['file'] ) ? $trace['file'] : '';
-					$class = isset( $trace['class'] ) ? $trace['class'] : '';
-					$type = isset( $trace['type'] ) ? $trace['type'] : '';
-					$function = isset( $trace['function'] ) ? $trace['function'] : '';
-					$args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : '';
-					$args = isset( $trace['args'] ) && count( $trace['args'] ) > 4  ? ' <br />' . $args . '<br />' : $args;
-					$line = isset( $trace['line'] ) ? $trace['line'] : '';
+				$sorted_trace = array_reverse($trace);
+				foreach ($sorted_trace as $nmbr => $trace) {
+					$file = isset($trace['file']) ? $trace['file'] : '';
+					$class = isset($trace['class']) ? $trace['class'] : '';
+					$type = isset($trace['type']) ? $trace['type'] : '';
+					$function = isset($trace['function']) ? $trace['function'] : '';
+					$args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : '';
+					$args = isset($trace['args']) && count($trace['args']) > 4 ? ' <br />'.$args.'<br />' : $args;
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$zebra = $nmbr % 2 !== 0 ? ' odd' : '';
-					if ( empty( $file ) && ! empty( $class ) ) {
-						$a = new \ReflectionClass( $class );
+					if (empty($file) && ! empty($class)) {
+						$a = new \ReflectionClass($class);
 						$file = $a->getFileName();
-						if ( empty( $line ) && ! empty( $function ) ) {
-							$b = new \ReflectionMethod( $class, $function );
+						if (empty($line) && ! empty($function)) {
+							$b = new \ReflectionMethod($class, $function);
 							$line = $b->getStartLine();
 						}
 					}
-					if ( $nmbr === $last_on_stack ) {
+					if ($nmbr === $last_on_stack) {
 						$file = $exception->getFile() !== '' ? $exception->getFile() : $file;
 						$line = $exception->getLine() !== '' ? $exception->getLine() : $line;
-						$error_code = $this->generate_error_code( $file, $trace['function'], $line );
+						$error_code = $this->generate_error_code($file, $trace['function'], $line);
 					}
-					$file = \EEH_File::standardise_directory_separators( $file );
-					$nmbr = ! empty( $nmbr ) ? $nmbr : '&nbsp;';
-					$line = ! empty( $line ) ? $line : '&nbsp;';
-					$file = ! empty( $file ) ? $file : '&nbsp;';
-					$class_display = ! empty( $class ) ? $class : '';
-					$type = ! empty( $type ) ? $type : '';
-					$function = ! empty( $function ) ? $function : '';
-					$args = ! empty( $args ) ? '( ' . $args . ' )' : '()';
+					$file = \EEH_File::standardise_directory_separators($file);
+					$nmbr = ! empty($nmbr) ? $nmbr : '&nbsp;';
+					$line = ! empty($line) ? $line : '&nbsp;';
+					$file = ! empty($file) ? $file : '&nbsp;';
+					$class_display = ! empty($class) ? $class : '';
+					$type = ! empty($type) ? $type : '';
+					$function = ! empty($function) ? $function : '';
+					$args = ! empty($args) ? '( '.$args.' )' : '()';
 					$trace_details .= '
 					<tr>
-						<td align="right" valign="top" class="' . $zebra . '">' . $nmbr . '</td>
-						<td align="right" valign="top" class="' . $zebra . '">' . $line . '</td>
-						<td align="left" valign="top" class="' . $zebra . '">' . $file . '</td>
-						<td align="left" valign="top" class="' . $zebra . '">' . $class_display . $type . $function . $args . '</td>
+						<td align="right" valign="top" class="' . $zebra.'">'.$nmbr.'</td>
+						<td align="right" valign="top" class="' . $zebra.'">'.$line.'</td>
+						<td align="left" valign="top" class="' . $zebra.'">'.$file.'</td>
+						<td align="left" valign="top" class="' . $zebra.'">'.$class_display.$type.$function.$args.'</td>
 					</tr>';
 				}
 				$trace_details .= '
@@ -116,9 +116,9 @@ 
 			}
 			$code = $exception->getCode() ? $exception->getCode() : $error_code;
 			// add generic non-identifying messages for non-privileged users
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 				$output .= '<span class="ee-error-user-msg-spn">'
-				           . trim( $msg )
+				           . trim($msg)
 				           . '</span> &nbsp; <sup>'
 				           . $code
 				           . '</sup><br />';
@@ -129,15 +129,15 @@ 
 			<p class="ee-error-dev-msg-pg">
 				'
 				. sprintf(
-					__( '%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso' ),
+					__('%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso'),
 				    '<strong class="ee-error-dev-msg-str">',
-					get_class( $exception ),
+					get_class($exception),
 					'</strong>  &nbsp; <span>',
-					$code . '</span>'
+					$code.'</span>'
 				)
 				. '<br />
 				<span class="big-text">"'
-				           . trim( $msg )
+				           . trim($msg)
 				           . '"</span><br/>
 				<a id="display-ee-error-trace-1'
 				           . $time
@@ -145,13 +145,13 @@ 
 				           . $time
 				           . '">
 					'
-				           . __( 'click to view backtrace and class/method details', 'event_espresso' )
+				           . __('click to view backtrace and class/method details', 'event_espresso')
 				           . '
 				</a><br />
 				'
 				           . $exception->getFile()
 				           . sprintf(
-					           __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ),
+					           __('%1$s( line no: %2$s )%3$s', 'event_espresso'),
 					           ' &nbsp; <span class="small-text lt-grey-text">',
 					           $exception->getLine(),
 					           '</span>'
@@ -163,14 +163,14 @@ 
 				           . '-dv" class="ee-error-trace-dv" style="display: none;">
 				'
 				           . $trace_details;
-				if ( ! empty( $class ) ) {
+				if ( ! empty($class)) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #999; background:#fff; border-radius:3px;">
 					<div style="padding:1em 2em; border:1px solid #999; background:#fcfcfc;">
-						<h3>' . __( 'Class Details', 'event_espresso' ) . '</h3>';
-					$a = new \ReflectionClass( $class );
+						<h3>' . __('Class Details', 'event_espresso').'</h3>';
+					$a = new \ReflectionClass($class);
 					$output .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -180,16 +180,16 @@ 
 		<br />';
 			}
 		// remove last linebreak
-		$output = substr( $output, 0, count( $output ) - 7 );
-		if ( ! WP_DEBUG ) {
+		$output = substr($output, 0, count($output) - 7);
+		if ( ! WP_DEBUG) {
 			$output .= '
 	</p>';
 		}
 		$output .= '
 </div>';
-		$output .= $this->printScripts( true );
-		if ( defined( 'DOING_AJAX' ) ) {
-			echo wp_json_encode( array( 'error' => $output ) );
+		$output .= $this->printScripts(true);
+		if (defined('DOING_AJAX')) {
+			echo wp_json_encode(array('error' => $output));
 			exit();
 		}
 		echo $output;
@@ -206,56 +206,56 @@ 
 	 * @param bool  $array
 	 * @return string
 	 */
-	private function _convert_args_to_string( $arguments = array(), $indent = 0, $array = false ) {
+	private function _convert_args_to_string($arguments = array(), $indent = 0, $array = false) {
 		$args = array();
-		$args_count = count( $arguments );
-		if ( $args_count > 2 ) {
+		$args_count = count($arguments);
+		if ($args_count > 2) {
 			$indent++;
 			$args[] = '<br />';
 		}
 		$x = 0;
-		foreach ( $arguments as $arg ) {
+		foreach ($arguments as $arg) {
 			$x++;
-			for( $i = 0; $i < $indent; $i++ ) {
+			for ($i = 0; $i < $indent; $i++) {
 				$args[] = ' &nbsp;&nbsp; ';
 			}
-			if ( is_string( $arg ) ) {
-				if ( ! $array && strlen( $arg ) > 75 ) {
+			if (is_string($arg)) {
+				if ( ! $array && strlen($arg) > 75) {
 					$args[] = "<br />";
-					for ( $i = 0; $i <= $indent; $i++ ) {
+					for ($i = 0; $i <= $indent; $i++) {
 						$args[] = ' &nbsp;&nbsp; ';
 					}
-					$args[] = "'" . $arg . "'<br />";
+					$args[] = "'".$arg."'<br />";
 				} else {
-					$args[] = " '" . $arg . "'";
+					$args[] = " '".$arg."'";
 				}
-			} elseif ( is_array( $arg ) ) {
-				$arg_count = count( $arg );
-				if ( $arg_count > 2 ) {
+			} elseif (is_array($arg)) {
+				$arg_count = count($arg);
+				if ($arg_count > 2) {
 					$indent++;
-					$args[] = " array(" . $this->_convert_args_to_string( $arg, $indent, true ) . ")";
+					$args[] = " array(".$this->_convert_args_to_string($arg, $indent, true).")";
 					$indent--;
-				} else if ( $arg_count === 0 ) {
+				} else if ($arg_count === 0) {
 					$args[] = " array()";
 				} else {
-					$args[] = " array( " . $this->_convert_args_to_string( $arg ) . " )";
+					$args[] = " array( ".$this->_convert_args_to_string($arg)." )";
 				}
-			} elseif ( $arg === null ) {
+			} elseif ($arg === null) {
 				$args[] = ' null';
-			} elseif ( is_bool( $arg ) ) {
+			} elseif (is_bool($arg)) {
 				$args[] = $arg ? ' true' : ' false';
-			} elseif ( is_object( $arg ) ) {
-				$args[] = get_class( $arg );
-			} elseif ( is_resource( $arg ) ) {
-				$args[] = get_resource_type( $arg );
+			} elseif (is_object($arg)) {
+				$args[] = get_class($arg);
+			} elseif (is_resource($arg)) {
+				$args[] = get_resource_type($arg);
 			} else {
 				$args[] = $arg;
 			}
-			if ( $x === $args_count ) {
-				if ( $args_count > 2 ) {
+			if ($x === $args_count) {
+				if ($args_count > 2) {
 					$args[] = "<br />";
 					$indent--;
-					for ( $i = 1; $i < $indent; $i++ ) {
+					for ($i = 1; $i < $indent; $i++) {
 						$args[] = ' &nbsp;&nbsp; ';
 					}
 				}
@@ -263,7 +263,7 @@ 
 				$args[] = $args_count > 2 ? ",<br />" : ', ';
 			}
 		}
-		return implode( '', $args );
+		return implode('', $args);
 	}
 
 
@@ -278,11 +278,11 @@ 
 	 * @param string $line
 	 * @return string
 	 */
-	protected function generate_error_code( $file = '', $func = '', $line = '' ) {
-		$file_bits = explode( '.', basename( $file ) );
-		$error_code = ! empty( $file_bits[0] ) ? $file_bits[0] : '';
-		$error_code .= ! empty( $func ) ? ' - ' . $func : '';
-		$error_code .= ! empty( $line ) ? ' - ' . $line : '';
+	protected function generate_error_code($file = '', $func = '', $line = '') {
+		$file_bits = explode('.', basename($file));
+		$error_code = ! empty($file_bits[0]) ? $file_bits[0] : '';
+		$error_code .= ! empty($func) ? ' - '.$func : '';
+		$error_code .= ! empty($line) ? ' - '.$line : '';
 		return $error_code;
 	}
 
@@ -366,26 +366,26 @@ 
 	 * @param bool $force_print
 	 * @return string|void
 	 */
-	private function printScripts( $force_print = false ) {
-		if ( ! $force_print  && ( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' ) ) ) {
-			if ( wp_script_is( 'ee_error_js', 'enqueued' ) ) {
+	private function printScripts($force_print = false) {
+		if ( ! $force_print && (did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts'))) {
+			if (wp_script_is('ee_error_js', 'enqueued')) {
 				return '';
-			} else if ( wp_script_is( 'ee_error_js', 'registered' ) ) {
-				add_filter( 'FHEE_load_css', '__return_true' );
-				add_filter( 'FHEE_load_js', '__return_true' );
-				wp_enqueue_script( 'ee_error_js' );
-				wp_localize_script( 'ee_error_js', 'ee_settings', array( 'wp_debug' => WP_DEBUG ) );
+			} else if (wp_script_is('ee_error_js', 'registered')) {
+				add_filter('FHEE_load_css', '__return_true');
+				add_filter('FHEE_load_js', '__return_true');
+				wp_enqueue_script('ee_error_js');
+				wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug' => WP_DEBUG));
 			}
 		} else {
 			return '
 <script>
 /* <![CDATA[ */
-var ee_settings = {"wp_debug":"' . WP_DEBUG . '"};
+var ee_settings = {"wp_debug":"' . WP_DEBUG.'"};
 /* ]]> */
 </script>
-<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
+<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
 ';
 		}
 		return '';

core/libraries/form_sections/form_handlers/InvalidFormHandlerException.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\form_sections\form_handlers;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -26,8 +26,8 @@ 
 	 * @param int        $code
 	 * @param \Exception $previous
 	 */
-	public function __construct( $actual, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($actual, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
 				__(
 					'A valid Form Handler was expected but instead "%1$s" was received.',
@@ -36,7 +36,7 @@ 
 				$actual
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }