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 +10 added lines, -10 removed lines

@@ -49,7 +49,7 @@ 
 		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--;
 
@@ -74,11 +74,11 @@ 
 
 		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--;
 
@@ -165,9 +165,9 @@ 
 
 		$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));
+			$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--;
 
@@ -184,14 +184,14 @@ 
 			$line = '';
 
 			if( isset($frame['class']) )
-				$line .= $frame['class']. $frame['type'];
+				$line .= $frame['class'].$frame['type'];
 
-			$line .= $frame['function']. '()';
+			$line .= $frame['function'].'()';
 
 			if( isset($frame['file']) ) {
-				$line .= ' ['. $frame['file'];
+				$line .= ' ['.$frame['file'];
 				if( isset($frame['line']) )
-					$line .= ':'. $frame['line'];
+					$line .= ':'.$frame['line'];
 				$line .= ']';
 			}
 
@@ -229,7 +229,7 @@ 
 
 	    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);
 	    }
 

src/console/Task.php

Spacing +11 added lines, -11 removed lines

@@ -40,17 +40,17 @@ 
 	 */
 	protected function parseArgs( $argv = null ) {
 		$argv = $argv ? $argv : $_SERVER['argv']; array_shift($argv); $o = [];
-		for ($i = 0, $j = count($argv); $i < $j; $i++) { $a = $argv[$i];
-			if (substr($a, 0, 2) == '--') { $eq = strpos($a, '=');
-				if ($eq !== false) { $o[substr($a, 2, $eq - 2)] = substr($a, $eq + 1); }
+		for( $i = 0, $j = count($argv); $i < $j; $i++ ) { $a = $argv[$i];
+			if( substr($a, 0, 2) == '--' ) { $eq = strpos($a, '=');
+				if( $eq !== false ) { $o[substr($a, 2, $eq - 2)] = substr($a, $eq + 1); }
 				else { $k = substr($a, 2);
-					if ($i + 1 < $j && $argv[$i + 1][0] !== '-') { $o[$k] = $argv[$i + 1]; $i++; }
-					else if (!isset($o[$k])) { $o[$k] = true; } } }
-			else if (substr($a, 0, 1) == '-') {
-				if (substr($a, 2, 1) == '=') { $o[substr($a, 1, 1)] = substr($a, 3); }
+					if( $i + 1 < $j && $argv[$i + 1][0] !== '-' ) { $o[$k] = $argv[$i + 1]; $i++; }
+					else if( !isset($o[$k]) ) { $o[$k] = true; } } }
+			else if( substr($a, 0, 1) == '-' ) {
+				if( substr($a, 2, 1) == '=' ) { $o[substr($a, 1, 1)] = substr($a, 3); }
 				else {
-					foreach (str_split(substr($a, 1)) as $k) { if (!isset($o[$k])) { $o[$k] = true; } }
-					if ($i + 1 < $j && $argv[$i + 1][0] !== '-') { $o[$k] = $argv[$i + 1]; $i++; } } }
+					foreach( str_split(substr($a, 1)) as $k ) { if( !isset($o[$k]) ) { $o[$k] = true; } }
+					if( $i + 1 < $j && $argv[$i + 1][0] !== '-' ) { $o[$k] = $argv[$i + 1]; $i++; } } }
 			else { $o[] = $a; } }
 		return $o;
 	}
@@ -60,7 +60,7 @@ 
 	 * @return string
 	 */
 	protected function getLockFile() {
-		return rtrim(static::LOCK_DIR, '/'). '/'. strtolower(str_replace('\\', '-', get_class($this)));
+		return rtrim(static::LOCK_DIR, '/').'/'.strtolower(str_replace('\\', '-', get_class($this)));
 	}
 
 	protected function isLocked() {
@@ -71,7 +71,7 @@ 
 		// if it does then check the process is actually still running
 		if( $locked ) {
 			$pid = file_get_contents($lock);
-			$locked = exec(static::PS_EXEC. $pid) != '';
+			$locked = exec(static::PS_EXEC.$pid) != '';
 			// no such process so remove the lock file
 			if( !$locked )
 				$this->unlock();

Braces +2 added lines, -2 removed lines

@@ -46,12 +46,12 @@
 				else { $k = substr($a, 2);
 					if ($i + 1 < $j && $argv[$i + 1][0] !== '-') { $o[$k] = $argv[$i + 1]; $i++; }
 					else if (!isset($o[$k])) { $o[$k] = true; } } }
-			else if (substr($a, 0, 1) == '-') {
+					else if (substr($a, 0, 1) == '-') {
 				if (substr($a, 2, 1) == '=') { $o[substr($a, 1, 1)] = substr($a, 3); }
 				else {
 					foreach (str_split(substr($a, 1)) as $k) { if (!isset($o[$k])) { $o[$k] = true; } }
 					if ($i + 1 < $j && $argv[$i + 1][0] !== '-') { $o[$k] = $argv[$i + 1]; $i++; } } }
-			else { $o[] = $a; } }
+					else { $o[] = $a; } }
 		return $o;
 	}
 

