htmlburger / wpemerge

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

Spacing +21 added lines, -21 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param string|ConditionInterface $target
 	 * @param Closure                   $callable
 	 */
-	public function __construct( $target, Closure $callable ) {
-		if ( is_string( $target ) ) {
-			$target = new UrlCondition( $target );
+	public function __construct($target, Closure $callable) {
+		if (is_string($target)) {
+			$target = new UrlCondition($target);
 		}
 
-		if ( ! is_a( $target, UrlCondition::class ) ) {
-			throw new Exception( 'Route groups can only use route strings.' );
+		if ( ! is_a($target, UrlCondition::class)) {
+			throw new Exception('Route groups can only use route strings.');
 		}
 
 		$this->target = $target;
 
-		$callable( $this );
+		$callable($this);
 	}
 
 	/**
@@ -51,8 +51,8 @@ 
 	 */
 	protected function getSatisfiedRoute() {
 		$routes = $this->getRoutes();
-		foreach ( $routes as $route ) {
-			if ( $route->satisfied() ) {
+		foreach ($routes as $route) {
+			if ($route->satisfied()) {
 				return $route;
 			}
 		}
@@ -70,37 +70,37 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function handle( $request ) {
+	public function handle($request) {
 		$route = $this->getSatisfiedRoute();
-		return $route ? $route->handle( $request ) : null;
+		return $route ? $route->handle($request) : null;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function route( $methods, $target, $handler ) {
-		if ( is_string( $target ) ) {
-			$target = new UrlCondition( $target );
+	public function route($methods, $target, $handler) {
+		if (is_string($target)) {
+			$target = new UrlCondition($target);
 		}
 
-		if ( ! is_a( $target, UrlCondition::class ) ) {
-			throw new Exception( 'Routes inside route groups can only use route strings.' );
+		if ( ! is_a($target, UrlCondition::class)) {
+			throw new Exception('Routes inside route groups can only use route strings.');
 		}
 
-		$target = $this->target->concatenate( $target );
-		return $this->traitRoute( $methods, $target, $handler );
+		$target = $this->target->concatenate($target);
+		return $this->traitRoute($methods, $target, $handler);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function addMiddleware( $middleware ) {
+	public function addMiddleware($middleware) {
 		$routes = $this->getRoutes();
 
-		foreach ( $routes as $route ) {
-			$route->addMiddleware( $middleware );
+		foreach ($routes as $route) {
+			$route->addMiddleware($middleware);
 		}
 		
-		return $this->traitAddMiddleware( $middleware );
+		return $this->traitAddMiddleware($middleware);
 	}
 }

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 (bool) preg_match( $validation_regex, $url );
+		return (bool) 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~';

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/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/Route.php

Spacing +22 added lines, -22 removed lines

@@ -44,29 +44,29 @@ 
 	 * @param mixed           $target
 	 * @param string|\Closure $handler
 	 */
-	public function __construct( $methods, $target, $handler ) {
-		if ( is_string( $target ) ) {
-			$target = new UrlCondition( $target );
+	public function __construct($methods, $target, $handler) {
+		if (is_string($target)) {
+			$target = new UrlCondition($target);
 		}
 
-		if ( is_array( $target ) ) {
-			$target = $this->condition( $target );
+		if (is_array($target)) {
+			$target = $this->condition($target);
 		}
 
-		if ( ! is_a( $target, ConditionInterface::class ) ) {
-			throw new Exception( 'Route target is not a valid route string or condition.' );
+		if ( ! is_a($target, ConditionInterface::class)) {
+			throw new Exception('Route target is not a valid route string or condition.');
 		}
 
 		$this->methods = $methods;
 		$this->target = $target;
-		$this->handler = new Handler( $handler );
+		$this->handler = new Handler($handler);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public function satisfied() {
-		if ( ! in_array( $_SERVER['REQUEST_METHOD'], $this->methods) ) {
+		if ( ! in_array($_SERVER['REQUEST_METHOD'], $this->methods)) {
 			return false;
 		}
 		return $this->target->satisfied();
@@ -75,10 +75,10 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function handle( $request ) {
-		$arguments = array_merge( [$request], $this->target->getArguments() );
-		return $this->executeMiddleware( $this->getMiddleware(), $request, function() use ( $arguments ) {
-			return call_user_func_array( [$this->handler, 'execute'], $arguments );
+	public function handle($request) {
+		$arguments = array_merge([$request], $this->target->getArguments());
+		return $this->executeMiddleware($this->getMiddleware(), $request, function() use ($arguments) {
+			return call_user_func_array([$this->handler, 'execute'], $arguments);
 		} );
 	}
 
@@ -88,21 +88,21 @@ 
 	 * @param  array $options
 	 * @return ConditionInterface
 	 */
-	public function condition( $options ) {
-		if ( count( $options ) === 0 ) {
-			throw new Exception( 'No condition type specified.' );
+	public function condition($options) {
+		if (count($options) === 0) {
+			throw new Exception('No condition type specified.');
 		}
 
 		$condition_type = $options[0];
-		$arguments = array_slice( $options, 1 );
+		$arguments = array_slice($options, 1);
 
-		$condition_class = Framework::resolve( 'framework.routing.conditions.' . $condition_type );
-		if ( $condition_class === null ) {
-			throw new Exception( 'Unknown condition type specified: ' . $condition_type );
+		$condition_class = Framework::resolve('framework.routing.conditions.' . $condition_type);
+		if ($condition_class === null) {
+			throw new Exception('Unknown condition type specified: ' . $condition_type);
 		}
 
-		$reflection = new ReflectionClass( $condition_class );
-		$condition = $reflection->newInstanceArgs( $arguments );
+		$reflection = new ReflectionClass($condition_class);
+		$condition = $reflection->newInstanceArgs($arguments);
 		return $condition;
 	}
 }