htmlburger / wpemerge

src/Routing/Conditions/Url.php

Spacing +29 added lines, -29 removed lines

@@ -43,38 +43,38 @@ 
 	 * 
 	 * @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;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
-		$validation_regex = $this->getValidationRegex( $this->getUrl() );
-		$url = UrlUtility::getCurrentPath( $request );
-		return (bool) preg_match( $validation_regex, $url );
+	public function satisfied(Request $request) {
+		$validation_regex = $this->getValidationRegex($this->getUrl());
+		$url = UrlUtility::getCurrentPath($request);
+		return (bool) preg_match($validation_regex, $url);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getArguments( Request $request ) {
-		$validation_regex = $this->getValidationRegex( $this->getUrl() );
-		$url = UrlUtility::getCurrentPath( $request );
+	public function getArguments(Request $request) {
+		$validation_regex = $this->getValidationRegex($this->getUrl());
+		$url = UrlUtility::getCurrentPath($request);
 		$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;
@@ -95,8 +95,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());
 	}
 
 	/**
@@ -105,9 +105,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'];
 	}
 
@@ -117,29 +117,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/Routing/Conditions/PostType.php

Spacing +3 added lines, -3 removed lines

@@ -20,21 +20,21 @@
 	 * 
 	 * @param string $post_type
 	 */
-	public function __construct( $post_type ) {
+	public function __construct($post_type) {
 		$this->post_type = $post_type;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
+	public function satisfied(Request $request) {
 		return $this->post_type === get_post_type();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getArguments( Request $request ) {
+	public function getArguments(Request $request) {
 		return [$this->post_type];
 	}
 }

src/Routing/Conditions/ConditionInterface.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 	 * @param  Request $request
 	 * @return boolean
 	 */
-	public function satisfied( Request $request );
+	public function satisfied(Request $request);
 
 	/**
 	 * Return an array of arguments for use in request
@@ -22,5 +22,5 @@ 
 	 * @param  Request $request
 	 * @return array
 	 */
-	public function getArguments( Request $request );
+	public function getArguments(Request $request);
 }

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,18 +29,18 @@ 
 	 * @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');
 		$request = Request::fromGlobals();
 
-		foreach ( $routes as $route ) {
-			$route->addMiddleware( $global_middleware );
+		foreach ($routes as $route) {
+			$route->addMiddleware($global_middleware);
 		}
 
-		foreach ( $routes as $route ) {
-			if ( $route->satisfied( $request ) ) {
-				return $this->handle( $request, $route );
+		foreach ($routes as $route) {
+			if ($route->satisfied($request)) {
+				return $this->handle($request, $route);
 			}
 		}
 		
@@ -53,17 +53,17 @@ 
 	 * @param  RouteInterface $route
 	 * @return string
 	 */
-	protected function handle( Request $request, RouteInterface $route ) {
-		$response = $route->handle( $request );
+	protected function handle(Request $request, RouteInterface $route) {
+		$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/RouteInterface.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 	 * @param  Request $request
 	 * @return boolean
 	 */
-	public function satisfied( Request $request );
+	public function satisfied(Request $request);
 
 	/**
 	 * Return a response for the given request
@@ -23,5 +23,5 @@ 
 	 * @param  Request                             $request
 	 * @return \Psr\Http\Message\ResponseInterface
 	 */
-	public function handle( Request $request );
+	public function handle(Request $request);
 }

src/Routing/RouteGroup.php

Spacing +25 added lines, -25 removed lines

@@ -31,18 +31,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);
 	}
 
 	/**
@@ -50,10 +50,10 @@ 
 	 * 
 	 * @return RouteInterface|null
 	 */
-	protected function getSatisfiedRoute( Request $request ) {
+	protected function getSatisfiedRoute(Request $request) {
 		$routes = $this->getRoutes();
-		foreach ( $routes as $route ) {
-			if ( $route->satisfied( $request ) ) {
+		foreach ($routes as $route) {
+			if ($route->satisfied($request)) {
 				return $route;
 			}
 		}
@@ -63,45 +63,45 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
-		$route = $this->getSatisfiedRoute( $request );
+	public function satisfied(Request $request) {
+		$route = $this->getSatisfiedRoute($request);
 		return $route !== null;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function handle( Request $request ) {
-		$route = $this->getSatisfiedRoute( $request );
-		return $route ? $route->handle( $request ) : null;
+	public function handle(Request $request) {
+		$route = $this->getSatisfiedRoute($request);
+		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/Route.php

Spacing +24 added lines, -24 removed lines

@@ -45,41 +45,41 @@ 
 	 * @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( Request $request ) {
-		if ( ! in_array( $request->getMethod(), $this->methods) ) {
+	public function satisfied(Request $request) {
+		if ( ! in_array($request->getMethod(), $this->methods)) {
 			return false;
 		}
-		return $this->target->satisfied( $request );
+		return $this->target->satisfied($request);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function handle( Request $request ) {
-		$arguments = array_merge( [$request], $this->target->getArguments( $request ) );
-		return $this->executeMiddleware( $this->getMiddleware(), $request, function() use ( $arguments ) {
-			return call_user_func_array( [$this->handler, 'execute'], $arguments );
+	public function handle(Request $request) {
+		$arguments = array_merge([$request], $this->target->getArguments($request));
+		return $this->executeMiddleware($this->getMiddleware(), $request, function() use ($arguments) {
+			return call_user_func_array([$this->handler, 'execute'], $arguments);
 		} );
 	}
 
@@ -89,21 +89,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;
 	}
 }

src/Url.php

Spacing +11 added lines, -11 removed lines

@@ -13,10 +13,10 @@ 
 	 * 
 	 * @return string
 	 */
-	public static function getCurrentPath( Request $request ) {
+	public static function getCurrentPath(Request $request) {
 		$url = $request->getUrl();
-		$relative_url = substr( $url, strlen( home_url( '/' ) ) );
-		return static::addTrailingSlash( static::addLeadingSlash( $relative_url ) );
+		$relative_url = substr($url, strlen(home_url('/')));
+		return static::addTrailingSlash(static::addLeadingSlash($relative_url));
 	}
 
 	/**
@@ -25,8 +25,8 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function addLeadingSlash( $url ) {
-		return '/' . static::removeLeadingSlash( $url );
+	public static function addLeadingSlash($url) {
+		return '/' . static::removeLeadingSlash($url);
 	}
 
 	/**
@@ -35,8 +35,8 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function removeLeadingSlash( $url ) {
-		return preg_replace( '/^\/+/', '', $url );
+	public static function removeLeadingSlash($url) {
+		return preg_replace('/^\/+/', '', $url);
 	}
 
 	/**
@@ -45,8 +45,8 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function addTrailingSlash( $url ) {
-		return trailingslashit( $url );
+	public static function addTrailingSlash($url) {
+		return trailingslashit($url);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function removeTrailingSlash( $url ) {
-		return untrailingslashit( $url );
+	public static function removeTrailingSlash($url) {
+		return untrailingslashit($url);
 	}
 }