gamernetwork / yolk-core

src/exceptions/error.php

Spacing +2 added lines, -2 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;
 	}
 );
@@ -12,7 +12,7 @@ 
 $code = http_response_code();
 
 // not an error code so make it one
-if( $code < 400 ) {
+if ($code < 400) {
 	$code = 500;
 	headers_sent() || header("HTTP/1.0 500 Internal Server Error");
 }

src/Yolk.php

Spacing +20 added lines, -20 removed lines

@@ -83,7 +83,7 @@ 
 	 * @param boolean  $debug
 	 * @return void
 	 */
-	public static function setDebug( $debug = false ) {
+	public static function setDebug($debug = false) {
 		static::$debug = (bool) $debug;
 	}
 
@@ -93,9 +93,9 @@ 
 	 * @param  string $format one of the Yolk::DUMP_* constants
 	 * @return void
 	 */
-	public static function dump( $var, $format = null ) {
+	public static function dump($var, $format = null) {
 
-		if( !static::isDebug() )
+		if (!static::isDebug())
 			return;
 
 		$dumpers = [
@@ -105,7 +105,7 @@ 
 		];
 
 		// auto-detect format if unknown or none specified
-		if( !isset($dumpers[$format]) )
+		if (!isset($dumpers[$format]))
 			$format = static::isCLI() ? static::DUMP_TERMINAL : static::DUMP_HTML;
 
 		$dumpers[$format]::dump($var);
@@ -119,17 +119,17 @@ 
 	 * .e.g yolk\helpers\ArrayHelper::sum() -> yolk\Yolk::sum()
 	 * @param  string|array $classes
 	 */
-	public static function registerHelpers( $classes ) {
+	public static function registerHelpers($classes) {
 
-		if( !is_array($classes) )
+		if (!is_array($classes))
 			$classes = [$classes];
 
-		foreach( $classes as $class ) {
+		foreach ($classes as $class) {
 
 			$class   = new \ReflectionClass($class);
 			$methods = $class->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_STATIC);
 
-			foreach( $methods as $m ) {
+			foreach ($methods as $m) {
 				static::addHelperMethod($class->name, $m->name);
 			}
 			
@@ -142,13 +142,13 @@ 
 	 * @param string $class
 	 * @param string $method
 	 */
-	public static function addHelperMethod( $class, $method ) {
+	public static function addHelperMethod($class, $method) {
 
 		$k = strtolower($method);
 
-		if( method_exists(__CLASS__, $method) )
+		if (method_exists(__CLASS__, $method))
 			throw new \Exception(sprintf("Helper methods cannot override pre-defined Yolk methods - '%s' is reserved", $method));
-		elseif( isset(static::$helpers[$k]) && static::$helpers[$k][0] != $class )
+		elseif (isset(static::$helpers[$k]) && static::$helpers[$k][0] != $class)
 			throw new \Exception(sprintf("Helper method '%s' already defined in class '%s', duplicate in '%s'", $method, static::$helpers[$k][0], $class));
 
 		static::$helpers[$k] = [$class, $method];
@@ -160,7 +160,7 @@ 
 	 * @param \Closure  $callable
 	 * @return void
 	 */
-	public static function run( Callable $callable ) {
+	public static function run(Callable $callable) {
 
 		try {
 
@@ -183,7 +183,7 @@ 
 			return $result;
 
 		}
-		catch( \Exception $e ) {
+		catch (\Exception $e) {
 			static::exception($e);
 		}
 
@@ -194,7 +194,7 @@ 
 	 * @param callable $handler
 	 * @return void
 	 */
-	public static function setErrorHandler( callable $handler = null ) {
+	public static function setErrorHandler(callable $handler = null) {
 		static::$error_handler = $handler ?: ['\\yolk\\exceptions\\Handler', 'error'];
 	}
 
@@ -203,7 +203,7 @@ 
 	 * @param callable $handler
 	 * @return void
 	 */
-	public static function setExceptionHandler( callable $handler = null ) {
+	public static function setExceptionHandler(callable $handler = null) {
 		static::$exception_handler = $handler ?: ['\\yolk\\exceptions\\Handler', 'exception'];
 	}
 
@@ -212,11 +212,11 @@ 
 	 * @param  \Exception $error
 	 * @return void
 	 */
-	public static function exception( \Exception $error ) {
+	public static function exception(\Exception $error) {
 		return call_user_func(
 			static::$exception_handler,
 			$error,
-			static::$error_page ?: __DIR__. '/exceptions/error.php'
+			static::$error_page ?: __DIR__.'/exceptions/error.php'
 		);
 	}
 
@@ -226,15 +226,15 @@ 
 	 * @param string  $file
 	 * @return void
 	 */
-	public static function setErrorPage( $file ) {
+	public static function setErrorPage($file) {
 		static::$error_page = (string) $file;
 	}
 
-	public static function __callStatic( $method, array $args = [] ) {
+	public static function __callStatic($method, array $args = []) {
 
 		$k = strtolower($method);
 
-		if( !isset(static::$helpers[$k]) )
+		if (!isset(static::$helpers[$k]))
 			throw new \BadMethodCallException("Unknown helper method '$method'");
 
 		return call_user_func_array(static::$helpers[$k], $args);

Braces +18 added lines, -14 removed lines

@@ -95,8 +95,9 @@ 
 	 */
 	public static function dump( $var, $format = null ) {
 
-		if( !static::isDebug() )
-			return;
+		if( !static::isDebug() ) {
+					return;
+		}
 
 		$dumpers = [
 			static::DUMP_HTML     => '\\yolk\\debug\\HTMLDumper',
@@ -105,8 +106,9 @@ 
 		];
 
 		// auto-detect format if unknown or none specified
-		if( !isset($dumpers[$format]) )
-			$format = static::isCLI() ? static::DUMP_TERMINAL : static::DUMP_HTML;
+		if( !isset($dumpers[$format]) ) {
+					$format = static::isCLI() ? static::DUMP_TERMINAL : static::DUMP_HTML;
+		}
 
 		$dumpers[$format]::dump($var);
 
@@ -121,8 +123,9 @@ 
 	 */
 	public static function registerHelpers( $classes ) {
 
-		if( !is_array($classes) )
-			$classes = [$classes];
+		if( !is_array($classes) ) {
+					$classes = [$classes];
+		}
 
 		foreach( $classes as $class ) {
 
@@ -146,10 +149,11 @@ 
 
 		$k = strtolower($method);
 
-		if( method_exists(__CLASS__, $method) )
-			throw new \Exception(sprintf("Helper methods cannot override pre-defined Yolk methods - '%s' is reserved", $method));
-		elseif( isset(static::$helpers[$k]) && static::$helpers[$k][0] != $class )
-			throw new \Exception(sprintf("Helper method '%s' already defined in class '%s', duplicate in '%s'", $method, static::$helpers[$k][0], $class));
+		if( method_exists(__CLASS__, $method) ) {
+					throw new \Exception(sprintf("Helper methods cannot override pre-defined Yolk methods - '%s' is reserved", $method));
+		} elseif( isset(static::$helpers[$k]) && static::$helpers[$k][0] != $class ) {
+					throw new \Exception(sprintf("Helper method '%s' already defined in class '%s', duplicate in '%s'", $method, static::$helpers[$k][0], $class));
+		}
 
 		static::$helpers[$k] = [$class, $method];
 
@@ -182,8 +186,7 @@ 
 
 			return $result;
 
-		}
-		catch( \Exception $e ) {
+		} catch( \Exception $e ) {
 			static::exception($e);
 		}
 
@@ -234,8 +237,9 @@ 
 
 		$k = strtolower($method);
 
-		if( !isset(static::$helpers[$k]) )
-			throw new \BadMethodCallException("Unknown helper method '$method'");
+		if( !isset(static::$helpers[$k]) ) {
+					throw new \BadMethodCallException("Unknown helper method '$method'");
+		}
 
 		return call_user_func_array(static::$helpers[$k], $args);
 

src/console/Task.php

Spacing +12 added lines, -12 removed lines

@@ -16,11 +16,11 @@ 
 	const LOCK_DIR = '/tmp';
 	const PS_EXEC  = 'ps --no-heading -p ';
 
-	abstract public function run( array $args );
+	abstract public function run(array $args);
 
 	public function __invoke() {
 
-		if( !$this->lock() )
+		if (!$this->lock())
 			throw new \RuntimeException(sprintf('An instance of \\%s is already running', get_class($this)));
 
 		$result = $this->run(
@@ -38,7 +38,7 @@ 
 	 * @author   Patrick Fisher <patrick@pwfisher.com>
 	 * @see      https://github.com/pwfisher/CommandLine.php
 	 */
-	protected function parseArgs( $argv = null ) {
+	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, '=');
@@ -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() {
@@ -69,11 +69,11 @@ 
 		$locked = file_exists($lock = $this->getLockFile());
 
 		// if it does then check the process is actually still running
-		if( $locked ) {
+		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 )
+			if (!$locked)
 				$this->unlock();
 		}
 
@@ -84,11 +84,11 @@ 
 	protected function lock() {
 
 		// locked by running process
-		if( $this->isLocked() )
+		if ($this->isLocked())
 			return false;
 
 		// open the lock file only if it doesn't exist
-		if( !$fh = @fopen($this->getLockFile(), 'x') )
+		if (!$fh = @fopen($this->getLockFile(), 'x'))
 			return false;
 
 		// clear it and write out the new PID
@@ -104,14 +104,14 @@ 
 
 		$lock = $this->getLockFile();
 
-		if( file_exists($lock) ) {
+		if (file_exists($lock)) {
 
 			// PIDs don't match - ooops!
-			if( file_get_contents($lock) != getmypid() )
+			if (file_get_contents($lock) != getmypid())
 				throw new \RuntimeException('Lock file contains incorrect PID');
 
 			// Delete the lock file
-			if( !unlink($lock) )
+			if (!unlink($lock))
 				throw new \RuntimeException('Unable to remove lock file');
 
 		}

Braces +22 added lines, -21 removed lines

@@ -20,8 +20,9 @@ 
 
 	public function __invoke() {
 
-		if( !$this->lock() )
-			throw new \RuntimeException(sprintf('An instance of \\%s is already running', get_class($this)));
+		if( !$this->lock() ) {
+					throw new \RuntimeException(sprintf('An instance of \\%s is already running', get_class($this)));
+		}
 
 		$result = $this->run(
 			$this->parseArgs()
@@ -42,16 +43,11 @@ 
 		$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); }
-				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); }
-				else {
+				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); } 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; } }
+					if ($i + 1 < $j && $argv[$i + 1][0] !== '-') { $o[$k] = $argv[$i + 1]; $i++; } } } else { $o[] = $a; } }
 		return $o;
 	}
 
@@ -73,8 +69,9 @@ 
 			$pid = file_get_contents($lock);
 			$locked = exec(static::PS_EXEC. $pid) != '';
 			// no such process so remove the lock file
-			if( !$locked )
-				$this->unlock();
+			if( !$locked ) {
+							$this->unlock();
+			}
 		}
 
 		return $locked;
@@ -84,12 +81,14 @@ 
 	protected function lock() {
 
 		// locked by running process
-		if( $this->isLocked() )
-			return false;
+		if( $this->isLocked() ) {
+					return false;
+		}
 
 		// open the lock file only if it doesn't exist
-		if( !$fh = @fopen($this->getLockFile(), 'x') )
-			return false;
+		if( !$fh = @fopen($this->getLockFile(), 'x') ) {
+					return false;
+		}
 
 		// clear it and write out the new PID
 		ftruncate($fh, 0);
@@ -107,12 +106,14 @@ 
 		if( file_exists($lock) ) {
 
 			// PIDs don't match - ooops!
-			if( file_get_contents($lock) != getmypid() )
-				throw new \RuntimeException('Lock file contains incorrect PID');
+			if( file_get_contents($lock) != getmypid() ) {
+							throw new \RuntimeException('Lock file contains incorrect PID');
+			}
 
 			// Delete the lock file
-			if( !unlink($lock) )
-				throw new \RuntimeException('Unable to remove lock file');
+			if( !unlink($lock) ) {
+							throw new \RuntimeException('Unable to remove lock file');
+			}
 
 		}
 

src/helpers/Inflector.php

Spacing +16 added lines, -16 removed lines

@@ -92,27 +92,27 @@ 
 	);
 
 	// TODO: cache results to speed up subsequent use?
-	public static function pluralise( $string ) {
+	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;
@@ -120,22 +120,22 @@ 
 	}
 
 	// TODO: cache results to speed up subsequent use?
-	public static function singularise( $string ) {
+	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';
-			if( preg_match($pattern, $string) )
+		foreach (self::$irregular as $result => $pattern) {
+			$pattern = '/'.$pattern.'$/iu';
+			if (preg_match($pattern, $string))
 				return preg_replace($pattern, $result, $string);
 		}
 
 		// check for matches using regular expressions
-		foreach( self::$singular as $pattern => $result ) {
-			if( preg_match($pattern, $string) )
+		foreach (self::$singular as $pattern => $result) {
+			if (preg_match($pattern, $string))
 				return preg_replace($pattern, $result, $string);
 		}
 

Braces +18 added lines, -12 removed lines

@@ -95,8 +95,9 @@ 
 	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 ) )
-			return $string;
+		if ( in_array( mb_strtolower( $string ), self::$uncountable ) ) {
+					return $string;
+		}
 
 
 		// check for irregular singular forms
@@ -104,15 +105,17 @@ 
 		{
 			$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 )
 		{
-			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,20 +126,23 @@ 
 	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) )
-			return $string;
+		if ( in_array(mb_strtolower($string), self::$uncountable) ) {
+					return $string;
+		}
 
 		// check for irregular plural forms
 		foreach( self::$irregular as $result => $pattern ) {
 			$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::$singular 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;

src/helpers/ArrayHelper.php

Spacing +25 added lines, -25 removed lines

@@ -24,7 +24,7 @@ 
 	 * @param  mixed   $var
 	 * @return array
 	 */
-	public static function uniqueIntegers( $var ) {
+	public static function uniqueIntegers($var) {
 		return array_unique(
 			array_map(
 				'intval',
@@ -38,7 +38,7 @@ 
 	 * @param  mixed  $var
 	 * @return boolean
 	 */
-	public static function isTraversable( $var ) {
+	public static function isTraversable($var) {
 		return is_array($var) || ($var instanceof \Traversable);
 	}
 
@@ -49,7 +49,7 @@ 
 	 * @param  array   $var
 	 * @return bool
 	 */
-	public static function isAssoc( $var ) {
+	public static function isAssoc($var) {
 		return (bool) count(
 			array_filter(
 				array_keys($var),
@@ -65,12 +65,12 @@ 
 	 * @param  string  $class   The class that items should be an instance of
 	 * @return array
 	 */
-	public static function filterObjects( $var, $class ) {
-		if( !is_array($var) )
+	public static function filterObjects($var, $class) {
+		if (!is_array($var))
 			$var = array($var);
 		return array_filter(
 			$var,
-			function( $item ) use ($class) {
+			function($item) use ($class) {
 				return ($item instanceof $class);
 			}
 		);
@@ -83,13 +83,13 @@ 
 	 * @param  mixed          $default
 	 * @return mixed
 	 */
-	public static function get( $var, $key, $default = null ) {
+	public static function get($var, $key, $default = null) {
 
-		if( $key === null )
+		if ($key === null)
 			return $var;
-		elseif( isset($var->$key) )
+		elseif (isset($var->$key))
 			return $var->$key;
-		elseif( isset($var[$key]) )
+		elseif (isset($var[$key]))
 			return $var[$key];
 		else
 			return $default;
@@ -101,8 +101,8 @@ 
 	 * @param  array $var
 	 * @return array
 	 */
-	public static function getNullItems( $var ) {
-		return array_filter($var, function( $a ) { return $a === null; });
+	public static function getNullItems($var) {
+		return array_filter($var, function($a) { return $a === null; });
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 * @param  boolean $preserve_keys   Whether or not to preserve the array keys
 	 * @return array
 	 */
-	public static function pluck( $vars, $field, $preserve_keys = true ) {
+	public static function pluck($vars, $field, $preserve_keys = true) {
 		$values = [];
-		foreach( $vars as $k => $v ) {
+		foreach ($vars as $k => $v) {
 			$values[$k] = static::get($v, $field);
 		}
 		return $preserve_keys ? $values : array_values($values);
@@ -128,7 +128,7 @@ 
 	 * @param  string  $field   The field to get values from
 	 * @return array
 	 */
-	public static function sum( $vars, $field ) {
+	public static function sum($vars, $field) {
 		return array_sum(static::pluck($vars, $field));
 	}
 
@@ -139,7 +139,7 @@ 
 	 * @param  string  $field   The field to get values from
 	 * @return array
 	 */
-	public static function min( $vars, $field ) {
+	public static function min($vars, $field) {
 		return min(static::pluck($vars, $field));
 	}
 
@@ -150,7 +150,7 @@ 
 	 * @param  string  $field   The field to get values from
 	 * @return array
 	 */
-	public static function max( $vars, $field ) {
+	public static function max($vars, $field) {
 		return max(static::pluck($vars, $field));
 	}
 
@@ -163,10 +163,10 @@ 
 	 * @param  boolean $skip_empty   Should empty values be included?
 	 * @return string
 	 */
-	public static function implodeAssoc( $var, $glue_outer = ',', $glue_inner = '=', $skip_empty = true ) {
+	public static function implodeAssoc($var, $glue_outer = ',', $glue_inner = '=', $skip_empty = true) {
 		$output = [];
-		foreach( $var as $k => $v ) {
-			if( !$skip_empty || !empty($v) ) {
+		foreach ($var as $k => $v) {
+			if (!$skip_empty || !empty($v)) {
 				$output[] = "{$k}{$glue_inner}{$v}";
 			}
 		}
@@ -191,21 +191,21 @@ 
 
 		// normalize criteria up front so that the comparer finds everything tidy
 		$criteria = func_get_args();
-		foreach( $criteria as $index => $criterion ) {
+		foreach ($criteria as $index => $criterion) {
 			$criteria[$index] = is_array($criterion)
 				? array_pad($criterion, 3, null)
 				: array($criterion, SORT_ASC, null);
 		}
 
-		return function( $first, $second ) use ($criteria) {
-			foreach( $criteria as $criterion ) {
+		return function($first, $second) use ($criteria) {
+			foreach ($criteria as $criterion) {
 
 				// how will we compare this round?
 				list($column, $sort_order, $projection) = $criterion;
 				$sort_order = $sort_order === SORT_DESC ? -1 : 1;
 
 				// if a projection was defined project the values now
-				if( $projection ) {
+				if ($projection) {
 					$lhs = call_user_func($projection, $first[$column]);
 					$rhs = call_user_func($projection, $second[$column]);
 				}
@@ -215,7 +215,7 @@ 
 				}
 
 				// do the actual comparison; do not return if equal, move on to the next column
-				if( $lhs < $rhs ) {
+				if ($lhs < $rhs) {
 					return -1 * $sort_order;
 				}
 				else if ($lhs > $rhs) {

Braces +14 added lines, -14 removed lines

@@ -66,8 +66,9 @@ 
 	 * @return array
 	 */
 	public static function filterObjects( $var, $class ) {
-		if( !is_array($var) )
-			$var = array($var);
+		if( !is_array($var) ) {
+					$var = array($var);
+		}
 		return array_filter(
 			$var,
 			function( $item ) use ($class) {
@@ -85,14 +86,15 @@ 
 	 */
 	public static function get( $var, $key, $default = null ) {
 
-		if( $key === null )
-			return $var;
-		elseif( isset($var->$key) )
-			return $var->$key;
-		elseif( isset($var[$key]) )
-			return $var[$key];
-		else
-			return $default;
+		if( $key === null ) {
+					return $var;
+		} elseif( isset($var->$key) ) {
+					return $var->$key;
+		} elseif( isset($var[$key]) ) {
+					return $var[$key];
+		} else {
+					return $default;
+		}
 
 	}
 
@@ -208,8 +210,7 @@ 
 				if( $projection ) {
 					$lhs = call_user_func($projection, $first[$column]);
 					$rhs = call_user_func($projection, $second[$column]);
-				}
-				else {
+				} else {
 					$lhs = $first[$column];
 					$rhs = $second[$column];
 				}
@@ -217,8 +218,7 @@ 
 				// do the actual comparison; do not return if equal, move on to the next column
 				if( $lhs < $rhs ) {
 					return -1 * $sort_order;
-				}
-				else if ($lhs > $rhs) {
+				} else if ($lhs > $rhs) {
 					return 1 * $sort_order;
 				}
 

src/helpers/StringHelper.php

Spacing +27 added lines, -27 removed lines

@@ -27,14 +27,14 @@ 
 	 * @param  array         $defaults   an array of default values for components
 	 * @return array|boolean   Returns false if the URL could not be parsed
 	 */
-	public static function parseURL( $url, $defaults = array() ) {
+	public static function parseURL($url, $defaults = array()) {
 
 		$parts = is_string($url) ? \parse_url(urldecode($url)) : $url;
 
-		$select = function( $k ) use ( $parts, $defaults ) {
-			if( isset($parts[$k]) )
+		$select = function($k) use ($parts, $defaults) {
+			if (isset($parts[$k]))
 				return $parts[$k];
-			elseif( isset($defaults[$k]) )
+			elseif (isset($defaults[$k]))
 				return $defaults[$k];
 			else
 				return '';
@@ -50,7 +50,7 @@ 
 			'options' => array(),
 		);
 
-		if( isset($parts['query']) )
+		if (isset($parts['query']))
 			parse_str($parts['query'], $url['options']);
 
 		return $url;
@@ -63,7 +63,7 @@ 
 	 * @param  integer  $length   length of the desired hex string
 	 * @return string
 	 */
-	public static function randomHex( $length = 40 ) {
+	public static function randomHex($length = 40) {
 		return bin2hex(openssl_random_pseudo_bytes($length / 2));
 	}
 
@@ -75,7 +75,7 @@ 
 	 * @param  string  $allowed   the characters allowed to appear in the output
 	 * @return string
 	 */
-	public static function randomString( $length, $allowed = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' ) {
+	public static function randomString($length, $allowed = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') {
 		$out = '';
 		$max = strlen($allowed) - 1;
 		for ($i = 0; $i < $length; $i++) {
@@ -87,10 +87,10 @@ 
 	/**
 	 * Convert a camel-cased string to lower case with underscores
 	 */
-	public static function uncamelise( $str ) {
+	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)
 				)
@@ -106,7 +106,7 @@ 
 	 * @param  string   $str   A string to convert to a slug
 	 * @return string
 	 */
-	public static function slugify( $str ) {
+	public static function slugify($str) {
 		$chars = array('&' => '-and-', '€' => '-EUR-', '£' => '-GBP-', '$' => '-USD-');
 		return trim(preg_replace('/([^a-z0-9]+)/u', '-', mb_strtolower(strtr(static::removeAccents($str), $chars))), '-');
 	}
@@ -117,7 +117,7 @@ 
 	 * @param  string   $str   A string that might contain accent characters
 	 * @return string
 	 */
-	public static function removeAccents( $str ) {
+	public static function removeAccents($str) {
 		$chars = array(
 			'ª' => 'a', 'º' => 'o', 'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A',
 			'Ä' => 'A', 'Å' => 'A', 'Ā' => 'A', 'Ă' => 'A', 'Ą' => 'A', 'à' => 'a',
@@ -166,7 +166,7 @@ 
 	 * @param  string   $str
 	 * @return string   the converted string.
 	 */
-	public static function latin1( $str ) {
+	public static function latin1($str) {
 		return utf8_decode(
 			mb_encode_numericentity(
 				(string) $str,
@@ -182,7 +182,7 @@ 
 	 * @param  string   $str
 	 * @return string   the converted string.
 	 */
-	public static function utf8( $str ) {
+	public static function utf8($str) {
 		return html_entity_decode(
 			mb_convert_encoding(
 				(string) $str,
@@ -201,10 +201,10 @@ 
 	 * @param  integer   $n
 	 * @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');
+	public static function ordinal($n) {
+		$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 )
+		if (($n % 100) >= 11 && ($n % 100) <= 13)
 		   return "{$n}th";
 		else
 		   return "{$n}{$ends[$n % 10]}";
@@ -218,13 +218,13 @@ 
 	 * @param  integer   $precision   the number of decimal places to format the result to.
 	 * @return string
 	 */
-	public static function sizeFormat( $bytes, $precision ) {
+	public static function sizeFormat($bytes, $precision) {
 		$units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB');
 		$bytes = max($bytes, 0);
 		$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];
 	}
 
 	/**
@@ -236,13 +236,13 @@ 
 	 * @param  string|array   str
 	 * @return string|array
 	 */
-	public static function xssClean( $str, $charset = 'UTF-8' ) {
+	public static function xssClean($str, $charset = 'UTF-8') {
 
-		if( !$str )
+		if (!$str)
 			return $str;
 
-		if( is_array($str) ) {
-			foreach( $str as &$item ) {
+		if (is_array($str)) {
+			foreach ($str as &$item) {
 				$item = static::xssClean($item);
 			}
 			return $str;
@@ -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);
@@ -297,10 +297,10 @@ 
 	 * @param  string|array   str
 	 * @return string|array
 	 */
-	public static function stripControlChars( $str ) {
+	public static function stripControlChars($str) {
 
-		if( is_array($str) ) {
-			foreach( $str as &$item ) {
+		if (is_array($str)) {
+			foreach ($str as &$item) {
 				$item = static::stripControlChars($item);
 			}
 			return $str;
@@ -321,7 +321,7 @@ 
 	 * All line-ending are converted to LF with maximum of two consecutive.
 	 * @return string
 	 */
-	public static function normaliseLineEndings( $str ) {
+	public static function normaliseLineEndings($str) {
 		$str = str_replace("\r\n", "\n", $str);
 		$str = str_replace("\r", "\n", $str);
 		return preg_replace("/\n{2,}/", "\n\n", $str);

Braces +18 added lines, -14 removed lines

@@ -32,12 +32,13 @@ 
 		$parts = is_string($url) ? \parse_url(urldecode($url)) : $url;
 
 		$select = function( $k ) use ( $parts, $defaults ) {
-			if( isset($parts[$k]) )
-				return $parts[$k];
-			elseif( isset($defaults[$k]) )
-				return $defaults[$k];
-			else
-				return '';
+			if( isset($parts[$k]) ) {
+							return $parts[$k];
+			} elseif( isset($defaults[$k]) ) {
+							return $defaults[$k];
+			} else {
+							return '';
+			}
 		};
 
 		$url = array(
@@ -50,8 +51,9 @@ 
 			'options' => array(),
 		);
 
-		if( isset($parts['query']) )
-			parse_str($parts['query'], $url['options']);
+		if( isset($parts['query']) ) {
+					parse_str($parts['query'], $url['options']);
+		}
 
 		return $url;
 
@@ -204,10 +206,11 @@ 
 	public static function ordinal( $n ) {
 		$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";
-		else
-		   return "{$n}{$ends[$n % 10]}";
+		if( ($n % 100) >= 11 && ($n % 100) <= 13 ) {
+				   return "{$n}th";
+		} else {
+				   return "{$n}{$ends[$n % 10]}";
+		}
 	}
 
 	/**
@@ -238,8 +241,9 @@ 
 	 */
 	public static function xssClean( $str, $charset = 'UTF-8' ) {
 
-		if( !$str )
-			return $str;
+		if( !$str ) {
+					return $str;
+		}
 
 		if( is_array($str) ) {
 			foreach( $str as &$item ) {

src/helpers/DateTimeHelper.php

Spacing +12 added lines, -12 removed lines

@@ -18,17 +18,17 @@ 
 	 * @param  mixed $time
 	 * @return integer
 	 */
-	public static function makeTimestamp( $time ) {
+	public static function makeTimestamp($time) {
 
-		if( is_numeric($time) )
+		if (is_numeric($time))
 			return (int) $time;
 
-		elseif( $time instanceof \DateTime )
+		elseif ($time instanceof \DateTime)
 			return $time->getTimestamp();
 
 		$ts = strtotime($time);
 
-		if( $ts === false )
+		if ($ts === false)
 			throw new \LogicException("Unable convert {$time} to a valid timestamp");
 
 		return $ts;
@@ -42,16 +42,16 @@ 
 	 * @param  string  $str   string to convert
 	 * @return integer|float
 	 */
-	public static function seconds( $str ) {
+	public static function seconds($str) {
 
 		$hours   = 0;
 		$minutes = 0;
 		$seconds = 0;
 
-		if( preg_match('/^\d+:\d+$/', $str) ) {
+		if (preg_match('/^\d+:\d+$/', $str)) {
 			list(, $minutes, $seconds) = explode(':', $str);
 		}
-		elseif( preg_match('/^\d+:\d+:\d+$/', $str) ) {
+		elseif (preg_match('/^\d+:\d+:\d+$/', $str)) {
 			list($hours, $minutes, $seconds) = explode(':', $str);
 		}
 		else {
@@ -65,22 +65,22 @@ 
 			// compress scales and units together so '2 hours' => '2hours'
 			$str = preg_replace('/([0-9.]+) ([cdehimnorstu]+)/u', '$1$2', $str);
 
-			foreach( explode(' ', $str) as $item ) {
+			foreach (explode(' ', $str) as $item) {
 
-				if( !preg_match('/^([0-9.]+)([cdehimnorstu]+)$/u', $item, $m) )
+				if (!preg_match('/^([0-9.]+)([cdehimnorstu]+)$/u', $item, $m))
 					return false;
 
 				list(, $scale, $unit) = $m;
 
 				$scale = ((float) $scale != (int) $scale) ? (float) $scale : (int) $scale;
 
-				if( preg_match('/^h(r|our|ours)?$/u', $unit) && !$hours ) {
+				if (preg_match('/^h(r|our|ours)?$/u', $unit) && !$hours) {
 					$hours = $scale;
 				}
-				elseif( preg_match('/^m(in|ins|inute|inutes)?$/u', $unit) && !$minutes ) {
+				elseif (preg_match('/^m(in|ins|inute|inutes)?$/u', $unit) && !$minutes) {
 					$minutes = $scale;
 				}
-				elseif( preg_match('/^s(ec|ecs|econd|econds)?$/u', $unit) && !$seconds ) {
+				elseif (preg_match('/^s(ec|ecs|econd|econds)?$/u', $unit) && !$seconds) {
 					$seconds = $scale;
 				}
 				else {

Braces +16 added lines, -19 removed lines

@@ -20,16 +20,17 @@ 
 	 */
 	public static function makeTimestamp( $time ) {
 
-		if( is_numeric($time) )
-			return (int) $time;
-
-		elseif( $time instanceof \DateTime )
-			return $time->getTimestamp();
+		if( is_numeric($time) ) {
+					return (int) $time;
+		} elseif( $time instanceof \DateTime ) {
+					return $time->getTimestamp();
+		}
 
 		$ts = strtotime($time);
 
-		if( $ts === false )
-			throw new \LogicException("Unable convert {$time} to a valid timestamp");
+		if( $ts === false ) {
+					throw new \LogicException("Unable convert {$time} to a valid timestamp");
+		}
 
 		return $ts;
 
@@ -50,11 +51,9 @@ 
 
 		if( preg_match('/^\d+:\d+$/', $str) ) {
 			list(, $minutes, $seconds) = explode(':', $str);
-		}
-		elseif( preg_match('/^\d+:\d+:\d+$/', $str) ) {
+		} elseif( preg_match('/^\d+:\d+:\d+$/', $str) ) {
 			list($hours, $minutes, $seconds) = explode(':', $str);
-		}
-		else {
+		} else {
 
 			// convert invalid characters to spaces
 			$str = preg_replace('/[^a-z0-9. ]+/iu', ' ', $str);
@@ -67,8 +66,9 @@ 
 
 			foreach( explode(' ', $str) as $item ) {
 
-				if( !preg_match('/^([0-9.]+)([cdehimnorstu]+)$/u', $item, $m) )
-					return false;
+				if( !preg_match('/^([0-9.]+)([cdehimnorstu]+)$/u', $item, $m) ) {
+									return false;
+				}
 
 				list(, $scale, $unit) = $m;
 
@@ -76,14 +76,11 @@ 
 
 				if( preg_match('/^h(r|our|ours)?$/u', $unit) && !$hours ) {
 					$hours = $scale;
-				}
-				elseif( preg_match('/^m(in|ins|inute|inutes)?$/u', $unit) && !$minutes ) {
+				} elseif( preg_match('/^m(in|ins|inute|inutes)?$/u', $unit) && !$minutes ) {
 					$minutes = $scale;
-				}
-				elseif( preg_match('/^s(ec|ecs|econd|econds)?$/u', $unit) && !$seconds ) {
+				} elseif( preg_match('/^s(ec|ecs|econd|econds)?$/u', $unit) && !$seconds ) {
 					$seconds = $scale;
-				}
-				else {
+				} else {
 					return false;
 				}
 

src/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -3,22 +3,22 @@
 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') ) {
+if (!function_exists('d')) {
 	function d() {
 		$args = func_get_args();
-		if( Yolk::isDebug() ) {
-			foreach( $args as $arg ) {
+		if (Yolk::isDebug()) {
+			foreach ($args as $arg) {
 				Yolk::dump($arg);
 			}
 		}
 		return array_shift($args);
 	}
 	function dd() {
-		if( Yolk::isDebug() ) {
+		if (Yolk::isDebug()) {
 			headers_sent() || header('Content-type: text/plain; charset=UTF-8');
-			foreach( func_get_args() as $arg ) {
+			foreach (func_get_args() as $arg) {
 				Yolk::dump($arg);
 			}
 			die();

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;