htmlburger / wpemerge

src/template.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@
  * Template used to override the loaded template file by WordPress when a route is handled
  */
 use CarbonFramework\Framework;
-$response = apply_filters( 'carbon_framework_response', null );
-if ( $response !== null ) {
-	Framework::respond( $response );
+$response = apply_filters('carbon_framework_response', null);
+if ($response !== null) {
+	Framework::respond($response);
 }

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.routing.global_middleware'] = $container['framework.config']['global_middleware'];
-		$container['framework.routing.global_middleware'] = apply_filters( 'carbon_framework_global_middleware', $container['framework.routing.global_middleware'] );
+		$container['framework.routing.global_middleware'] = apply_filters('carbon_framework_global_middleware', $container['framework.routing.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/ServiceProviders/OldInput.php

Spacing +5 added lines, -5 removed lines

@@ -12,22 +12,22 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public function register( $container ) {
-		$container['framework.routing.global_middleware'] = array_merge( $container['framework.routing.global_middleware'], [
+	public function register($container) {
+		$container['framework.routing.global_middleware'] = array_merge($container['framework.routing.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/Framework.php

Spacing +35 added lines, -35 removed lines

@@ -38,7 +38,7 @@ 
 	 * @return boolean
 	 */
 	public static function debugging() {
-		return ( defined( 'WP_DEBUG' ) && WP_DEBUG );
+		return (defined('WP_DEBUG') && WP_DEBUG);
 	}
 
 	/**
@@ -57,8 +57,8 @@ 
 	 * @return null
 	 */
 	protected static function verifyBoot() {
-		if ( ! static::isBooted() ) {
-			throw new Exception( get_called_class() . ' must be booted first.' );
+		if ( ! static::isBooted()) {
+			throw new Exception(get_called_class() . ' must be booted first.');
 		}
 	}
 
@@ -68,7 +68,7 @@ 
 	 * @return Container
 	 */
 	public static function getContainer() {
-		if ( static::$container === null ) {
+		if (static::$container === null) {
 			static::$container = new Container();
 		}
 		return static::$container;
@@ -82,29 +82,29 @@ 
 	 * @throws Exception
 	 * @return null
 	 */
-	public static function boot( $config = [] ) {
-		if ( static::isBooted() ) {
-			throw new Exception( get_called_class() . ' already booted.' );
+	public static function boot($config = []) {
+		if (static::isBooted()) {
+			throw new Exception(get_called_class() . ' already booted.');
 		}
 		static::$booted = true;
 
 		$container = static::getContainer();
 
-		$container['framework.config'] = array_merge( [
+		$container['framework.config'] = array_merge([
 			'providers' => [],
-		], $config );
+		], $config);
 
-		$container['framework.service_providers'] = array_merge( [
+		$container['framework.service_providers'] = array_merge([
 			RoutingServiceProvider::class,
 			FlashServiceProvider::class,
 			OldInputServiceProvider::class,
 			TemplatingServiceProvider::class,
-		], $container['framework.config']['providers'] );
+		], $container['framework.config']['providers']);
 
-		Facade::setFacadeApplication( $container );
+		Facade::setFacadeApplication($container);
 		AliasLoader::getInstance()->register();
 
-		static::loadServiceProviders( $container );
+		static::loadServiceProviders($container);
 	}
 
 	/**
@@ -113,15 +113,15 @@ 
 	 * @param  Container $container
 	 * @return null
 	 */
-	protected static function loadServiceProviders( $container ) {
-		$container['framework.service_providers'] = apply_filters( 'carbon_framework_service_providers', $container['framework.service_providers'] );
+	protected static function loadServiceProviders($container) {
+		$container['framework.service_providers'] = apply_filters('carbon_framework_service_providers', $container['framework.service_providers']);
 
-		$service_providers = array_map( function( $service_provider ) {
+		$service_providers = array_map(function($service_provider) {
 			return new $service_provider();
-		}, $container['framework.service_providers'] );
+		}, $container['framework.service_providers']);
 
-		static::registerServiceProviders( $service_providers, $container );
-		static::bootServiceProviders( $service_providers, $container );
+		static::registerServiceProviders($service_providers, $container);
+		static::bootServiceProviders($service_providers, $container);
 	}
 
 	/**
@@ -130,9 +130,9 @@ 
 	 * @param  Container $container
 	 * @return null
 	 */
-	protected static function registerServiceProviders( $service_providers, $container ) {
-		foreach ( $service_providers as $provider ) {
-			$provider->register( $container );
+	protected static function registerServiceProviders($service_providers, $container) {
+		foreach ($service_providers as $provider) {
+			$provider->register($container);
 		}
 	}
 
@@ -142,9 +142,9 @@ 
 	 * @param  Container $container
 	 * @return null
 	 */
-	protected static function bootServiceProviders( $service_providers, $container ) {
-		foreach ( $service_providers as $provider ) {
-			$provider->boot( $container );
+	protected static function bootServiceProviders($service_providers, $container) {
+		foreach ($service_providers as $provider) {
+			$provider->boot($container);
 		}
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @param  string $facade_class
 	 * @return null
 	 */
-	public static function facade( $alias, $facade_class ) {
-		AliasLoader::getInstance()->alias( $alias, $facade_class );
+	public static function facade($alias, $facade_class) {
+		AliasLoader::getInstance()->alias($alias, $facade_class);
 	}
 
 	/**
@@ -165,14 +165,14 @@ 
 	 * @param  string   $key
 	 * @return mixed|null
 	 */
-	public static function resolve( $key ) {
+	public static function resolve($key) {
 		static::verifyBoot();
 
-		if ( ! isset( static::getContainer()[ $key ] ) ) {
+		if ( ! isset(static::getContainer()[$key])) {
 			return null;
 		}
 
-		return static::getContainer()[ $key ];
+		return static::getContainer()[$key];
 	}
 
 	/**
@@ -181,12 +181,12 @@ 
 	 * @param  string $class
 	 * @return object
 	 */
-	public static function instantiate( $class ) {
+	public static function instantiate($class) {
 		static::verifyBoot();
 
-		$instance = static::resolve( $class );
+		$instance = static::resolve($class);
 
-		if ( $instance === null ) {
+		if ($instance === null) {
 			$instance = new $class();
 		}
 
@@ -200,7 +200,7 @@ 
 	 * @param  ResponseInterface $response
 	 * @return null
 	 */
-	public static function respond( ResponseInterface $response ) {
-		Response::respond( $response );
+	public static function respond(ResponseInterface $response) {
+		Response::respond($response);
 	}
 }

src/Routing/Router.php

Spacing +19 added lines, -19 removed lines

@@ -20,8 +20,8 @@ 
 	 * @return null
 	 */
 	public function boot() {
-		add_action( 'init', array( $this, 'registerRewriteRules' ), 1000 );
-		add_action( 'template_include', array( $this, 'execute' ), 1000 );
+		add_action('init', array($this, 'registerRewriteRules'), 1000);
+		add_action('template_include', array($this, 'execute'), 1000);
 	}
 
 	/**
@@ -30,9 +30,9 @@ 
 	 * @return null
 	 */
 	public function registerRewriteRules() {
-		$rules = apply_filters( 'carbon_framework_routing_rewrite_rules', [] );
-		foreach ( $rules as $rule => $rewrite_to ) {
-			add_rewrite_rule( $rule, $rewrite_to, 'top' );
+		$rules = apply_filters('carbon_framework_routing_rewrite_rules', []);
+		foreach ($rules as $rule => $rewrite_to) {
+			add_rewrite_rule($rule, $rewrite_to, 'top');
 		}
 	}
 
@@ -42,18 +42,18 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function execute( $template ) {
+	public function execute($template) {
 		$routes = $this->getRoutes();
-		$global_middleware = Framework::resolve( 'framework.routing.global_middleware' );
+		$global_middleware = Framework::resolve('framework.routing.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);
 			}
 		}
 		
@@ -66,17 +66,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/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/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 beginning of the url
 		$validation_regex = '^' . $validation_regex;
 
-		if ( $wrap ) {
+		if ($wrap) {
 			$validation_regex = '~' . $validation_regex . '~';
 		}