src/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use yolk\Yolk;
 
 defined('YOLK_START_TIME') || define('YOLK_START_TIME', microtime(true));
-defined('YOLK_START_MEM')  || define('YOLK_START_MEM', memory_get_usage());
+defined('YOLK_START_MEM') || define('YOLK_START_MEM', memory_get_usage());
 
 if( !function_exists('d') ) {
 	function d() {

src/exceptions/error.debug.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 ];
 
 $err = [
-	'name'    => '\\'. get_class($error),
+	'name'    => '\\'.get_class($error),
 	'code'    => $error->getCode(),
 	'message' => $error->getMessage(),
 	'file'    => $error->getFile(),
@@ -164,7 +164,7 @@ 
 				<?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>

src/exceptions/Handler.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 		}
 		// debug web app
 		elseif( Yolk::isDebug() ) {
-			require __DIR__. '/error.debug.php';
+			require __DIR__.'/error.debug.php';
 		}
 		// production web app
 		else {
@@ -72,11 +72,11 @@ 
 
 		// fatal errors will already have been error_log()'d
 		if( !static::isFatal($error) ) {
-			$location = $error->getFile(). ':'. $error->getLine();
+			$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}]");
+				$location = $error->getPrevious()->getFile().':'.$error->getPrevious()->getLine();
+			error_log(get_class($error).': '.$error->getMessage()." [{$location}]");
 		}
 
 	}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 
 		// 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]));
+			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);

src/Yolk.php

Spacing +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
 		return call_user_func(
 			static::$exception_handler,
 			$error,
-			static::$error_page ?: __DIR__. '/exceptions/error.php'
+			static::$error_page ?: __DIR__.'/exceptions/error.php'
 		);
 	}
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
 	 * @param \Closure  $callable
 	 * @return void
 	 */
