htmlburger / wpemerge

src/Routing/Route.php

Spacing +31 added lines, -31 removed lines

@@ -45,22 +45,22 @@ 
 	 * @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);
 	}
 
 	/**
@@ -69,41 +69,41 @@ 
 	 * @param  array              $options
 	 * @return ConditionInterface
 	 */
-	protected function condition( $options ) {
-		if ( count( $options ) === 0 ) {
-			throw new Exception( 'No condition type specified.' );
+	protected 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;
 	}
 
 	/**
 	 * {@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);
 		} );
 	}
 
@@ -113,16 +113,16 @@ 
 	 * @param  string $rewrite_to
 	 * @return RouteInterface
 	 */
-	public function rewrite( $rewrite_to ) {
-		if ( ! is_a( $this->target, UrlCondition::class ) ) {
-			throw new Exception( 'Only routes with url targets can add rewrite rules.' );
+	public function rewrite($rewrite_to) {
+		if ( ! is_a($this->target, UrlCondition::class)) {
+			throw new Exception('Only routes with url targets can add rewrite rules.');
 		}
 
-		$regex = $this->target->getValidationRegex( $this->target->getUrl(), false );
-		$regex = preg_replace( '~^\^/~', '^', $regex ); // rewrite rules require NO leading slash
+		$regex = $this->target->getValidationRegex($this->target->getUrl(), false);
+		$regex = preg_replace('~^\^/~', '^', $regex); // rewrite rules require NO leading slash
 
-		add_filter( 'carbon_framework_routing_rewrite_rules', function( $rules ) use ( $regex, $rewrite_to ) {
-			$rules[ $regex ] = $rewrite_to;
+		add_filter('carbon_framework_routing_rewrite_rules', function($rules) use ($regex, $rewrite_to) {
+			$rules[$regex] = $rewrite_to;
 			return $rules;
 		} );
 

src/Response.php

Spacing +38 added lines, -38 removed lines

@@ -26,11 +26,11 @@ 
 	 * @param  ResponseInterface $response
 	 * @return null
 	 */
-	public static function respond( ResponseInterface $response ) {
-		if ( ! headers_sent() ) {
-			static::sendHeaders( $response );
+	public static function respond(ResponseInterface $response) {
+		if ( ! headers_sent()) {
+			static::sendHeaders($response);
 		}
-		static::sendBody( $response );
+		static::sendBody($response);
 	}
 
 	/**
@@ -39,19 +39,19 @@ 
 	 * @param  ResponseInterface $response
 	 * @return null
 	 */
-	protected static function sendHeaders( $response ) {
+	protected static function sendHeaders($response) {
 		// Status
-		header( sprintf(
+		header(sprintf(
 			'HTTP/%s %s %s',
 			$response->getProtocolVersion(),
 			$response->getStatusCode(),
 			$response->getReasonPhrase()
-		) );
+		));
 
 		// Headers
-		foreach ( $response->getHeaders() as $name => $values ) {
-			foreach ( $values as $value ) {
-				header( sprintf( '%s: %s', $name, $value ), false );
+		foreach ($response->getHeaders() as $name => $values) {
+			foreach ($values as $value) {
+				header(sprintf('%s: %s', $name, $value), false);
 			}
 		}
 	}
@@ -62,27 +62,27 @@ 
 	 * @param  ResponseInterface $response
 	 * @return null
 	 */
-	protected static function sendBody( $response, $chunk_size = 4096 ) {
+	protected static function sendBody($response, $chunk_size = 4096) {
 		$body = $response->getBody();
-		if ( $body->isSeekable() ) {
+		if ($body->isSeekable()) {
 			$body->rewind();
 		}
 
-		$content_length = $response->getHeaderLine( 'Content-Length' );
-		if ( ! $content_length ) {
+		$content_length = $response->getHeaderLine('Content-Length');
+		if ( ! $content_length) {
 			$content_length = $body->getSize();
 		}
 
 		$content_left = $content_length ? $content_length : -1;
-		$amount_to_read = $content_left > -1 ? min( $chunk_size, $content_left ) : $chunk_size;
-		while ( ! $body->eof() ) {
-			echo $body->read( $amount_to_read );
+		$amount_to_read = $content_left > -1 ? min($chunk_size, $content_left) : $chunk_size;
+		while ( ! $body->eof()) {
+			echo $body->read($amount_to_read);
 
-			if ( $content_left > -1 ) {
+			if ($content_left > -1) {
 				$content_left -= $amount_to_read;
 			}
 
-			if ( connection_status() != CONNECTION_NORMAL ) {
+			if (connection_status() != CONNECTION_NORMAL) {
 				break;
 			}
 		}
@@ -95,8 +95,8 @@ 
 	 * @param  string       $output
 	 * @return Psr7Response
 	 */
-	public static function output( Psr7Response $response, $output ) {
-		$response = $response->withBody( Psr7\stream_for( $output ) );
+	public static function output(Psr7Response $response, $output) {
+		$response = $response->withBody(Psr7\stream_for($output));
 		return $response;
 	}
 
@@ -108,15 +108,15 @@ 
 	 * @param  array           $context
 	 * @return Psr7Response
 	 */
-	public static function template( Psr7Response $response, $templates, $context = array() ) {
-		$templates = is_array( $templates ) ? $templates : [$templates];
-		$template = locate_template( $templates, false );
+	public static function template(Psr7Response $response, $templates, $context = array()) {
+		$templates = is_array($templates) ? $templates : [$templates];
+		$template = locate_template($templates, false);
 
-		$engine = Framework::resolve( 'framework.templating.engine' );
-		$html = $engine->render( $template, $context );
+		$engine = Framework::resolve('framework.templating.engine');
+		$html = $engine->render($template, $context);
 
-		$response = $response->withHeader( 'Content-Type', 'text/html' );
-		$response = $response->withBody( Psr7\stream_for( $html ) );
+		$response = $response->withHeader('Content-Type', 'text/html');
+		$response = $response->withBody(Psr7\stream_for($html));
 		return $response;
 	}
 
@@ -127,9 +127,9 @@ 
 	 * @param  array        $data
 	 * @return Psr7Response
 	 */
-	public static function json( Psr7Response $response, $data ) {
-		$response = $response->withHeader( 'Content-Type', 'application/json' );
-		$response = $response->withBody( Psr7\stream_for( wp_json_encode( $data ) ) );
+	public static function json(Psr7Response $response, $data) {
+		$response = $response->withHeader('Content-Type', 'application/json');
+		$response = $response->withBody(Psr7\stream_for(wp_json_encode($data)));
 		return $response;
 	}
 
@@ -141,9 +141,9 @@ 
 	 * @param  integer      $status
 	 * @return Psr7Response
 	 */
-	public static function redirect( Psr7Response $response, $url, $status = 302 ) {
-		$response = $response->withStatus( $status );
-		$response = $response->withHeader( 'Location', $url );
+	public static function redirect(Psr7Response $response, $url, $status = 302) {
+		$response = $response->withStatus($status);
+		$response = $response->withHeader('Location', $url);
 		return $response;
 	}
 
@@ -154,13 +154,13 @@ 
 	 * @param  integer      $status
 	 * @return Psr7Response
 	 */
-	public static function error( Psr7Response $response, $status ) {
+	public static function error(Psr7Response $response, $status) {
 		global $wp_query;
-		if ( $status === 404 ) {
+		if ($status === 404) {
 			$wp_query->set_404();
 		}
 
-		$response = $response->withStatus( $status );
-		return static::template( $response, array( $status . '.php', 'index.php' ) );
+		$response = $response->withStatus($status);
+		return static::template($response, array($status . '.php', 'index.php'));
 	}
 }

src/Routing/Conditions/Url.php

Spacing +30 added lines, -30 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'];
 	}
 
@@ -118,29 +118,29 @@ 
 	 * @param  boolean $wrap
 	 * @return string
 	 */
-	public function getValidationRegex( $url, $wrap = true ) {
+	public function getValidationRegex($url, $wrap = true) {
 		$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);
 
 		// add a question mark to the end to make the trailing slash optional
 		$validation_regex = $validation_regex . '?';
@@ -148,7 +148,7 @@ 
 		// make sure the regex matches the entire url
 		$validation_regex = '^' . $validation_regex . '$';
 
-		if ( $wrap ) {
+		if ($wrap) {
 			$validation_regex = '~' . $validation_regex . '~';
 		}
 

src/Url.php

Spacing +13 added lines, -13 removed lines

@@ -13,12 +13,12 @@ 
 	 * 
 	 * @return string
 	 */
-	public static function getCurrentPath( Request $request ) {
+	public static function getCurrentPath(Request $request) {
 		$url = $request->getUrl();
-		$relative_url = substr( $url, strlen( home_url( '/' ) ) );
-		$relative_url = static::addLeadingSlash( $relative_url );
-		$relative_url = preg_replace( '~\?.*~', '', $relative_url );
-		$relative_url = static::addTrailingSlash( $relative_url );
+		$relative_url = substr($url, strlen(home_url('/')));
+		$relative_url = static::addLeadingSlash($relative_url);
+		$relative_url = preg_replace('~\?.*~', '', $relative_url);
+		$relative_url = static::addTrailingSlash($relative_url);
 		return $relative_url;
 	}
 
@@ -28,8 +28,8 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function addLeadingSlash( $url ) {
-		return '/' . static::removeLeadingSlash( $url );
+	public static function addLeadingSlash($url) {
+		return '/' . static::removeLeadingSlash($url);
 	}
 
 	/**
@@ -38,8 +38,8 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function removeLeadingSlash( $url ) {
-		return preg_replace( '/^\/+/', '', $url );
+	public static function removeLeadingSlash($url) {
+		return preg_replace('/^\/+/', '', $url);
 	}
 
 	/**
@@ -48,8 +48,8 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function addTrailingSlash( $url ) {
-		return trailingslashit( $url );
+	public static function addTrailingSlash($url) {
+		return trailingslashit($url);
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 * @param  string $url
 	 * @return string
 	 */
-	public static function removeTrailingSlash( $url ) {
-		return untrailingslashit( $url );
+	public static function removeTrailingSlash($url) {
+		return untrailingslashit($url);
 	}
 }