eventespresso / event-espresso-core

core/exceptions/BaseException.php

Spacing +4 added lines, -4 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');
 }
 
 
@@ -25,8 +25,8 @@ 
 	 * @param \Exception $previous
 	 * @throws \EventEspresso\Core\Exceptions\BaseException
 	 */
-	public function __construct( $message, $code = 0, \Exception $previous = null ) {
-		parent::__construct( $message, $code, $previous );
+	public function __construct($message, $code = 0, \Exception $previous = null) {
+		parent::__construct($message, $code, $previous);
 	}
 
 

core/exceptions/ExceptionHandler.php

Indentation +50 added lines, -50 removed lines

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

Spacing +94 added lines, -94 removed lines

@@ -3,8 +3,8 @@ 
 
 use Exception;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -47,7 +47,7 @@ 
 	 * @param \Exception      $exception
 	 * @param ExceptionLogger $logger
 	 */
-	public function __construct( Exception $exception, ExceptionLogger $logger = null ) {
+	public function __construct(Exception $exception, ExceptionLogger $logger = null) {
 		$this->time = time();
 		$this->exception = $exception;
 		$this->logger = $logger;
@@ -58,8 +58,8 @@ 
 
 	public function display() {
 		$this->format_error();
-		if ( defined( 'DOING_AJAX' ) ) {
-			echo json_encode( array( 'error' => $this->pretty_exception ) );
+		if (defined('DOING_AJAX')) {
+			echo json_encode(array('error' => $this->pretty_exception));
 			exit();
 		}
 		echo $this->pretty_exception;
@@ -75,8 +75,8 @@ 
 
 
 	public function log() {
-		if ( ! $this->logger instanceof ExceptionLogger ) {
-			$this->logger = new ExceptionLogger( $this->exception );
+		if ( ! $this->logger instanceof ExceptionLogger) {
+			$this->logger = new ExceptionLogger($this->exception);
 		}
 		$this->logger->log();
 	}
@@ -100,20 +100,20 @@ 
 		$error_code = '';
 		$trace_details = '';
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $this->exception->getMessage() );
+		$msg = explode('||', $this->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;
 		$backtrace = $this->exception->getTrace();
 		$this->pretty_exception = ExceptionHandler::_exception_styles();
 		$this->pretty_exception .= '
 <div id="ee-error-message" class="error">';
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$this->pretty_exception .= '
 	<p>';
 		}
 			// process trace info
-			if ( empty( $backtrace ) ) {
+			if (empty($backtrace)) {
 				$trace_details .= __(
 					'Sorry, but no trace information was available for this exception.',
 					'event_espresso'
@@ -126,45 +126,45 @@ 
 					<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' ) . '->' . __(
+					<th scope="col" align="left">' . __('Class', 'event_espresso').'->'.__(
 						'Method( arguments )',
 						'event_espresso'
-					) . '</th>
+					).'</th>
 				</tr>';
-				$last_on_stack = count( $backtrace ) - 1;
+				$last_on_stack = count($backtrace) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $backtrace );
-				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 />'
+				$sorted_trace = array_reverse($backtrace);
+				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'] : '';
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$corellian_bloodstripe = $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 = $this->exception->getFile() !== '' ? $this->exception->getFile() : $file;
 						$line = $this->exception->getLine() !== '' ? $this->exception->getLine() : $line;
-						$error_code = self::generate_error_code( $file, $trace['function'], $line );
+						$error_code = self::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="'
@@ -198,9 +198,9 @@ 
 			}
 		$error_code = $this->exception->getCode() ? $this->exception->getCode() : $error_code;
 			// add generic non-identifying messages for non-privileged users
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 				$this->pretty_exception .= '<span class="ee-error-user-msg-spn">'
-				           . trim( $msg )
+				           . trim($msg)
 				           . '</span> &nbsp; <sup>'
 				           . $error_code
 				           . '</sup><br />';
@@ -211,15 +211,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( $this->exception ),
+					           get_class($this->exception),
 					           '</strong>  &nbsp; <span>',
-					           $error_code . '</span>'
+					           $error_code.'</span>'
 				           )
 				           . '<br />
 				<span class="big-text">"'
-				           . trim( $msg )
+				           . trim($msg)
 				           . '"</span><br/>
 				<a id="display-ee-error-trace'
 				           . $this->time
@@ -227,13 +227,13 @@ 
 				           . $this->time
 				           . '">
 					'
-				           . __( 'click to view backtrace and class/method details', 'event_espresso' )
+				           . __('click to view backtrace and class/method details', 'event_espresso')
 				           . '
 				</a><br />
 				'
 				           . $this->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">',
 					           $this->exception->getLine(),
 					           '</span>'
@@ -245,14 +245,14 @@ 
 				           . '-dv" class="ee-error-trace-dv" style="display: none;">
 				'
 				           . $trace_details;
-				if ( ! empty( $class ) ) {
+				if ( ! empty($class)) {
 					$this->pretty_exception .= '
 				<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);
 					$this->pretty_exception .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -264,13 +264,13 @@ 
 
 		// remove last linebreak
 		// $this->pretty_exception = substr( $this->pretty_exception, 0, count( $this->pretty_exception ) - 7 );
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$this->pretty_exception .= '
 	</p>';
 		}
 		$this->pretty_exception .= '
 </div>';
-		$this->pretty_exception .= self::_print_scripts( true );
+		$this->pretty_exception .= self::_print_scripts(true);
 	}
 
 
@@ -283,56 +283,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; ';
 					}
 				}
@@ -340,7 +340,7 @@ 
 				$args[] = $args_count > 2 ? ",<br />" : ', ';
 			}
 		}
-		return implode( '', $args );
+		return implode('', $args);
 	}
 
 
@@ -355,11 +355,11 @@ 
 	 * @param string $line
 	 * @return string
 	 */
-	public static 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 : '';
+	public static 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;
 	}
 
@@ -438,26 +438,26 @@ 
 	 * @param bool $force_print
 	 * @return string|void
 	 */
-	private static function _print_scripts( $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 static function _print_scripts($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 '';