htmlburger / wpemerge

src/ServiceProviders/ServiceProviderInterface.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 	 * @param  \Pimple\Container $container
 	 * @return null
 	 */
-	public function register( $container );
+	public function register($container);
 
 	/**
 	 * Bootstrap any services if needed
@@ -20,5 +20,5 @@ 
 	 * @param  \Pimple\Container $container
 	 * @return null
 	 */
-	public function boot( $container );
+	public function boot($container);
 }
\ 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
 	 */
-	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

src/Routing/RouteInterface.php

Spacing +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
 	 * @param  \CarbonFramework\Request            $request
 	 * @return \Psr\Http\Message\ResponseInterface
 	 */
-	public function handle( $request );
+	public function handle($request);
 }

src/Routing/Middleware/MiddlewareInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,5 +14,5 @@
 	 * @param \CarbonFramework\Request $request
 	 * @param  Closure                 $next
 	 */
-	public function handle( $request, Closure $next );
+	public function handle($request, Closure $next);
 }

src/Routing/Middleware/HasMiddlewareInterface.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	 * @param  string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware
 	 * @return object
 	 */
-	public function addMiddleware( $middleware );
+	public function addMiddleware($middleware);
 
 	/**
 	 * Alias for addMiddleware
@@ -30,7 +30,7 @@ 
 	 * @param  string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware
 	 * @return object
 	 */
-	public function add( $middleware );
+	public function add($middleware);
 
 	/**
 	 * Execute an array of middleware recursively (last in, first out)
@@ -40,5 +40,5 @@ 
 	 * @param  Closure                                                   $next
 	 * @return ResponseInterface
 	 */
-	public function executeMiddleware( $middleware, $request, Closure $next );
+	public function executeMiddleware($middleware, $request, Closure $next);
 }

src/Routing/Middleware/OldInput.php

Spacing +6 added lines, -6 removed lines