-	public static function run( Callable $callable ) {
+	public static function run( callable $callable ) {
 
 		try {
 

src/helpers/ArrayHelper.php

Spacing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 				if( $lhs < $rhs ) {
 					return -1 * $sort_order;
 				}
-				else if ($lhs > $rhs) {
+				else if( $lhs > $rhs ) {
 					return 1 * $sort_order;
 				}
 

src/helpers/Inflector.php

Spacing +10 added lines, -10 removed lines

@@ -95,24 +95,24 @@ 
 	public static function pluralise( $string ) {
 
 		// save some time in the case that singular and plural are the same
-		if ( in_array( mb_strtolower( $string ), self::$uncountable ) )
+		if( in_array(mb_strtolower($string), self::$uncountable) )
 			return $string;
 
 
 		// check for irregular singular forms
-		foreach ( self::$irregular as $pattern => $result )
+		foreach( self::$irregular as $pattern => $result )
 		{
-			$pattern = '/' . $pattern . '$/iu';
+			$pattern = '/'.$pattern.'$/iu';
 
-			if ( preg_match( $pattern, $string ) )
-				return preg_replace( $pattern, $result, $string);
+			if( preg_match($pattern, $string) )
+				return preg_replace($pattern, $result, $string);
 		}
 
 		// check for matches using regular expressions
-		foreach ( self::$plural as $pattern => $result )
+		foreach( self::$plural as $pattern => $result )
 		{
-			if ( preg_match( $pattern, $string ) )
-				return preg_replace( $pattern, $result, $string );
+			if( preg_match($pattern, $string) )
+				return preg_replace($pattern, $result, $string);
 		}
 
 		return $string;
@@ -123,12 +123,12 @@ 
 	public static function singularise( $string ) {
 
 		// save some time in the case that singular and plural are the same
-		if ( in_array(mb_strtolower($string), self::$uncountable) )
+		if( in_array(mb_strtolower($string), self::$uncountable) )
 			return $string;
 
 		// check for irregular plural forms
 		foreach( self::$irregular as $result => $pattern ) {
-			$pattern = '/' . $pattern . '$/iu';
+			$pattern = '/'.$pattern.'$/iu';
 			if( preg_match($pattern, $string) )
 				return preg_replace($pattern, $result, $string);
 		}

Braces +2 added lines, -4 removed lines

@@ -100,8 +100,7 @@ 
 
 
 		// check for irregular singular forms
-		foreach ( self::$irregular as $pattern => $result )
-		{
+		foreach ( self::$irregular as $pattern => $result ) {
 			$pattern = '/' . $pattern . '$/iu';
 
 			if ( preg_match( $pattern, $string ) )
@@ -109,8 +108,7 @@ 
 		}
 
 		// check for matches using regular expressions
-		foreach ( self::$plural as $pattern => $result )
-		{
+		foreach ( self::$plural as $pattern => $result ) {
 			if ( preg_match( $pattern, $string ) )
 				return preg_replace( $pattern, $result, $string );
 		}

src/helpers/StringHelper.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 		$parts = is_string($url) ? \parse_url(urldecode($url)) : $url;
 
-		$select = function( $k ) use ( $parts, $defaults ) {
+		$select = function( $k ) use ($parts, $defaults) {
 			if( isset($parts[$k]) )
 				return $parts[$k];
 			elseif( isset($defaults[$k]) )
@@ -78,7 +78,7 @@ 
 	public static function randomString( $length, $allowed = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' ) {
 		$out = '';
 		$max = strlen($allowed) - 1;
-		for ($i = 0; $i < $length; $i++) {
+		for( $i = 0; $i < $length; $i++ ) {
 			$out .= $allowed[mt_rand(0, $max)];
 		}
 		return $out;
@@ -90,7 +90,7 @@ 
 	public static function uncamelise( $str ) {
 		return mb_strtolower(
 			preg_replace(
-				'/^A-Z^a-z^0-9]+/',  '_',
+				'/^A-Z^a-z^0-9]+/', '_',
 				preg_replace('/([a-z\d])([A-Z])/u', '$1_$2',
 					preg_replace('/([A-Z+])([A-Z][a-z])/u', '$1_$2', $str)
 				)
@@ -202,7 +202,7 @@ 
 	 * @return string    the number cast as a string with the ordinal suffixed.
 	 */
 	public static function ordinal( $n ) {
-		$ends = array('th','st','nd','rd','th','th','th','th','th','th');
+		$ends = array('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th');
 		// if tens digit is 1, 2 or 3 then use th instead of usual ordinal
 		if( ($n % 100) >= 11 && ($n % 100) <= 13 )
 		   return "{$n}th";
@@ -224,7 +224,7 @@ 
 		$pow   = floor(($bytes ? log($bytes) : 0) / log(1024));
 		$pow   = min($pow, count($units) - 1);
 		$bytes /= (1 << (10 * $pow));
-		return round($bytes, $precision). ' '. $units[$pow];
+		return round($bytes, $precision).' '.$units[$pow];
 	}
 
 	/**
@@ -252,7 +252,7 @@ 
 		$str = static::stripControlChars($str);
 
 		// fix and decode entities (handles missing ; terminator)
-		$str = str_replace(array('&amp;','&lt;','&gt;'), array('&amp;amp;','&amp;lt;','&amp;gt;'), $str);
+		$str = str_replace(array('&amp;', '&lt;', '&gt;'), array('&amp;amp;', '&amp;lt;', '&amp;gt;'), $str);
 		$str = preg_replace('/(&#*\w+)\s+;/u', '$1;', $str);
 		$str = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $str);
 		$str = html_entity_decode($str, ENT_COMPAT, $charset);
@@ -287,7 +287,7 @@ 
 			$old = $str;
 			$str = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|body|embed|frame(?:set)?|head|html|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#iu', '', $str);
 		}
-		while ($old !== $str);
+		while( $old !== $str );
 
 		return $str;
 	}
@@ -310,7 +310,7 @@ 
 			// 00-08, 11, 12, 14-31, 127
 			$str = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/Su', '', $str, -1, $count);
 		}
-		while ($count);
+		while( $count );
 
 		return $str;