htmlburger / wpemerge

src/Routing/HasRoutesTrait.php

Spacing +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param RouteInterface  $route
 	 * @return RouteInterface
 	 */
-	public function addRoute( $route ) {
+	public function addRoute($route) {
 		$this->routes[] = $route;
 		return $route;
 	}
@@ -43,9 +43,9 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function route( $methods, $target, $handler ) {
-		$route = new Route( $methods, $target, $handler );
-		return $this->addRoute( $route );
+	public function route($methods, $target, $handler) {
+		$route = new Route($methods, $target, $handler);
+		return $this->addRoute($route);
 	}
 
 	/**
@@ -55,9 +55,9 @@ 
 	 * @param  Closure        $callable
 	 * @return RouteInterface
 	 */
-	public function group( $target, Closure $callable ) {
-		$routeGroup = new RouteGroup( $target, $callable );
-		return $this->addRoute( $routeGroup );
+	public function group($target, Closure $callable) {
+		$routeGroup = new RouteGroup($target, $callable);
+		return $this->addRoute($routeGroup);
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function get( $target, $handler ) {
-		return $this->route( ['GET', 'HEAD'], $target, $handler );
+	public function get($target, $handler) {
+		return $this->route(['GET', 'HEAD'], $target, $handler);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function post( $target, $handler ) {
-		return $this->route( ['POST'], $target, $handler );
+	public function post($target, $handler) {
+		return $this->route(['POST'], $target, $handler);
 	}
 
 	/**
@@ -89,8 +89,8 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function put( $target, $handler ) {
-		return $this->route( ['PUT'], $target, $handler );
+	public function put($target, $handler) {
+		return $this->route(['PUT'], $target, $handler);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function patch( $target, $handler ) {
-		return $this->route( ['PATCH'], $target, $handler );
+	public function patch($target, $handler) {
+		return $this->route(['PATCH'], $target, $handler);
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function delete( $target, $handler ) {
-		return $this->route( ['DELETE'], $target, $handler );
+	public function delete($target, $handler) {
+		return $this->route(['DELETE'], $target, $handler);
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function options( $target, $handler ) {
-		return $this->route( ['OPTIONS'], $target, $handler );
+	public function options($target, $handler) {
+		return $this->route(['OPTIONS'], $target, $handler);
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function any( $target, $handler ) {
-		return $this->route( ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $target, $handler );
+	public function any($target, $handler) {
+		return $this->route(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $target, $handler);
 	}
 }

src/Routing/HasRoutesInterface.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param RouteInterface  $route
 	 * @return RouteInterface
 	 */
-	public function addRoute( $route );
+	public function addRoute($route);
 
 	/**
 	 * Create and add a new route
@@ -31,7 +31,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function route( $methods, $target, $handler );
+	public function route($methods, $target, $handler);
 
 	/**
 	 * Create and add a route group
@@ -40,7 +40,7 @@ 
 	 * @param  Closure        $callable
 	 * @return RouteInterface
 	 */
-	public function group( $target, Closure $callable );
+	public function group($target, Closure $callable);
 
 	/**
 	 * Create and add a route for the GET and HEAD methods
@@ -49,7 +49,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function get( $target, $handler );
+	public function get($target, $handler);
 
 	/**
 	 * Create and add a route for the POST method
@@ -58,7 +58,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function post( $target, $handler );
+	public function post($target, $handler);
 
 	/**
 	 * Create and add a route for the PUT method
@@ -67,7 +67,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function put( $target, $handler );
+	public function put($target, $handler);
 
 	/**
 	 * Create and add a route for the PATCH method
@@ -76,7 +76,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function patch( $target, $handler );
+	public function patch($target, $handler);
 
 	/**
 	 * Create and add a route for the DELETE method
@@ -85,7 +85,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function delete( $target, $handler );
+	public function delete($target, $handler);
 
 	/**
 	 * Create and add a route for the OPTIONS method
@@ -94,7 +94,7 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function options( $target, $handler );
+	public function options($target, $handler);
 
 	/**
 	 * Create and add a route for all supported methods
@@ -103,5 +103,5 @@ 
 	 * @param  string|Closure $handler
 	 * @return RouteInterface
 	 */
-	public function any( $target, $handler );
+	public function any($target, $handler);
 }

src/ServiceProviders/Templating.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function register( $container ) {
+	public function register($container) {
 		$container['framework.templating.engine'] = function() {
 			return new \CarbonFramework\Templating\Php();
 		};
@@ -20,7 +20,7 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function boot( $container ) {
+	public function boot($container) {
 		// nothing to boot
 	}
 }
\ No newline at end of file

src/Request.php

Spacing +17 added lines, -17 removed lines

@@ -56,7 +56,7 @@ 
 	 * @return Request
 	 */
 	public static function fromGlobals() {
-		return new static( stripslashes_deep( $_GET ), stripslashes_deep( $_POST ), $_COOKIE, $_FILES, $_SERVER, getallheaders() );
+		return new static(stripslashes_deep($_GET), stripslashes_deep($_POST), $_COOKIE, $_FILES, $_SERVER, getallheaders());
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @param array $server
 	 * @param array $headers
 	 */
-	public function __construct( $get, $post, $cookie, $files, $server, $headers ) {
+	public function __construct($get, $post, $cookie, $files, $server, $headers) {
 		$this->get = $get;
 		$this->post = $post;
 		$this->cookie = $cookie;
@@ -84,14 +84,14 @@ 
 	 * @return string
 	 */
 	public function getMethod() {
-		$method = (string) Arr::get( $this->server, 'REQUEST_METHOD', 'GET' );
+		$method = (string) Arr::get($this->server, 'REQUEST_METHOD', 'GET');
 		
-		$override = (string) Arr::get( $this->headers, 'X-HTTP-METHOD-OVERRIDE' );
-		if ( $method === 'POST' && $override ) {
+		$override = (string) Arr::get($this->headers, 'X-HTTP-METHOD-OVERRIDE');
+		if ($method === 'POST' && $override) {
 			$method = $override;
 		}
 
-		return strtoupper( $method );
+		return strtoupper($method);
 	}
 
 	/**
@@ -100,11 +100,11 @@ 
 	 * @return string
 	 */
 	public function getUrl() {
-		$https = Arr::get( $this->server, 'HTTPS' );
+		$https = Arr::get($this->server, 'HTTPS');
 
 		$protocol = $https ? 'https' : 'http';
-		$host = (string) Arr::get( $this->server, 'HTTP_HOST', '' );
-		$uri = (string) Arr::get( $this->server, 'REQUEST_URI', '' );
+		$host = (string) Arr::get($this->server, 'HTTP_HOST', '');
+		$uri = (string) Arr::get($this->server, 'REQUEST_URI', '');
 
 		return $protocol . '://' . $host . $uri;
 	}
@@ -118,12 +118,12 @@ 
 		$args = func_get_args();
 		$source = $this->{$args[0]};
 
-		if ( count( $args ) === 1 ) {
+		if (count($args) === 1) {
 			return $source;
 		}
 
 		$args[0] = $source;
-		return call_user_func_array( [Arr::class, 'get'], $args );
+		return call_user_func_array([Arr::class, 'get'], $args);
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 	 * @return mixed
 	 */
 	public function get() {
-		return call_user_func_array( [$this, 'input'], array_merge( ['get'], func_get_args() ) );
+		return call_user_func_array([$this, 'input'], array_merge(['get'], func_get_args()));
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 * @return mixed
 	 */
 	public function post() {
-		return call_user_func_array( [$this, 'input'], array_merge( ['post'], func_get_args() ) );
+		return call_user_func_array([$this, 'input'], array_merge(['post'], func_get_args()));
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 * @return mixed
 	 */
 	public function cookie() {
-		return call_user_func_array( [$this, 'input'], array_merge( ['cookie'], func_get_args() ) );
+		return call_user_func_array([$this, 'input'], array_merge(['cookie'], func_get_args()));
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 * @return mixed
 	 */
 	public function files() {
-		return call_user_func_array( [$this, 'input'], array_merge( ['files'], func_get_args() ) );
+		return call_user_func_array([$this, 'input'], array_merge(['files'], func_get_args()));
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 * @return mixed
 	 */
 	public function server() {
-		return call_user_func_array( [$this, 'input'], array_merge( ['server'], func_get_args() ) );
+		return call_user_func_array([$this, 'input'], array_merge(['server'], func_get_args()));
 	}
 
 	/**
@@ -177,6 +177,6 @@ 
 	 * @return mixed
 	 */
 	public function headers() {
-		return call_user_func_array( [$this, 'input'], array_merge( ['headers'], func_get_args() ) );
+		return call_user_func_array([$this, 'input'], array_merge(['headers'], func_get_args()));
 	}
 }

src/Controllers/Controller.php

Spacing +10 added lines, -10 removed lines

@@ -19,35 +19,35 @@
 	/**
 	 * @see Response::output()
 	 */
-	protected function output( $output ) {
-		return Response::output( $this->response(), $output );
+	protected function output($output) {
+		return Response::output($this->response(), $output);
 	}
 
 	/**
 	 * @see Response::template()
 	 */
-	protected function template( $templates, $context = array() ) {
-		return Response::template( $this->response(), $templates, $context );
+	protected function template($templates, $context = array()) {
+		return Response::template($this->response(), $templates, $context);
 	}
 
 	/**
 	 * @see Response::json()
 	 */
-	protected function json( $data ) {
-		return Response::json( $this->response(), $data );
+	protected function json($data) {
+		return Response::json($this->response(), $data);
 	}
 
 	/**
 	 * @see Response::redirect()
 	 */
-	protected function redirect( $url, $status = 302 ) {
-		return Response::redirect( $this->response(), $url, $status );
+	protected function redirect($url, $status = 302) {
+		return Response::redirect($this->response(), $url, $status);
 	}
 
 	/**
 	 * @see Response::error()
 	 */
-	protected function error( $code ) {
-		return Response::error( $this->response(), $code );
+	protected function error($code) {
+		return Response::error($this->response(), $code);
 	}
 }

src/Routing/Middleware/HasMiddlewareTrait.php

Spacing +20 added lines, -20 removed lines

@@ -23,12 +23,12 @@ 
 	 * @param  mixed   $middleware
 	 * @return boolean
 	 */
-	protected function isMiddleware( $middleware ) {
-		if ( is_callable( $middleware ) ) {
+	protected function isMiddleware($middleware) {
+		if (is_callable($middleware)) {
 			return true;
 		}
 		
-		if ( is_a( $middleware, MiddlewareInterface::class, true ) ) {
+		if (is_a($middleware, MiddlewareInterface::class, true)) {
 			return true;
 		}
 
@@ -50,16 +50,16 @@ 
 	 * @param  string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware
 	 * @return object
 	 */
-	public function addMiddleware( $middleware ) {
-		$middleware = is_array( $middleware ) ? $middleware : [$middleware];
+	public function addMiddleware($middleware) {
+		$middleware = is_array($middleware) ? $middleware : [$middleware];
 
-		foreach ( $middleware as $item ) {
-			if ( ! $this->isMiddleware( $item ) ) {
-				throw new Exception( 'Passed middleware must be a callable or the name of a class which implements the ' . MiddlewareInterface::class . ' interface.' );
+		foreach ($middleware as $item) {
+			if ( ! $this->isMiddleware($item)) {
+				throw new Exception('Passed middleware must be a callable or the name of a class which implements the ' . MiddlewareInterface::class . ' interface.');
 			}
 		}
 
-		$this->middleware = array_merge( $this->getMiddleware(), $middleware );
+		$this->middleware = array_merge($this->getMiddleware(), $middleware);
 		return $this;
 	}
 
@@ -69,8 +69,8 @@ 
 	 * @param  string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware
 	 * @return object
 	 */
-	public function add( $middleware ) {
-		return $this->addMiddleware( $middleware );
+	public function add($middleware) {
+		return $this->addMiddleware($middleware);
 	}
 
 	/**
@@ -81,22 +81,22 @@ 
 	 * @param  Closure                                                   $next
 	 * @return ResponseInterface
 	 */
-	public function executeMiddleware( $middleware, $request, Closure $next ) {
-		$top_middleware = array_pop( $middleware );
+	public function executeMiddleware($middleware, $request, Closure $next) {
+		$top_middleware = array_pop($middleware);
 
-		if ( $top_middleware === null ) {
-			return $next( $request );
+		if ($top_middleware === null) {
+			return $next($request);
 		}
 
-		$top_middleware_next = function( $request ) use ( $middleware, $next ) {
-			return $this->executeMiddleware( $middleware, $request, $next );
+		$top_middleware_next = function($request) use ($middleware, $next) {
+			return $this->executeMiddleware($middleware, $request, $next);
 		};
 
-		if ( is_callable( $top_middleware ) ) {
-			return call_user_func( $top_middleware, $request, $top_middleware_next );
+		if (is_callable($top_middleware)) {
+			return call_user_func($top_middleware, $request, $top_middleware_next);
 		}
 
 		$instance = new $top_middleware();
-		return $instance->handle( $request, $top_middleware_next );
+		return $instance->handle($request, $top_middleware_next);
 	}
 }

src/Flash/Flash.php

Spacing +25 added lines, -25 removed lines

@@ -26,12 +26,12 @@ 
 	 * 
 	 * @param array|\ArrayAccess $storage
 	 */
-	public function __construct( &$storage ) {
-		if ( $this->isValidStorage( $storage ) ) {
-			if ( ! isset( $storage[ $this->storage_key ] ) ) {
-				$storage[ $this->storage_key ] = [];
+	public function __construct(&$storage) {
+		if ($this->isValidStorage($storage)) {
+			if ( ! isset($storage[$this->storage_key])) {
+				$storage[$this->storage_key] = [];
 			}
-			$this->storage = &$storage[ $this->storage_key ];
+			$this->storage = &$storage[$this->storage_key];
 		}
 	}
 
@@ -41,7 +41,7 @@ 
 	 * @param  mixed   $storage
 	 * @return boolean
 	 */
-	protected function isValidStorage( $storage ) {
+	protected function isValidStorage($storage) {
 		return $storage !== null;
 	}
 
@@ -52,8 +52,8 @@ 
 	 * @return null
 	 */
 	protected function validateStorage() {
-		if ( ! $this->isValidStorage( $this->storage ) ) {
-			throw new Exception( 'Attempted to use Flash without an active session. Did you forget to call session_start()?' );
+		if ( ! $this->isValidStorage($this->storage)) {
+			throw new Exception('Attempted to use Flash without an active session. Did you forget to call session_start()?');
 		}
 	}
 
@@ -63,7 +63,7 @@ 
 	 * @return boolean
 	 */
 	public function enabled() {
-		return $this->isValidStorage( $this->storage );
+		return $this->isValidStorage($this->storage);
 	}
 
 	/**
@@ -72,11 +72,11 @@ 
 	 * @param  string|null $key
 	 * @return array|\ArrayAccess
 	 */
-	public function get( $key = null ) {
+	public function get($key = null) {
 		$this->validateStorage();
 
-		$items = $this->peek( $key );
-		$this->clear( $key );
+		$items = $this->peek($key);
+		$this->clear($key);
 		return $items;
 	}
 
@@ -86,15 +86,15 @@ 
 	 * @param  string|null $key
 	 * @return array|\ArrayAccess
 	 */
-	public function peek( $key = null ) {
+	public function peek($key = null) {
 		$this->validateStorage();
 		
-		if ( $key === null ) {
+		if ($key === null) {
 			return $this->storage;
 		}
 		
-		if ( isset( $this->storage[ $key ] ) ) {
-			return $this->storage[ $key ];
+		if (isset($this->storage[$key])) {
+			return $this->storage[$key];
 		}
 
 		return [];
@@ -106,18 +106,18 @@ 
 	 * @param string $key
 	 * @param mixed  $new_items
 	 */
-	public function add( $key, $new_items ) {
+	public function add($key, $new_items) {
 		$this->validateStorage();
 		
-		$new_items = is_array( $new_items ) ? $new_items : [$new_items];
+		$new_items = is_array($new_items) ? $new_items : [$new_items];
 
-		$items = (array) $this->peek( $key );
-		$items = array_merge( $items, $new_items );
+		$items = (array) $this->peek($key);
+		$items = array_merge($items, $new_items);
 		
-		if ( $key === null ) {
+		if ($key === null) {
 			$this->storage = $items;
 		} else {
-			$this->storage[ $key ] = $items;
+			$this->storage[$key] = $items;
 		}
 	}
 
@@ -127,13 +127,13 @@ 
 	 * @param  string|null $key
 	 * @return null
 	 */
-	public function clear( $key = null ) {
+	public function clear($key = null) {
 		$this->validateStorage();
 		
-		if ( $key === null ) {
+		if ($key === null) {
 			$this->storage = [];
 		} else {
-			$this->storage[ $key ] = [];
+			$this->storage[$key] = [];
 		}
 	}
 }
\ No newline at end of file

src/Routing/Handler.php

Spacing +16 added lines, -16 removed lines

@@ -22,8 +22,8 @@ 
 	 * 
 	 * @param string|Closure $handler
 	 */
-	public function __construct( $handler ) {
-		$this->set( $handler );
+	public function __construct($handler) {
+		$this->set($handler);
 	}
 
 	/**
@@ -32,15 +32,15 @@ 
 	 * @param  string|Closure      $handler
 	 * @return callable|array|null
 	 */
-	protected function parse( $handler ) {
-		if ( $handler instanceof Closure ) {
+	protected function parse($handler) {
+		if ($handler instanceof Closure) {
 			return $handler;
 		}
 
-		if ( is_string( $handler ) )  {
-			$handlerPieces = preg_split( '/@|::/', $handler, 2 );
-			if ( count( $handlerPieces ) === 1 ) {
-				if ( is_callable( $handlerPieces[0] ) ) {
+		if (is_string($handler)) {
+			$handlerPieces = preg_split('/@|::/', $handler, 2);
+			if (count($handlerPieces) === 1) {
+				if (is_callable($handlerPieces[0])) {
 					return $handlerPieces[0];
 				}
 				return null;
@@ -60,11 +60,11 @@ 
 	 * @param  string|Closure $new_handler
 	 * @return null
 	 */
-	public function set( $new_handler ) {
-		$handler = $this->parse( $new_handler );
+	public function set($new_handler) {
+		$handler = $this->parse($new_handler);
 
-		if ( $handler === null ) {
-			throw new Exception( 'No or invalid handler provided.' );
+		if ($handler === null) {
+			throw new Exception('No or invalid handler provided.');
 		}
 
 		$this->handler = $handler;
@@ -77,14 +77,14 @@ 
 	 */
 	public function execute() {
 		$arguments = func_get_args();
-		if ( is_callable( $this->handler ) ) {
-			return call_user_func_array( $this->handler, $arguments );
+		if (is_callable($this->handler)) {
+			return call_user_func_array($this->handler, $arguments);
 		}
 
 		$class = $this->handler['class'];
 		$method = $this->handler['method'];
 
-		$controller = Framework::instantiate( $class );
-		return call_user_func_array( [$controller, $method], $arguments );
+		$controller = Framework::instantiate($class);
+		return call_user_func_array([$controller, $method], $arguments);
 	}
 }

src/Routing/Conditions/PostSlug.php

Spacing +4 added lines, -4 removed lines

@@ -20,22 +20,22 @@
 	 * 
 	 * @param string $post_slug
 	 */
-	public function __construct( $post_slug ) {
+	public function __construct($post_slug) {
 		$this->post_slug = $post_slug;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
+	public function satisfied(Request $request) {
 		$post = get_post();
-		return ( $post && $this->post_slug === $post->post_name );
+		return ($post && $this->post_slug === $post->post_name);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getArguments( Request $request ) {
+	public function getArguments(Request $request) {
 		return [$this->post_slug];
 	}
 }