@@ -14,14 +14,14 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public function handle( $request, Closure $next ) {
-		$response = $next( $request );
+	public function handle($request, Closure $next) {
+		$response = $next($request);
 
-		if ( Flash::enabled() ) {
-			Flash::clear( OldInputService::getFlashKey() );
+		if (Flash::enabled()) {
+			Flash::clear(OldInputService::getFlashKey());
 
-			if ( $request->getMethod() === 'POST' ) {
-				Flash::add( OldInputService::getFlashKey(), $request->post() );
+			if ($request->getMethod() === 'POST') {
+				Flash::add(OldInputService::getFlashKey(), $request->post());
 			}
 		}
 		

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,17 +50,17 @@ 
 	 * @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 ) ) {
+		foreach ($middleware as $item) {
+			if ( ! $this->isMiddleware($item)) {
 				var_dump($item);
-				throw new Exception( 'Passed middleware must be a callable or the name of a class which implements the ' . MiddlewareInterface::class . ' interface.' );
+				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;
 	}
 
@@ -70,8 +70,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);
 	}
 
 	/**
@@ -82,22 +82,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/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/Conditions/Url.php

Spacing +26 added lines, -26 removed lines

@@ -42,9 +42,9 @@ 
 	 * 
 	 * @param string $url
 	 */
-	public function __construct( $url ) {
-		$url = UrlUtility::addLeadingSlash( $url );
-		$url = UrlUtility::addTrailingSlash( $url );
+	public function __construct($url) {
+		$url = UrlUtility::addLeadingSlash($url);
+		$url = UrlUtility::addTrailingSlash($url);
 		$this->url = $url;
 	}
 
@@ -52,28 +52,28 @@ 
 	 * {@inheritDoc}
 	 */
 	public function satisfied() {
-		$validation_regex = $this->getValidationRegex( $this->getUrl() );
+		$validation_regex = $this->getValidationRegex($this->getUrl());
 		$url = $this->getCurrentPath();
-		return preg_match( $validation_regex, $url );
+		return preg_match($validation_regex, $url);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public function getArguments() {
-		$validation_regex = $this->getValidationRegex( $this->getUrl() );
+		$validation_regex = $this->getValidationRegex($this->getUrl());
 		$url = $this->getCurrentPath();
 		$matches = [];
-		$success = preg_match( $validation_regex, $url, $matches );
+		$success = preg_match($validation_regex, $url, $matches);
 
-		if ( ! $success ) {
+		if ( ! $success) {
 			return []; // this should not normally happen
 		}
 
 		$arguments = [];
-		$parameter_names = $this->getParameterNames( $this->getUrl() );
-		foreach ( $parameter_names as $parameter_name ) {
-			$arguments[] = ! empty( $matches[ $parameter_name ] ) ? $matches[ $parameter_name ] : '';
+		$parameter_names = $this->getParameterNames($this->getUrl());
+		foreach ($parameter_names as $parameter_name) {
+			$arguments[] = ! empty($matches[$parameter_name]) ? $matches[$parameter_name] : '';
 		}
 		
 		return $arguments;
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	protected function getCurrentPath() {
-		return UrlUtility::addTrailingSlash( UrlUtility::getCurrentPath() );
+		return UrlUtility::addTrailingSlash(UrlUtility::getCurrentPath());
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 * @param  Url $url
 	 * @return Url
 	 */
-	public function concatenate( Url $url ) {
-		return new static( UrlUtility::removeTrailingSlash( $this->getUrl() ) . $url->getUrl() );
+	public function concatenate(Url $url) {
+		return new static(UrlUtility::removeTrailingSlash($this->getUrl()) . $url->getUrl());
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 * @param  string   $url
 	 * @return string[]
 	 */
-	protected function getParameterNames( $url ) {
+	protected function getParameterNames($url) {
 		$matches = [];
-		preg_match_all( $this->url_regex, $url, $matches );
+		preg_match_all($this->url_regex, $url, $matches);
 		return $matches['name'];
 	}
 
@@ -125,29 +125,29 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	protected function getValidationRegex( $url ) {
+	protected function getValidationRegex($url) {
 		$parameters = [];
 
 		// Replace all parameters with placeholders
-		$validation_regex = preg_replace_callback( $this->url_regex, function( $matches ) use ( &$parameters ) {
+		$validation_regex = preg_replace_callback($this->url_regex, function($matches) use (&$parameters) {
 			$name = $matches['name'];
-			$optional = ! empty( $matches['optional'] );
-			$regex = ! empty( $matches['regex'] ) ? $matches['regex'] : $this->parameter_regex;
+			$optional = ! empty($matches['optional']);
+			$regex = ! empty($matches['regex']) ? $matches['regex'] : $this->parameter_regex;
 			$replacement = '(?:/(?P<' . $name . '>' . $regex . '))';
-			if ( $optional ) {
+			if ($optional) {
 				$replacement .= '?';
 			}
 
-			$placeholder = '___placeholder_' . sha1( count( $parameters) . '_' . $replacement . '_' . uniqid() ) . '___';
-			$parameters[ $placeholder ] = $replacement;
+			$placeholder = '___placeholder_' . sha1(count($parameters) . '_' . $replacement . '_' . uniqid()) . '___';
+			$parameters[$placeholder] = $replacement;
 			return $placeholder;
-		}, $url );
+		}, $url);
 
 		// quote the remaining string so that it does not get evaluated as regex
-		$validation_regex = preg_quote( $validation_regex, '~' );
+		$validation_regex = preg_quote($validation_regex, '~');
 
 		// replace the placeholders with the real parameter regexes
-		$validation_regex = str_replace( array_keys( $parameters ), array_values( $parameters ), $validation_regex );
+		$validation_regex = str_replace(array_keys($parameters), array_values($parameters), $validation_regex);
 
 		// make sure that the regex matches the entire string
 		$validation_regex = '~\A' . $validation_regex . '\z~';