gamernetwork / yolk-core

src/exceptions/Handler.php

Spacing +18 added lines, -18 removed lines

@@ -23,14 +23,14 @@ 
 	 * @param int     $line
 	 * @return void
 	 */
-	public static function error( $severity, $message, $file, $line ) {
+	public static function error($severity, $message, $file, $line) {
 
 		// Latest Twig raises a warning when accessing missing cached views - we can ignore it
-		if( preg_match('/filemtime/', $message) )
+		if (preg_match('/filemtime/', $message))
 			return;
 
 		// if the error was a type hint failure then throw an InvalidArgumentException instead
-		elseif( preg_match('/^Argument (\d+) passed to ([\w\\\\]+)::(\w+)\(\) must be an instance of ([\w\\\\]+), ([\w\\\\]+) given, called in ([\w\s\.\/_-]+) on line (\d+)/', $message, $m) )
+		elseif (preg_match('/^Argument (\d+) passed to ([\w\\\\]+)::(\w+)\(\) must be an instance of ([\w\\\\]+), ([\w\\\\]+) given, called in ([\w\s\.\/_-]+) on line (\d+)/', $message, $m))
 			throw new \InvalidArgumentException("Argument {$m[1]} to {$m[2]}::{$m[3]}() should be an instance of {$m[4]}, {$m[5]} given", $severity, new \ErrorException($message, 0, $severity, $m[6], $m[7]));
 
 		// convert the error to an exception
@@ -44,17 +44,17 @@ 
 	 * @param string     $error_page   the file containing the error page to include for production web apps
 	 * @return void
 	 */
-	public static function exception( \Exception $error, $error_page, $log = true ) {
+	public static function exception(\Exception $error, $error_page, $log = true) {
 
-		if( $log )
+		if ($log)
 			static::logException($error);
 
-		if( Yolk::isCLI() ) {
+		if (Yolk::isCLI()) {
 			Yolk::dump($error);
 		}
 		// debug web app
-		elseif( Yolk::isDebug() ) {
-			require __DIR__. '/error.debug.php';
+		elseif (Yolk::isDebug()) {
+			require __DIR__.'/error.debug.php';
 		}
 		// production web app
 		else {
@@ -68,15 +68,15 @@ 
 	 * @param \Exception $error
 	 * @return void
 	 */
-	public static function logException( \Exception $error ) {
+	public static function logException(\Exception $error) {
 
 		// fatal errors will already have been error_log()'d
-		if( !static::isFatal($error) ) {
-			$location = $error->getFile(). ':'. $error->getLine();
+		if (!static::isFatal($error)) {
+			$location = $error->getFile().':'.$error->getLine();
 			// type hinting error - make sure we give the correct location
-			if( ($error instanceof \InvalidArgumentException) && ($error->getPrevious() instanceof \ErrorException) )
-				$location = $error->getPrevious()->getFile(). ':'. $error->getPrevious()->getLine();
-			error_log(get_class($error). ': '. $error->getMessage(). " [{$location}]");
+			if (($error instanceof \InvalidArgumentException) && ($error->getPrevious() instanceof \ErrorException))
+				$location = $error->getPrevious()->getFile().':'.$error->getPrevious()->getLine();
+			error_log(get_class($error).': '.$error->getMessage()." [{$location}]");
 		}
 
 	}
@@ -87,7 +87,7 @@ 
 	 */
 	public static function checkFatal() {
 		$error = error_get_last();
-		if( $error && static::isFatal($error['type']) ) {
+		if ($error && static::isFatal($error['type'])) {
 			Yolk::exception(new \ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line']));
 		}
 	}
@@ -97,14 +97,14 @@ 
 	 * @param  \Exception|integer  $error
 	 * @return boolean
 	 */
-	protected static function isFatal( $error ) {
+	protected static function isFatal($error) {
 
-		if( $error instanceof \Exception )
+		if ($error instanceof \Exception)
 			return false;
 
 		$fatal = E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR;
 
-		if( $error instanceof \ErrorException )
+		if ($error instanceof \ErrorException)
 			$error = $error->getSeverity();
 
 		return (bool) ($error & $fatal);

Braces +18 added lines, -12 removed lines

@@ -26,12 +26,14 @@ 
 	public static function error( $severity, $message, $file, $line ) {
 
 		// Latest Twig raises a warning when accessing missing cached views - we can ignore it
-		if( preg_match('/filemtime/', $message) )
-			return;
+		if( preg_match('/filemtime/', $message) ) {
+					return;
+		}
 
 		// if the error was a type hint failure then throw an InvalidArgumentException instead
-		elseif( preg_match('/^Argument (\d+) passed to ([\w\\\\]+)::(\w+)\(\) must be an instance of ([\w\\\\]+), ([\w\\\\]+) given, called in ([\w\s\.\/_-]+) on line (\d+)/', $message, $m) )
-			throw new \InvalidArgumentException("Argument {$m[1]} to {$m[2]}::{$m[3]}() should be an instance of {$m[4]}, {$m[5]} given", $severity, new \ErrorException($message, 0, $severity, $m[6], $m[7]));
+		elseif( preg_match('/^Argument (\d+) passed to ([\w\\\\]+)::(\w+)\(\) must be an instance of ([\w\\\\]+), ([\w\\\\]+) given, called in ([\w\s\.\/_-]+) on line (\d+)/', $message, $m) ) {
+					throw new \InvalidArgumentException("Argument {$m[1]} to {$m[2]}::{$m[3]}() should be an instance of {$m[4]}, {$m[5]} given", $severity, new \ErrorException($message, 0, $severity, $m[6], $m[7]));
+		}
 
 		// convert the error to an exception
 		throw new \ErrorException($message, 0, $severity, $file, $line);
@@ -46,8 +48,9 @@ 
 	 */
 	public static function exception( \Exception $error, $error_page, $log = true ) {
 
-		if( $log )
-			static::logException($error);
+		if( $log ) {
+					static::logException($error);
+		}
 
 		if( Yolk::isCLI() ) {
 			Yolk::dump($error);
@@ -74,8 +77,9 @@ 
 		if( !static::isFatal($error) ) {
 			$location = $error->getFile(). ':'. $error->getLine();
 			// type hinting error - make sure we give the correct location
-			if( ($error instanceof \InvalidArgumentException) && ($error->getPrevious() instanceof \ErrorException) )
-				$location = $error->getPrevious()->getFile(). ':'. $error->getPrevious()->getLine();
+			if( ($error instanceof \InvalidArgumentException) && ($error->getPrevious() instanceof \ErrorException) ) {
+							$location = $error->getPrevious()->getFile(). ':'. $error->getPrevious()->getLine();
+			}
 			error_log(get_class($error). ': '. $error->getMessage(). " [{$location}]");
 		}
 
@@ -99,13 +103,15 @@ 
 	 */
 	protected static function isFatal( $error ) {
 
-		if( $error instanceof \Exception )
-			return false;
+		if( $error instanceof \Exception ) {
+					return false;
+		}
 
 		$fatal = E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR;
 
-		if( $error instanceof \ErrorException )
-			$error = $error->getSeverity();
+		if( $error instanceof \ErrorException ) {
+					$error = $error->getSeverity();
+		}
 
 		return (bool) ($error & $fatal);
 

src/exceptions/error.debug.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
 
 // use default php error handler
 set_error_handler(
-	function( $severity, $message, $file, $line ) {
+	function($severity, $message, $file, $line) {
 		return false;
 	}
 );
@@ -29,7 +29,7 @@ 
 ];
 
 $err = [
-	'name'    => '\\'. get_class($error),
+	'name'    => '\\'.get_class($error),
 	'code'    => $error->getCode(),
 	'message' => $error->getMessage(),
 	'file'    => $error->getFile(),
@@ -37,16 +37,16 @@ 
 	'trace'   => $error->getTrace(),
 	'previous' => $error->getPrevious(),
 ];
-if( $error instanceof \ErrorException ) {
+if ($error instanceof \ErrorException) {
 	$err['name'] = $names[$error->getSeverity()];
 }
-elseif( ($error instanceof \InvalidArgumentException) && ($err['previous'] instanceof \ErrorException) ) {
+elseif (($error instanceof \InvalidArgumentException) && ($err['previous'] instanceof \ErrorException)) {
 	$err['file'] = $err['previous']->getFile();
 	$err['line'] = $err['previous']->getLine();
 }
 
 // it's an error - don't send a 200 code!
-if( !headers_sent() && (http_response_code() == 200) )
+if (!headers_sent() && (http_response_code() == 200))
 	header("HTTP/1.0 500 Internal Server Error");
 
 ?><!DOCTYPE html>
@@ -151,20 +151,20 @@ 
 
 </div>
 
-<?php if( $err['trace'] ) { ?>
+<?php if ($err['trace']) { ?>
 <div id="trace">
 	<h2>Trace:</h2>
 	<ol>
-		<?php foreach( $err['trace'] as $i => $item ) { ?>
+		<?php foreach ($err['trace'] as $i => $item) { ?>
 		<li class="panel">
 			<?php
-				if( isset($item['file']) ) { ?>
+				if (isset($item['file'])) { ?>
 			<p>
 				<strong>File:</strong> <code><?=$item['file']; ?></code>
-				<?php if( isset($item['line']) ) { ?> &nbsp;&nbsp;&nbsp;<strong>Line:</strong> <code><?=$item['line'] ?></code><?php } ?>
+				<?php if (isset($item['line'])) { ?> &nbsp;&nbsp;&nbsp;<strong>Line:</strong> <code><?=$item['line'] ?></code><?php } ?>
 			</p>
 			<?php } ?>
-			<p><strong>Function: </strong><code><?=isset($item['class']) ? $item['class']. $item['type'] : ''?><?=$item['function']. '()'; ?></code></p>
+			<p><strong>Function: </strong><code><?=isset($item['class']) ? $item['class'].$item['type'] : ''?><?=$item['function'].'()'; ?></code></p>
 		</li>
 		<?php } ?>
 	</ol>

Braces +3 added lines, -3 removed lines

@@ -39,15 +39,15 @@
 ];
 if( $error instanceof \ErrorException ) {
 	$err['name'] = $names[$error->getSeverity()];
-}
-elseif( ($error instanceof \InvalidArgumentException) && ($err['previous'] instanceof \ErrorException) ) {
+} elseif( ($error instanceof \InvalidArgumentException) && ($err['previous'] instanceof \ErrorException) ) {
 	$err['file'] = $err['previous']->getFile();
 	$err['line'] = $err['previous']->getLine();
 }
 
 // it's an error - don't send a 200 code!
-if( !headers_sent() && (http_response_code() == 200) )
+if( !headers_sent() && (http_response_code() == 200) ) {
 	header("HTTP/1.0 500 Internal Server Error");
+}
 
 ?><!DOCTYPE html>
 <html>