gamernetwork / yolk-core

src/debug/TextDumper.php

Indentation +9 added lines, -9 removed lines

@@ -223,17 +223,17 @@
 
 		$properties = [];
 
-	    foreach( $class->getProperties() as $property ) {
-	        $properties[$property->getName()] = $property;
-	    }
+		foreach( $class->getProperties() as $property ) {
+			$properties[$property->getName()] = $property;
+		}
 
-	    if( $parent = $class->getParentClass() ) {
-	        $parent_props = static::getClassProperties($parent);
-	        if(count($parent_props) > 0)
-	            $properties = array_merge($parent_props, $properties);
-	    }
+		if( $parent = $class->getParentClass() ) {
+			$parent_props = static::getClassProperties($parent);
+			if(count($parent_props) > 0)
+				$properties = array_merge($parent_props, $properties);
+		}
 
-	    return $properties;
+		return $properties;
 
 	}
 

Spacing +40 added lines, -40 removed lines

@@ -23,33 +23,33 @@ 
 		return 'null';
 	}
 
-	public static function dumpBoolean( $var ) {
+	public static function dumpBoolean($var) {
 		return sprintf('bool(%s)', $var ? 'true' : 'false');
 	}
 
-	public static function dumpInteger( $var ) {
+	public static function dumpInteger($var) {
 		return "int({$var})";
 	}
 
-	public static function dumpFloat( $var ) {
+	public static function dumpFloat($var) {
 		return "float({$var})";
 	}
 
-	public static function dumpString( $str ) {
+	public static function dumpString($str) {
 		$enc = mb_detect_encoding($str, ['UTF-8', 'WINDOWS-1252', 'ISO-8859-1', 'ASCII'], true);
 		$enc = ($enc == 'ASCII') ? '' : "; $enc";
 		return sprintf('string(%d%s) "%s"', strlen($str), $enc, $str);
 	}
 
-	public static function dumpArray( array $arr ) {
+	public static function dumpArray(array $arr) {
 
 		static::$depth++;
 
 		$item = sprintf("array(%d) {\n", count($arr));
-		foreach( $arr as $k => $v ) {
+		foreach ($arr as $k => $v) {
 			$item .= sprintf("%s[%s] => %s\n", str_repeat("\t", static::$depth), $k, static::dump($v, false));
 		}
-		$item .= str_repeat("\t", static::$depth - 1). "}";
+		$item .= str_repeat("\t", static::$depth - 1)."}";
 
 		static::$depth--;
 
@@ -57,28 +57,28 @@ 
 
 	}
 
-	public static function dumpObject( $obj ) {
+	public static function dumpObject($obj) {
 
-		if( $item = static::recursionCheck($obj) ) {
+		if ($item = static::recursionCheck($obj)) {
 			return $item;
 		}
-		elseif( $obj instanceof Dumpable ) {
+		elseif ($obj instanceof Dumpable) {
 			$item = $obj->dump(get_called_class(), static::$depth + 1);
-			if( $item )
+			if ($item)
 				return $item;
 		}
-		elseif( $obj instanceof \Exception )
+		elseif ($obj instanceof \Exception)
 			return static::dumpException($obj);
 
 		static::$stack[] = $obj;
 
 		static::$depth++;
 
-		$item = get_class($obj). " {\n";
+		$item = get_class($obj)." {\n";
 
 		$item .= static::dumpObjectProperties($obj);
 
-		$item .= str_repeat("\t", static::$depth - 1). "}";
+		$item .= str_repeat("\t", static::$depth - 1)."}";
 
 		static::$depth--;
 
@@ -88,7 +88,7 @@ 
 
 	}
 
-	public static function dumpException( \Exception $e ) {
+	public static function dumpException(\Exception $e) {
 
 		$item = get_class($e);
 
@@ -101,7 +101,7 @@ 
 			'previous' => $e->getPrevious(),
 		];
 
-		if( $e instanceof \ErrorException ) {
+		if ($e instanceof \ErrorException) {
 			$lookup = [
 				E_ERROR             => 'ERROR',
 				E_WARNING           => 'WARNING',
@@ -130,7 +130,7 @@ 
 
 	}
 
-	public static function dumpResource( $resource ) {
+	public static function dumpResource($resource) {
 
 		$type = get_resource_type($resource);
 
@@ -138,7 +138,7 @@ 
 		$item = sprintf("resource(%s; %s)", substr($item, strpos($item, '#')), $type);
 
 		// try and get some additional info about the resource
-		switch( $type ) {
+		switch ($type) {
 			case 'stream':
 				$item .= static::dumpMeta(
 					stream_get_meta_data($resource)
@@ -157,17 +157,17 @@ 
 
 	}
 
-	protected static function dumpMeta( $meta ) {
+	protected static function dumpMeta($meta) {
 
 		static::$depth++;
 
 		$width = max(array_map('strlen', array_keys($meta))) + 1;
 
 		$item = " {\n";
-		foreach( $meta as $k => $v ) {
-			$item .= sprintf("%s%s: %s\n", str_repeat("\t", static::$depth), str_pad(ucwords(str_replace('_', ' ', $k)), $width) , static::dump($v, false));
+		foreach ($meta as $k => $v) {
+			$item .= sprintf("%s%s: %s\n", str_repeat("\t", static::$depth), str_pad(ucwords(str_replace('_', ' ', $k)), $width), static::dump($v, false));
 		}
-		$item .= str_repeat("\t", static::$depth - 1). "}";
+		$item .= str_repeat("\t", static::$depth - 1)."}";
 
 		static::$depth--;
 
@@ -175,23 +175,23 @@ 
 
 	}
 
-	protected static function dumpTrace( array $trace ) {
+	protected static function dumpTrace(array $trace) {
 
 		$lines = [];
 
-		foreach( $trace as $i => $frame ) {
+		foreach ($trace as $i => $frame) {
 
 			$line = '';
 
-			if( isset($frame['class']) )
-				$line .= $frame['class']. $frame['type'];
+			if (isset($frame['class']))
+				$line .= $frame['class'].$frame['type'];
 
-			$line .= $frame['function']. '()';
+			$line .= $frame['function'].'()';
 
-			if( isset($frame['file']) ) {
-				$line .= ' ['. $frame['file'];
-				if( isset($frame['line']) )
-					$line .= ':'. $frame['line'];
+			if (isset($frame['file'])) {
+				$line .= ' ['.$frame['file'];
+				if (isset($frame['line']))
+					$line .= ':'.$frame['line'];
 				$line .= ']';
 			}
 
@@ -203,14 +203,14 @@ 
 
 	}
 
-	protected static function dumpObjectProperties( $obj ) {
+	protected static function dumpObjectProperties($obj) {
 
 		// we use reflection to access all the object's properties (public, protected and private)
 		$r = new \ReflectionObject($obj);
 
 		$item = '';
 
-		foreach( static::getClassProperties($r) as $p ) {
+		foreach (static::getClassProperties($r) as $p) {
 			$p->setAccessible(true);
 			$item .= sprintf("%s%s: %s\n", str_repeat("\t", static::$depth), $p->name, static::dump($p->getValue($obj), false));
 		}
@@ -219,17 +219,17 @@ 
 
 	}
 
-	protected static function getClassProperties( \ReflectionClass $class ) {
+	protected static function getClassProperties(\ReflectionClass $class) {
 
 		$properties = [];
 
-	    foreach( $class->getProperties() as $property ) {
+	    foreach ($class->getProperties() as $property) {
 	        $properties[$property->getName()] = $property;
 	    }
 
-	    if( $parent = $class->getParentClass() ) {
+	    if ($parent = $class->getParentClass()) {
 	        $parent_props = static::getClassProperties($parent);
-	        if(count($parent_props) > 0)
+	        if (count($parent_props) > 0)
 	            $properties = array_merge($parent_props, $properties);
 	    }
 
@@ -237,12 +237,12 @@ 
 
 	}
 
-	protected static function recursionCheck( $obj ) {
+	protected static function recursionCheck($obj) {
 
-		if( end(static::$stack) === $obj )
+		if (end(static::$stack) === $obj)
 			return '**SELF**';
 
-		elseif( in_array($obj, static::$stack) )
+		elseif (in_array($obj, static::$stack))
 			return '**RECURSION**';
 
 		return '';

Braces +20 added lines, -17 removed lines

@@ -61,14 +61,14 @@ 
 
 		if( $item = static::recursionCheck($obj) ) {
 			return $item;
-		}
-		elseif( $obj instanceof Dumpable ) {
+		} elseif( $obj instanceof Dumpable ) {
 			$item = $obj->dump(get_called_class(), static::$depth + 1);
-			if( $item )
-				return $item;
+			if( $item ) {
+							return $item;
+			}
+		} elseif( $obj instanceof \Exception ) {
+					return static::dumpException($obj);
 		}
-		elseif( $obj instanceof \Exception )
-			return static::dumpException($obj);
 
 		static::$stack[] = $obj;
 
@@ -183,15 +183,17 @@ 
 
 			$line = '';
 
-			if( isset($frame['class']) )
-				$line .= $frame['class']. $frame['type'];
+			if( isset($frame['class']) ) {
+							$line .= $frame['class']. $frame['type'];
+			}
 
 			$line .= $frame['function']. '()';
 
 			if( isset($frame['file']) ) {
 				$line .= ' ['. $frame['file'];
-				if( isset($frame['line']) )
-					$line .= ':'. $frame['line'];
+				if( isset($frame['line']) ) {
+									$line .= ':'. $frame['line'];
+				}
 				$line .= ']';
 			}
 
@@ -229,8 +231,9 @@ 
 
 	    if( $parent = $class->getParentClass() ) {
 	        $parent_props = static::getClassProperties($parent);
-	        if(count($parent_props) > 0)
-	            $properties = array_merge($parent_props, $properties);
+	        if(count($parent_props) > 0) {
+	        	            $properties = array_merge($parent_props, $properties);
+	        }
 	    }
 
 	    return $properties;
@@ -239,11 +242,11 @@ 
 
 	protected static function recursionCheck( $obj ) {
 
-		if( end(static::$stack) === $obj )
-			return '**SELF**';
-
-		elseif( in_array($obj, static::$stack) )
-			return '**RECURSION**';
+		if( end(static::$stack) === $obj ) {
+					return '**SELF**';
+		} elseif( in_array($obj, static::$stack) ) {
+					return '**RECURSION**';
+		}
 
 		return '';
 

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>