htmlburger / wpemerge

src/Flash/Flash.php

Spacing +25 added lines, -25 removed lines

@@ -26,12 +26,12 @@ 
 	 * 
 	 * @param array|\ArrayAccess $storage
 	 */
-	public function __construct( &$storage ) {
-		if ( $this->isValidStorage( $storage ) ) {
-			if ( ! isset( $storage[ $this->storage_key ] ) ) {
-				$storage[ $this->storage_key ] = [];
+	public function __construct(&$storage) {
+		if ($this->isValidStorage($storage)) {
+			if ( ! isset($storage[$this->storage_key])) {
+				$storage[$this->storage_key] = [];
 			}
-			$this->storage = &$storage[ $this->storage_key ];
+			$this->storage = &$storage[$this->storage_key];
 		}
 	}
 
@@ -41,7 +41,7 @@ 
 	 * @param  mixed   $storage
 	 * @return boolean
 	 */
-	protected function isValidStorage( $storage ) {
+	protected function isValidStorage($storage) {
 		return $storage !== null;
 	}
 
@@ -52,8 +52,8 @@ 
 	 * @return null
 	 */
 	protected function validateStorage() {
-		if ( ! $this->isValidStorage( $this->storage ) ) {
-			throw new Exception( 'Attempted to use Flash without an active session. Did you forget to call session_start()?' );
+		if ( ! $this->isValidStorage($this->storage)) {
+			throw new Exception('Attempted to use Flash without an active session. Did you forget to call session_start()?');
 		}
 	}
 
@@ -63,7 +63,7 @@ 
 	 * @return boolean
 	 */
 	public function enabled() {
-		return $this->isValidStorage( $this->storage );
+		return $this->isValidStorage($this->storage);
 	}
 
 	/**
@@ -72,11 +72,11 @@ 
 	 * @param  string|null $key
 	 * @return array|\ArrayAccess
 	 */
-	public function get( $key = null ) {
+	public function get($key = null) {
 		$this->validateStorage();
 
-		$items = $this->peek( $key );
-		$this->clear( $key );
+		$items = $this->peek($key);
+		$this->clear($key);
 		return $items;
 	}
 
@@ -86,15 +86,15 @@ 
 	 * @param  string|null $key
 	 * @return array|\ArrayAccess
 	 */
-	public function peek( $key = null ) {
+	public function peek($key = null) {
 		$this->validateStorage();
 		
-		if ( $key === null ) {
+		if ($key === null) {
 			return $this->storage;
 		}
 		
-		if ( isset( $this->storage[ $key ] ) ) {
-			return $this->storage[ $key ];
+		if (isset($this->storage[$key])) {
+			return $this->storage[$key];
 		}
 
 		return [];
@@ -106,18 +106,18 @@ 
 	 * @param string $key
 	 * @param mixed  $new_items
 	 */
-	public function add( $key, $new_items ) {
+	public function add($key, $new_items) {
 		$this->validateStorage();
 		
-		$new_items = is_array( $new_items ) ? $new_items : [$new_items];
+		$new_items = is_array($new_items) ? $new_items : [$new_items];
 
-		$items = (array) $this->peek( $key );
-		$items = array_merge( $items, $new_items );
+		$items = (array) $this->peek($key);
+		$items = array_merge($items, $new_items);
 		
-		if ( $key === null ) {
+		if ($key === null) {
 			$this->storage = $items;
 		} else {
-			$this->storage[ $key ] = $items;
+			$this->storage[$key] = $items;
 		}
 	}
 
@@ -127,13 +127,13 @@ 
 	 * @param  string|null $key
 	 * @return null
 	 */
-	public function clear( $key = null ) {
+	public function clear($key = null) {
 		$this->validateStorage();
 		
-		if ( $key === null ) {
+		if ($key === null) {
 			$this->storage = [];
 		} else {
-			$this->storage[ $key ] = [];
+			$this->storage[$key] = [];
 		}
 	}
 }
\ 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
 	 */
 	public 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();
 		}
 
@@ -199,7 +199,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/Handler.php

Spacing +16 added lines, -16 removed lines

@@ -22,8 +22,8 @@ 
 	 * 
 	 * @param string|Closure $handler
 	 */
-	public function __construct( $handler ) {
-		$this->set( $handler );
+	public function __construct($handler) {
+		$this->set($handler);
 	}
 
 	/**
@@ -32,15 +32,15 @@ 
 	 * @param  string|Closure      $handler
 	 * @return callable|array|null
 	 */
-	protected function parse( $handler ) {
-		if ( $handler instanceof Closure ) {
+	protected function parse($handler) {
+		if ($handler instanceof Closure) {
 			return $handler;
 		}
 
-		if ( is_string( $handler ) )  {
-			$handlerPieces = preg_split( '/@|::/', $handler, 2 );
-			if ( count( $handlerPieces ) === 1 ) {
-				if ( is_callable( $handlerPieces[0] ) ) {
+		if (is_string($handler)) {
+			$handlerPieces = preg_split('/@|::/', $handler, 2);
+			if (count($handlerPieces) === 1) {
+				if (is_callable($handlerPieces[0])) {
 					return $handlerPieces[0];
 				}
 				return null;
@@ -60,11 +60,11 @@ 
 	 * @param  string|Closure $new_handler
 	 * @return null
 	 */
-	public function set( $new_handler ) {
-		$handler = $this->parse( $new_handler );
+	public function set($new_handler) {
+		$handler = $this->parse($new_handler);
 
-		if ( $handler === null ) {
-			throw new Exception( 'No or invalid handler provided.' );
+		if ($handler === null) {
+			throw new Exception('No or invalid handler provided.');
 		}
 
 		$this->handler = $handler;
@@ -77,14 +77,14 @@ 
 	 */
 	public function execute() {
 		$arguments = func_get_args();
-		if ( is_callable( $this->handler ) ) {
-			return call_user_func_array( $this->handler, $arguments );
+		if (is_callable($this->handler)) {
+			return call_user_func_array($this->handler, $arguments);
 		}
 
 		$class = $this->handler['class'];
 		$method = $this->handler['method'];
 
-		$controller = Framework::instantiate( $class );
-		return call_user_func_array( [$controller, $method], $arguments );
+		$controller = Framework::instantiate($class);
+		return call_user_func_array([$controller, $method], $arguments);
 	}
 }

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