htmlburger / wpemerge

src/Routing/Conditions/PostId.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	 * 
 	 * @param string $post_id
 	 */
-	public function __construct( $post_id ) {
+	public function __construct($post_id) {
 		$this->post_id = $post_id;
 	}
 

src/Routing/Conditions/PostSlug.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 	 * 
 	 * @param string $post_slug
 	 */
-	public function __construct( $post_slug ) {
+	public function __construct($post_slug) {
 		$this->post_slug = $post_slug;
 	}
 
@@ -27,7 +27,7 @@ 
 	 */
 	public function satisfied() {
 		$post = get_post();
-		return ( $post && $this->post_slug === $post->post_name );
+		return ($post && $this->post_slug === $post->post_name);
 	}
 
 	/**

src/Routing/Router.php

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 	 * @return null
 	 */
 	public function boot() {
-		add_action( 'template_include', array( $this, 'execute' ), 1000 );
+		add_action('template_include', array($this, 'execute'), 1000);
 	}
 
 	/**
@@ -29,17 +29,17 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function execute( $template ) {
+	public function execute($template) {
 		$routes = $this->getRoutes();
-		$global_middleware = Framework::resolve( 'framework.global_middleware' );
+		$global_middleware = Framework::resolve('framework.global_middleware');
 
-		foreach ( $routes as $route ) {
-			$route->addMiddleware( $global_middleware );
+		foreach ($routes as $route) {
+			$route->addMiddleware($global_middleware);
 		}
 
-		foreach ( $routes as $route ) {
-			if ( $route->satisfied() ) {
-				return $this->handle( $route );
+		foreach ($routes as $route) {
+			if ($route->satisfied()) {
+				return $this->handle($route);
 			}
 		}
 		
@@ -52,18 +52,18 @@ 
 	 * @param  RouteInterface $route
 	 * @return string
 	 */
-	protected function handle( RouteInterface $route ) {
+	protected function handle(RouteInterface $route) {
 		$request = Request::fromGlobals();
-		$response = $route->handle( $request );
+		$response = $route->handle($request);
 
-		if ( ! is_a( $response, ResponseInterface::class ) ) {
-			if ( Framework::debugging() ) {
-				throw new Exception( 'Response returned by controller is not valid (expectected ' . ResponseInterface::class . '; received ' . gettype( $response ) . ').' );
+		if ( ! is_a($response, ResponseInterface::class)) {
+			if (Framework::debugging()) {
+				throw new Exception('Response returned by controller is not valid (expectected ' . ResponseInterface::class . '; received ' . gettype($response) . ').');
 			}
-			$response = FrameworkResponse::error( FrameworkResponse::response(), 500 );
+			$response = FrameworkResponse::error(FrameworkResponse::response(), 500);
 		}
 
-		add_filter( 'carbon_framework_response', function() use ( $response ) {
+		add_filter('carbon_framework_response', function() use ($response) {
 			return $response;
 		} );
 

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