htmlburger / wpemerge

src/Routing/Conditions/PostSlug.php

Spacing +4 added lines, -4 removed lines

@@ -20,22 +20,22 @@
 	 * 
 	 * @param string $post_slug
 	 */
-	public function __construct( $post_slug ) {
+	public function __construct($post_slug) {
 		$this->post_slug = $post_slug;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
+	public function satisfied(Request $request) {
 		$post = get_post();
-		return ( $post && $this->post_slug === $post->post_name );
+		return ($post && $this->post_slug === $post->post_name);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getArguments( Request $request ) {
+	public function getArguments(Request $request) {
 		return [$this->post_slug];
 	}
 }

src/Routing/Conditions/PostTemplate.php

Spacing +6 added lines, -6 removed lines

@@ -28,24 +28,24 @@
 	 * @param string          $post_template
 	 * @param string|string[] $post_types
 	 */
-	public function __construct( $post_template, $post_types = [] ) {
+	public function __construct($post_template, $post_types = []) {
 		$this->post_template = $post_template;
-		$this->post_types = is_array( $post_types ) ? $post_types : [$post_types];
+		$this->post_types = is_array($post_types) ? $post_types : [$post_types];
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
-		$template = get_post_meta( get_the_ID(), '_wp_page_template', true );
+	public function satisfied(Request $request) {
+		$template = get_post_meta(get_the_ID(), '_wp_page_template', true);
 		$template = $template ? $template : 'default';
-		return ( is_singular( $this->post_types ) && $this->post_template === $template );
+		return (is_singular($this->post_types) && $this->post_template === $template);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getArguments( Request $request ) {
+	public function getArguments(Request $request) {
 		return [$this->post_template, $this->post_types];
 	}
 }

src/Routing/Conditions/Custom.php

Spacing +5 added lines, -5 removed lines

@@ -28,22 +28,22 @@
 	 * @param callable $callable
 	 * @param mixed    ...$arguments
 	 */
-	public function __construct( $callable ) {
+	public function __construct($callable) {
 		$this->callable = $callable;
-		$this->arguments = array_slice( func_get_args(), 1 );
+		$this->arguments = array_slice(func_get_args(), 1);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function satisfied( Request $request ) {
-		return call_user_func_array( $this->callable, $this->arguments );
+	public function satisfied(Request $request) {
+		return call_user_func_array($this->callable, $this->arguments);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getArguments( Request $request ) {
+	public function getArguments(Request $request) {
 		return $this->arguments;
 	}
 }

src/Routing/Conditions/PostId.php

Spacing +3 added lines, -3 removed lines

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

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);
 }