htmlburger / wpemerge

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|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];
 				} else {
 					return null;
@@ -62,11 +62,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;
@@ -79,14 +79,14 @@ 
 	 */
 	public function execute() {
 		$arguments = func_get_args();
-		if ( ! is_array( $this->handler ) ) {
-			return call_user_func_array( $this->handler, $arguments );
+		if ( ! is_array($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/Middleware/HasMiddlewareTrait.php

Spacing +20 added lines, -20 removed lines

@@ -23,12 +23,12 @@ 
 	 * @param  any     $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/ServiceProviders/OldInput.php

Spacing +5 added lines, -5 removed lines

@@ -12,22 +12,22 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public function register( $container ) {
-		$container['framework.global_middleware'] = array_merge( $container['framework.global_middleware'], [
+	public function register($container) {
+		$container['framework.global_middleware'] = array_merge($container['framework.global_middleware'], [
 			OldInputMiddleware::class,
-		] );
+		]);
 
 		$container['framework.old_input.old_input'] = function() {
 			return new \CarbonFramework\Input\OldInput();
 		};
 
-		Framework::facade( 'OldInput', \CarbonFramework\Facades\OldInput::class );
+		Framework::facade('OldInput', \CarbonFramework\Facades\OldInput::class);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function boot( $container ) {
+	public function boot($container) {
 		// nothing to boot
 	}
 }
\ No newline at end of file

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/ServiceProviders/Routing.php

Spacing +6 added lines, -6 removed lines

@@ -11,13 +11,13 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function register( $container ) {
-		$container['framework.config'] = array_merge( [
+	public function register($container) {
+		$container['framework.config'] = array_merge([
 			'global_middleware' => [],
-		], $container['framework.config'] );
+		], $container['framework.config']);
 
 		$container['framework.global_middleware'] = $container['framework.config']['global_middleware'];
-		$container['framework.global_middleware'] = apply_filters( 'carbon_framework_global_middleware', $container['framework.global_middleware'] );
+		$container['framework.global_middleware'] = apply_filters('carbon_framework_global_middleware', $container['framework.global_middleware']);
 
 		$container['framework.routing.conditions.custom'] = \CarbonFramework\Routing\Conditions\Custom::class;
 		$container['framework.routing.conditions.url'] = \CarbonFramework\Routing\Conditions\Url::class;
@@ -30,13 +30,13 @@ 
 			return new \CarbonFramework\Routing\Router();
 		};
 
-		Framework::facade( 'Router', \CarbonFramework\Facades\Router::class );
+		Framework::facade('Router', \CarbonFramework\Facades\Router::class);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function boot( $container ) {
+	public function boot($container) {
 		\Router::boot(); // facade
 	}
 }
\ No newline at end of file

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  any     $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
 	 */
-	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 any|array $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 = $this->peek( $key );
-		$items = array_merge( $items, $new_items );
+		$items = $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