gamernetwork / yolk-core

src/debug/AbstractDumper.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 
 	private function __construct() {}
 
-	public static function dump( $var, $output = true ) {
+	public static function dump($var, $output = true) {
 
 		$dumpers = [
 			'is_null'     => 'dumpNull',
@@ -30,27 +30,27 @@ 
 
 		$item = false;
 
-		foreach( $dumpers as $test => $dumper ) {
-			if( $test($var) ) {
+		foreach ($dumpers as $test => $dumper) {
+			if ($test($var)) {
 				$item = static::$dumper($var);
 				break;
 			}
 		}
 
-		if( !$item ) {
+		if (!$item) {
 			ob_start();
 			var_dump($var);
 			$item = ob_get_clean();
 		}
 
-		if( $output )
+		if ($output)
 			static::output($item);
 
 		return $item;
 
 	}
 
-	protected static function output( $item ) {
+	protected static function output($item) {
 		echo $item, "\n";
 	}
 

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
 			$item = ob_get_clean();
 		}
 
-		if( $output )
-			static::output($item);
+		if( $output ) {
+					static::output($item);
+		}
 
 		return $item;
 

src/debug/DumperInterface.php

Spacing +9 added lines, -9 removed lines

@@ -17,25 +17,25 @@
 	const DUMP_HTML     = 'html';
 	const DUMP_TERMINAL = 'terminal';
 
-	public static function dump( $var, $output = true );
+	public static function dump($var, $output = true);
 
 	public static function dumpNull();
 
-	public static function dumpBoolean( $var );
+	public static function dumpBoolean($var);
 
-	public static function dumpInteger( $var );
+	public static function dumpInteger($var);
 
-	public static function dumpFloat( $var );
+	public static function dumpFloat($var);
 
-	public static function dumpString( $str );
+	public static function dumpString($str);
 
-	public static function dumpArray( array $arr );
+	public static function dumpArray(array $arr);
 
-	public static function dumpObject( $obj );
+	public static function dumpObject($obj);
 
-	public static function dumpException( \Exception $e );
+	public static function dumpException(\Exception $e);
 
-	public static function dumpResource( $resource );
+	public static function dumpResource($resource);
 
 }
 

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 '';