intraxia / jaxion

src/Core/Loader.php

Spacing +15 added lines, -15 removed lines

@@ -33,19 +33,19 @@ 
 	 * {@inheritDoc}
 	 */
 	public function run() {
-		foreach ( $this->actions as $action ) {
+		foreach ($this->actions as $action) {
 			add_action(
 				$action['hook'],
-				array( $action['service'], $action['method'] ),
+				array($action['service'], $action['method']),
 				$action['priority'],
 				$action['args']
 			);
 		}
 
-		foreach ( $this->filters as $filter ) {
+		foreach ($this->filters as $filter) {
 			add_filter(
 				$filter['hook'],
-				array( $filter['service'], $filter['method'] ),
+				array($filter['service'], $filter['method']),
 				$filter['priority'],
 				$filter['args']
 			);
@@ -57,15 +57,15 @@ 
 	 *
 	 * @param HasActions $service
 	 */
-	public function register_actions( HasActions $service ) {
-		foreach ( $service->action_hooks() as $action ) {
+	public function register_actions(HasActions $service) {
+		foreach ($service->action_hooks() as $action) {
 			$this->actions = $this->add(
 				$this->actions,
 				$action['hook'],
 				$service,
 				$action['method'],
-				isset( $action['priority'] ) ? $action['priority'] : 10,
-				isset( $action['args'] ) ? $action['args'] : 1
+				isset($action['priority']) ? $action['priority'] : 10,
+				isset($action['args']) ? $action['args'] : 1
 			);
 		}
 	}
@@ -75,15 +75,15 @@ 
 	 *
 	 * @param HasFilters $service
 	 */
-	public function register_filters( HasFilters $service ) {
-		foreach ( $service->filter_hooks() as $filter ) {
+	public function register_filters(HasFilters $service) {
+		foreach ($service->filter_hooks() as $filter) {
 			$this->filters = $this->add(
 				$this->filters,
 				$filter['hook'],
 				$service,
 				$filter['method'],
-				isset( $filter['priority'] ) ? $filter['priority'] : 10,
-				isset( $filter['args'] ) ? $filter['args'] : 1
+				isset($filter['priority']) ? $filter['priority'] : 10,
+				isset($filter['args']) ? $filter['args'] : 1
 			);
 		}
 	}
@@ -93,8 +93,8 @@ 
 	 *
 	 * @param HasShortcode $service
 	 */
-	public function register_shortcode( HasShortcode $service ) {
-		add_shortcode( $service->shortcode_name(), array( $service, 'do_shortcode' ) );
+	public function register_shortcode(HasShortcode $service) {
+		add_shortcode($service->shortcode_name(), array($service, 'do_shortcode'));
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 *
 	 * @return array
 	 */
-	protected function add( $hooks, $hook, $service, $method, $priority, $accepted_args ) {
+	protected function add($hooks, $hook, $service, $method, $priority, $accepted_args) {
 		$hooks[] = array(
 			'hook'     => $hook,
 			'service'  => $service,

src/Core/Container.php

Spacing +53 added lines, -53 removed lines

@@ -71,17 +71,17 @@ 
 	 *
 	 * @param ServiceProvider[]|string[] $providers
 	 */
-	public function __construct( array $providers = array() ) {
+	public function __construct(array $providers = array()) {
 		// array_unique ensures we only register each provider once.
-		$providers = array_unique( array_merge( $this->providers, $providers ) );
+		$providers = array_unique(array_merge($this->providers, $providers));
 
-		foreach ( $providers as $provider ) {
-			if ( is_string( $provider ) && class_exists( $provider ) ) {
+		foreach ($providers as $provider) {
+			if (is_string($provider) && class_exists($provider)) {
 				$provider = new $provider;
 			}
 
-			if ( $provider instanceof ServiceProvider ) {
-				$this->register( $provider );
+			if ($provider instanceof ServiceProvider) {
+				$this->register($provider);
 			}
 		}
 	}
@@ -97,27 +97,27 @@ 
 	 *
 	 * @return $this
 	 */
-	public function define( $alias, $definition ) {
-		if ( is_array( $alias ) ) {
-			$class = current( $alias );
-			$alias = key( $alias );
+	public function define($alias, $definition) {
+		if (is_array($alias)) {
+			$class = current($alias);
+			$alias = key($alias);
 		}
 
-		if ( isset( $this->aliases[ $alias ] ) ) {
-			throw new DefinedAliasException( $alias );
+		if (isset($this->aliases[$alias])) {
+			throw new DefinedAliasException($alias);
 		}
 
-		$this->aliases[ $alias ]     = true;
-		$this->definitions[ $alias ] = $definition;
+		$this->aliases[$alias]     = true;
+		$this->definitions[$alias] = $definition;
 
 		// Closures are treated as factories unless
 		// defined via Container::share.
-		if ( ! $definition instanceof \Closure ) {
-			$this->shared[ $alias ] = true;
+		if (!$definition instanceof \Closure) {
+			$this->shared[$alias] = true;
 		}
 
-		if ( isset( $class ) ) {
-			$this->classes[ $class ] = $alias;
+		if (isset($class)) {
+			$this->classes[$class] = $alias;
 		}
 
 		return $this;
@@ -133,14 +133,14 @@ 
 	 *
 	 * @return $this
 	 */
-	public function share( $alias, $definition ) {
-		$this->define( $alias, $definition );
+	public function share($alias, $definition) {
+		$this->define($alias, $definition);
 
-		if ( is_array( $alias ) ) {
-			$alias = key( $alias );
+		if (is_array($alias)) {
+			$alias = key($alias);
 		}
 
-		$this->shared[ $alias ] = true;
+		$this->shared[$alias] = true;
 
 		return $this;
 	}
@@ -154,32 +154,32 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function fetch( $alias ) {
-		if ( isset( $this->classes[ $alias ] ) ) {
+	public function fetch($alias) {
+		if (isset($this->classes[$alias])) {
 			// If the alias is a class name,
 			// then retrieve its linked alias.
 			// This is only registered when
 			// registering using an array.
-			$alias = $this->classes[ $alias ];
+			$alias = $this->classes[$alias];
 		}
 
-		if ( ! isset( $this->aliases[ $alias ] ) ) {
-			throw new UndefinedAliasException( $alias );
+		if (!isset($this->aliases[$alias])) {
+			throw new UndefinedAliasException($alias);
 		}
 
-		$value = $this->definitions[ $alias ];
+		$value = $this->definitions[$alias];
 
 		// If the shared value is a closure,
 		// execute it and assign the result
 		// in place of the closure.
-		if ( $value instanceof \Closure ) {
+		if ($value instanceof \Closure) {
 			$factory = $value;
-			$value   = $factory( $this );
+			$value   = $factory($this);
 		}
 
 		// If the value is shared, save the shared value.
-		if ( isset( $this->shared[ $alias ] ) ) {
-			$this->definitions[ $alias ] = $value;
+		if (isset($this->shared[$alias])) {
+			$this->definitions[$alias] = $value;
 		}
 
 		// Return the fetched value.
@@ -193,8 +193,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function has( $alias ) {
-		return isset( $this->aliases[ $alias ] );
+	public function has($alias) {
+		return isset($this->aliases[$alias]);
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function remove( $alias ) {
-		if ( isset( $this->aliases[ $alias ] ) ) {
+	public function remove($alias) {
+		if (isset($this->aliases[$alias])) {
 			/**
 			 * If there's no reference in the aliases array,
 			 * the service won't be found on fetching and
@@ -220,7 +220,7 @@ 
 			 *
 			 * If this is a problem, this may need to be revisited.
 			 */
-			unset( $this->aliases[ $alias ] );
+			unset($this->aliases[$alias]);
 		}
 
 		return $this;
@@ -233,9 +233,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function register( ServiceProvider $provider ) {
+	public function register(ServiceProvider $provider) {
 		// @todo make sure provider is only registered once
-		$provider->register( $this );
+		$provider->register($this);
 
 		return $this;
 	}
@@ -248,8 +248,8 @@ 
 	 *
 	 * @see    define
 	 */
-	public function offsetSet( $id, $value ) {
-		$this->define( $id, $value );
+	public function offsetSet($id, $value) {
+		$this->define($id, $value);
 	}
 
 	/**
@@ -262,8 +262,8 @@ 
 	 *
 	 * @see    fetch
 	 */
-	public function offsetGet( $id ) {
-		return $this->fetch( $id );
+	public function offsetGet($id) {
+		return $this->fetch($id);
 	}
 
 	/**
@@ -275,8 +275,8 @@ 
 	 *
 	 * @see    has
 	 */
-	public function offsetExists( $id ) {
-		return $this->has( $id );
+	public function offsetExists($id) {
+		return $this->has($id);
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 	 *
 	 * @see   remove
 	 */
-	public function offsetUnset( $id ) {
-		$this->remove( $id );
+	public function offsetUnset($id) {
+		$this->remove($id);
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function rewind() {
 		$this->position = 0;
-		$this->keys     = array_keys( $this->aliases );
+		$this->keys     = array_keys($this->aliases);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @return object
 	 */
 	public function current() {
-		return $this->fetch( $this->keys[ $this->position ] );
+		return $this->fetch($this->keys[$this->position]);
 	}
 
 	/**
@@ -313,14 +313,14 @@ 
 	 * @return string
 	 */
 	public function key() {
-		return $this->keys[ $this->position ];
+		return $this->keys[$this->position];
 	}
 
 	/**
 	 * Increments to the next step in the loop.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -329,6 +329,6 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->keys[ $this->position ] );
+		return isset($this->keys[$this->position]);
 	}
 }

src/Utility/Str.php

Spacing +6 added lines, -6 removed lines

@@ -19,9 +19,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function starts_with( $haystack, $needles ) {
-		foreach ( (array) $needles as $needle ) {
-			if ( '' !== $needle && 0 === strpos( $haystack, $needle ) ) {
+	public static function starts_with($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if ('' !== $needle && 0 === strpos($haystack, $needle)) {
 				return true;
 			}
 		}
@@ -37,9 +37,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function ends_with( $haystack, $needles ) {
-		foreach ( (array) $needles as $needle ) {
-			if ( substr( $haystack, - strlen( $needle ) ) === (string) $needle ) {
+	public static function ends_with($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if (substr($haystack, - strlen($needle)) === (string) $needle) {
 				return true;
 			}
 		}

src/Assets/Register.php

Spacing +31 added lines, -31 removed lines

@@ -59,9 +59,9 @@ 
 	 * @param string $url
 	 * @param string $version
 	 */
-	public function __construct( $url, $version = null ) {
+	public function __construct($url, $version = null) {
 		$this->url = $url;
-		$this->version = $version ? : null; // Empty string should remain null.
+		$this->version = $version ?: null; // Empty string should remain null.
 	}
 
 	/**
@@ -69,8 +69,8 @@ 
 	 *
 	 * @param bool $debug
 	 */
-	public function set_debug( $debug ) {
-		if ( $debug ) {
+	public function set_debug($debug) {
+		if ($debug) {
 			$this->min = '.min';
 		} else {
 			$this->min = '';
@@ -82,7 +82,7 @@ 
 	 *
 	 * @param array $script
 	 */
-	public function register_script( $script ) {
+	public function register_script($script) {
 		$this->scripts[] = $script;
 	}
 
@@ -91,7 +91,7 @@ 
 	 *
 	 * @param array $style
 	 */
-	public function register_style( $style ) {
+	public function register_style($style) {
 		$this->styles[] = $style;
 	}
 
@@ -99,9 +99,9 @@ 
 	 * {@inheritDoc}
 	 */
 	public function enqueue_web_scripts() {
-		foreach ( $this->scripts as $script ) {
-			if ( in_array( $script['type'], array( 'web', 'shared' ) ) ) {
-				$this->enqueue_script( $script );
+		foreach ($this->scripts as $script) {
+			if (in_array($script['type'], array('web', 'shared'))) {
+				$this->enqueue_script($script);
 			}
 		}
 	}
@@ -110,9 +110,9 @@ 
 	 * {@inheritDoc}
 	 */
 	public function enqueue_web_styles() {
-		foreach ( $this->styles as $style ) {
-			if ( in_array( $style['type'], array( 'web', 'shared' ) ) ) {
-				$this->enqueue_style( $style );
+		foreach ($this->styles as $style) {
+			if (in_array($style['type'], array('web', 'shared'))) {
+				$this->enqueue_style($style);
 			}
 		}
 	}
@@ -121,9 +121,9 @@ 
 	 * {@inheritDoc}
 	 */
 	public function enqueue_admin_scripts() {
-		foreach ( $this->scripts as $script ) {
-			if ( in_array( $script['type'], array( 'admin', 'shared' ) ) ) {
-				$this->enqueue_script( $script );
+		foreach ($this->scripts as $script) {
+			if (in_array($script['type'], array('admin', 'shared'))) {
+				$this->enqueue_script($script);
 			}
 		}
 	}
@@ -132,9 +132,9 @@ 
 	 * {@inheritDoc}
 	 */
 	public function enqueue_admin_styles() {
-		foreach ( $this->styles as $style ) {
-			if ( in_array( $style['type'], array( 'admin', 'shared' ) ) ) {
-				$this->enqueue_style( $style );
+		foreach ($this->styles as $style) {
+			if (in_array($style['type'], array('admin', 'shared'))) {
+				$this->enqueue_style($style);
 			}
 		}
 	}
@@ -170,19 +170,19 @@ 
 	 *
 	 * @param array $script
 	 */
-	protected function enqueue_script( $script ) {
-		if ( $script['condition']() ) {
+	protected function enqueue_script($script) {
+		if ($script['condition']()) {
 			wp_enqueue_script(
 				$script['handle'],
-				$this->url . $script['src'] . '.js',
-				isset( $script['deps'] ) ? $script['deps'] : array(),
+				$this->url.$script['src'].'.js',
+				isset($script['deps']) ? $script['deps'] : array(),
 				$this->version,
-				isset( $script['footer'] ) ? $script['footer'] : false
+				isset($script['footer']) ? $script['footer'] : false
 			);
 
-			if ( isset( $script['localize'] ) ) {
-				if ( is_callable( $script['localize'] ) ) { // @todo make all properties callables
-					$script['localize'] = call_user_func( $script['localize'] );
+			if (isset($script['localize'])) {
+				if (is_callable($script['localize'])) { // @todo make all properties callables
+					$script['localize'] = call_user_func($script['localize']);
 				}
 
 				wp_localize_script(
@@ -199,14 +199,14 @@ 
 	 *
 	 * @param array $style
 	 */
-	protected function enqueue_style( $style ) {
-		if ( $style['condition']() ) {
+	protected function enqueue_style($style) {
+		if ($style['condition']()) {
 			wp_enqueue_style(
 				$style['handle'],
-				$this->url . $style['src'] . '.css',
-				isset( $style['deps'] ) ? $style['deps'] : array(),
+				$this->url.$style['src'].'.css',
+				isset($style['deps']) ? $style['deps'] : array(),
 				$this->version,
-				isset( $style['media'] ) ? $style['media'] : 'all'
+				isset($style['media']) ? $style['media'] : 'all'
 			);
 		}
 	}

src/Http/Router.php

Spacing +25 added lines, -25 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_vendor( $vendor ) {
+	public function set_vendor($vendor) {
 		$this->vendor = $vendor;
 
 		return $this;
@@ -86,7 +86,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_version( $version ) {
+	public function set_version($version) {
 		$this->version = $version;
 
 		return $this;
@@ -102,15 +102,15 @@ 
 	 * @throws VersionNotSetException
 	 */
 	public function register() {
-		if ( ! $this->vendor ) {
+		if (!$this->vendor) {
 			throw new VendorNotSetException;
 		}
 
-		if ( ! $this->version ) {
+		if (!$this->version) {
 			throw new VersionNotSetException;
 		}
 
-		foreach ( $this->endpoints as $endpoint ) {
+		foreach ($this->endpoints as $endpoint) {
 			register_rest_route(
 				$this->get_namespace(),
 				$endpoint->get_route(),
@@ -128,13 +128,13 @@ 
 	 * @param array    $options
 	 * @param callable $callback
 	 */
-	public function group( array $options, $callback ) {
+	public function group(array $options, $callback) {
 		$router = new static;
 
-		call_user_func( $callback, $router );
+		call_user_func($callback, $router);
 
-		foreach ( $router->get_endpoints() as $endpoint ) {
-			$this->endpoints[] = $this->set_options( $endpoint, $options );
+		foreach ($router->get_endpoints() as $endpoint) {
+			$this->endpoints[] = $this->set_options($endpoint, $options);
 		}
 	}
 
@@ -153,26 +153,26 @@ 
 	 * @throws MissingArgumentException
 	 * @throws InvalidArgumentException
 	 */
-	public function __call( $name, $arguments ) {
-		if ( ! in_array( $name, array_keys( $this->methods ) ) ) {
+	public function __call($name, $arguments) {
+		if (!in_array($name, array_keys($this->methods))) {
 			throw new UnknownMethodException;
 		}
 
 		// array_merge ensures we have 3 elements
-		list( $route, $callback, $options ) = array_merge( $arguments, array( null, null, null ) );
+		list($route, $callback, $options) = array_merge($arguments, array(null, null, null));
 
-		if ( ! $route || ! $callback ) {
+		if (!$route || !$callback) {
 			throw new MissingArgumentException;
 		}
 
-		if ( ! is_callable( $callback ) ) {
+		if (!is_callable($callback)) {
 			throw new InvalidArgumentException;
 		}
 
-		$endpoint = new Endpoint( $route, $this->methods[ $name ], $callback );
+		$endpoint = new Endpoint($route, $this->methods[$name], $callback);
 
-		if ( $options && is_array( $options ) ) {
-			$endpoint = $this->set_options( $endpoint, $options );
+		if ($options && is_array($options)) {
+			$endpoint = $this->set_options($endpoint, $options);
 		}
 
 		return $this->endpoints[] = $endpoint;
@@ -189,17 +189,17 @@ 
 	 * @return Endpoint
 	 * @throws MalformedRouteException
 	 */
-	protected function set_options( Endpoint $endpoint, array $options ) {
-		if ( isset( $options['guard'] ) ) {
-			$endpoint->set_guard( $options['guard'] );
+	protected function set_options(Endpoint $endpoint, array $options) {
+		if (isset($options['guard'])) {
+			$endpoint->set_guard($options['guard']);
 		}
 
-		if ( isset( $options['filter'] ) ) {
-			$endpoint->set_filter( $options['filter'] );
+		if (isset($options['filter'])) {
+			$endpoint->set_filter($options['filter']);
 		}
 
-		if ( isset( $options['prefix'] ) ) {
-			$endpoint->set_prefix( $options['prefix'] );
+		if (isset($options['prefix'])) {
+			$endpoint->set_prefix($options['prefix']);
 		}
 
 		return $endpoint;
@@ -211,7 +211,7 @@ 
 	 * @return string
 	 */
 	protected function get_namespace() {
-		return $this->vendor . '/v' . $this->version;
+		return $this->vendor.'/v'.$this->version;
 	}
 
 	/**

src/Http/Endpoint.php

Spacing +10 added lines, -10 removed lines

@@ -65,8 +65,8 @@ 
 	 *
 	 * @throws MalformedRouteException
 	 */
-	public function __construct( $route, $method, $callback ) {
-		if ( ! Str::starts_with( $route, '/' ) || Str::ends_with( $route, '/' ) ) {
+	public function __construct($route, $method, $callback) {
+		if (!Str::starts_with($route, '/') || Str::ends_with($route, '/')) {
 			throw new MalformedRouteException;
 		}
 
@@ -83,7 +83,7 @@ 
 	 * @return string
 	 */
 	public function get_route() {
-		return ( $this->prefix ?: '' ) . $this->route;
+		return ($this->prefix ?: '').$this->route;
 	}
 
 	/**
@@ -97,11 +97,11 @@ 
 			'callback' => $this->callback,
 		);
 
-		if ( $this->guard ) {
-			$options['permission_callback'] = array( $this->guard, 'authorized' );
+		if ($this->guard) {
+			$options['permission_callback'] = array($this->guard, 'authorized');
 		}
 
-		if ( $this->filter ) {
+		if ($this->filter) {
 			$options['args'] = $this->filter->rules();
 		}
 
@@ -115,7 +115,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_guard( GuardContract $guard ) {
+	public function set_guard(GuardContract $guard) {
 		$this->guard = $guard;
 
 		return $this;
@@ -128,7 +128,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_filter( FilterContract $filter ) {
+	public function set_filter(FilterContract $filter) {
 		$this->filter = $filter;
 
 		return $this;
@@ -142,8 +142,8 @@ 
 	 * @return $this
 	 * @throws MalformedRouteException
 	 */
-	public function set_prefix( $prefix ) {
-		if ( ! Str::starts_with( $prefix, '/' ) || Str::ends_with( $prefix, '/' ) ) {
+	public function set_prefix($prefix) {
+		if (!Str::starts_with($prefix, '/') || Str::ends_with($prefix, '/')) {
 			throw new MalformedRouteException;
 		}
 

src/Axolotl/Model.php

Spacing +117 added lines, -117 removed lines

@@ -107,16 +107,16 @@ 
 	 *
 	 * @param array <string, mixed> $attributes
 	 */
-	public function __construct( array $attributes = array() ) {
+	public function __construct(array $attributes = array()) {
 		$this->maybe_boot();
 		$this->sync_original();
 
-		if ( $this->uses_wp_object() ) {
+		if ($this->uses_wp_object()) {
 			$this->create_wp_object();
 		}
 
 		$this->unguard();
-		$this->refresh( $attributes );
+		$this->refresh($attributes);
 		$this->reguard();
 	}
 
@@ -130,10 +130,10 @@ 
 	 *
 	 * @return $this
 	 */
-	public function refresh( array $attributes ) {
+	public function refresh(array $attributes) {
 		$this->clear();
 
-		return $this->merge( $attributes );
+		return $this->merge($attributes);
 	}
 
 	/**
@@ -143,9 +143,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function merge( array $attributes ) {
-		foreach ( $attributes as $name => $value ) {
-			$this->set_attribute( $name, $value );
+	public function merge(array $attributes) {
+		foreach ($attributes as $name => $value) {
+			$this->set_attribute($name, $value);
 		}
 
 		return $this;
@@ -160,7 +160,7 @@ 
 	 * @return array
 	 */
 	public function get_table_attributes() {
-		return $this->attributes[ self::TABLE_KEY ];
+		return $this->attributes[self::TABLE_KEY];
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	 * @return array
 	 */
 	public function get_original_table_attributes() {
-		return $this->original[ self::TABLE_KEY ];
+		return $this->original[self::TABLE_KEY];
 	}
 
 	/**
@@ -182,11 +182,11 @@ 
 	public function get_changed_table_attributes() {
 		$changed = array();
 
-		foreach ( $this->get_table_attributes() as $key => $value ) {
-			if ( $value !==
-			     $this->get_original_attribute( $key )
+		foreach ($this->get_table_attributes() as $key => $value) {
+			if ($value !==
+			     $this->get_original_attribute($key)
 			) {
-				$changed[ $key ] = $value;
+				$changed[$key] = $value;
 			}
 		}
 
@@ -202,8 +202,8 @@ 
 	 * @return false|WP_Post|WP_Term
 	 */
 	public function get_underlying_wp_object() {
-		if ( isset( $this->attributes[ self::OBJECT_KEY ] ) ) {
-			return $this->attributes[ self::OBJECT_KEY ];
+		if (isset($this->attributes[self::OBJECT_KEY])) {
+			return $this->attributes[self::OBJECT_KEY];
 		}
 
 		return false;
@@ -215,7 +215,7 @@ 
 	 * @return WP_Post
 	 */
 	public function get_original_underlying_wp_object() {
-		return $this->original[ self::OBJECT_KEY ];
+		return $this->original[self::OBJECT_KEY];
 	}
 
 	/**
@@ -228,11 +228,11 @@ 
 	public function get_changed_wp_object_attributes() {
 		$changed = array();
 
-		foreach ( $this->get_wp_object_keys() as $key ) {
-			if ( $this->get_attribute( $key ) !==
-			     $this->get_original_attribute( $key )
+		foreach ($this->get_wp_object_keys() as $key) {
+			if ($this->get_attribute($key) !==
+			     $this->get_original_attribute($key)
 			) {
-				$changed[ $key ] = $this->get_attribute( $key );
+				$changed[$key] = $this->get_attribute($key);
 			}
 		}
 
@@ -247,8 +247,8 @@ 
 	 * @param string $name
 	 * @param mixed  $value
 	 */
-	public function __set( $name, $value ) {
-		$this->set_attribute( $name, $value );
+	public function __set($name, $value) {
+		$this->set_attribute($name, $value);
 	}
 
 	/**
@@ -266,27 +266,27 @@ 
 	 * @throws Exception
 	 * @throws GuardedPropertyException
 	 */
-	public function set_attribute( $name, $value ) {
-		if ( self::OBJECT_KEY === $name ) {
-			if ( ! $value ) {
+	public function set_attribute($name, $value) {
+		if (self::OBJECT_KEY === $name) {
+			if (!$value) {
 				throw new Exception;
 			}
 
-			return $this->override_wp_object( $value );
+			return $this->override_wp_object($value);
 		}
 
-		if ( self::TABLE_KEY === $name ) {
-			return $this->override_table( $value );
+		if (self::TABLE_KEY === $name) {
+			return $this->override_table($value);
 		}
 
-		if ( ! $this->is_fillable( $name ) ) {
+		if (!$this->is_fillable($name)) {
 			throw new GuardedPropertyException;
 		}
 
-		if ( $method = $this->has_map_method( $name ) ) {
-			$this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()} = $value;
+		if ($method = $this->has_map_method($name)) {
+			$this->attributes[self::OBJECT_KEY]->{$this->{$method}()} = $value;
 		} else {
-			$this->attributes[ self::TABLE_KEY ][ $name ] = $value;
+			$this->attributes[self::TABLE_KEY][$name] = $value;
 		}
 
 		return $this;
@@ -298,11 +298,11 @@ 
 	 * @return array
 	 */
 	public function get_attribute_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ]
+		return self::$memo[get_called_class()][__METHOD__]
 			= array_merge(
 				$this->fillable,
 				$this->guarded,
@@ -316,21 +316,21 @@ 
 	 * @return array
 	 */
 	public function get_table_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( ! $this->has_map_method( $key ) &&
-			     ! $this->has_compute_method( $key )
+		foreach ($this->get_attribute_keys() as $key) {
+			if (!$this->has_map_method($key) &&
+			     !$this->has_compute_method($key)
 			) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -339,19 +339,19 @@ 
 	 * @return array
 	 */
 	public function get_wp_object_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_map_method( $key ) ) {
+		foreach ($this->get_attribute_keys() as $key) {
+			if ($this->has_map_method($key)) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -360,19 +360,19 @@ 
 	 * @return array
 	 */
 	public function get_computed_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_compute_method( $key ) ) {
+		foreach ($this->get_attribute_keys() as $key) {
+			if ($this->has_compute_method($key)) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -383,32 +383,32 @@ 
 	public function serialize() {
 		$attributes = array();
 
-		if ( $this->visible ) {
+		if ($this->visible) {
 			// If visible attributes are set, we'll only reveal those.
-			foreach ( $this->visible as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->visible as $key) {
+				$attributes[$key] = $this->get_attribute($key);
 			}
-		} elseif ( $this->hidden ) {
+		} elseif ($this->hidden) {
 			// If hidden attributes are set, we'll grab everything and hide those.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				if ( ! in_array( $key, $this->hidden ) ) {
-					$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->get_attribute_keys() as $key) {
+				if (!in_array($key, $this->hidden)) {
+					$attributes[$key] = $this->get_attribute($key);
 				}
 			}
 		} else {
 			// If nothing is hidden/visible, we'll grab and reveal everything.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->get_attribute_keys() as $key) {
+				$attributes[$key] = $this->get_attribute($key);
 			}
 		}
 
-		return array_map( function ( $attribute ) {
-			if ( $attribute instanceof Serializes ) {
+		return array_map(function($attribute) {
+			if ($attribute instanceof Serializes) {
 				return $attribute->serialize();
 			}
 
 			return $attribute;
-		}, $attributes );
+		}, $attributes);
 	}
 
 	/**
@@ -419,13 +419,13 @@ 
 	public function sync_original() {
 		$this->original = $this->attributes;
 
-		if ( $this->attributes[ self::OBJECT_KEY ] ) {
-			$this->original[ self::OBJECT_KEY ] = clone $this->attributes[ self::OBJECT_KEY ];
+		if ($this->attributes[self::OBJECT_KEY]) {
+			$this->original[self::OBJECT_KEY] = clone $this->attributes[self::OBJECT_KEY];
 		}
 
-		foreach ( $this->original[ self::TABLE_KEY ] as $key => $item ) {
-			if ( is_object( $item ) ) {
-				$this->original[ $key ] = clone $item;
+		foreach ($this->original[self::TABLE_KEY] as $key => $item) {
+			if (is_object($item)) {
+				$this->original[$key] = clone $item;
 			}
 		}
 
@@ -441,24 +441,24 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_fillable( $name ) {
+	private function is_fillable($name) {
 		// If this model isn't guarded, everything is fillable.
-		if ( ! $this->is_guarded ) {
+		if (!$this->is_guarded) {
 			return true;
 		}
 
 		// If it's in the fillable array, then it's fillable.
-		if ( in_array( $name, $this->fillable ) ) {
+		if (in_array($name, $this->fillable)) {
 			return true;
 		}
 
 		// If it's explicitly guarded, then it's not fillable.
-		if ( in_array( $name, $this->guarded ) ) {
+		if (in_array($name, $this->guarded)) {
 			return false;
 		}
 
 		// If fillable hasn't been defined, then everything else fillable.
-		return ! $this->fillable;
+		return !$this->fillable;
 	}
 
 	/**
@@ -470,8 +470,8 @@ 
 	 *
 	 * @return $this
 	 */
-	private function override_wp_object( $value ) {
-		$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $value );
+	private function override_wp_object($value) {
+		$this->attributes[self::OBJECT_KEY] = $this->set_wp_object_constants($value);
 
 		return $this;
 	}
@@ -483,8 +483,8 @@ 
 	 *
 	 * @return $this
 	 */
-	private function override_table( array $value ) {
-		$this->attributes[ self::TABLE_KEY ] = $value;
+	private function override_table(array $value) {
+		$this->attributes[self::TABLE_KEY] = $value;
 
 		return $this;
 	}
@@ -498,19 +498,19 @@ 
 	 * @throws LogicException
 	 */
 	private function create_wp_object() {
-		switch ( true ) {
+		switch (true) {
 			case $this instanceof UsesWordPressPost:
-				$object = new WP_Post( (object) array() );
+				$object = new WP_Post((object) array());
 				break;
 			case $this instanceof UsesWordPressTerm:
-				$object = new WP_Term( (object) array() );
+				$object = new WP_Term((object) array());
 				break;
 			default:
 				throw new LogicException;
 				break;
 		}
 
-		$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $object );
+		$this->attributes[self::OBJECT_KEY] = $this->set_wp_object_constants($object);
 	}
 
 	/**
@@ -524,12 +524,12 @@ 
 	 *
 	 * @return object
 	 */
-	protected function set_wp_object_constants( $object ) {
-		if ( $this instanceof UsesWordPressPost ) {
+	protected function set_wp_object_constants($object) {
+		if ($this instanceof UsesWordPressPost) {
 			$object->post_type = static::get_post_type();
 		}
 
-		if ( $this instanceof UsesWordPressTerm ) {
+		if ($this instanceof UsesWordPressTerm) {
 			$object->taxonomy = static::get_taxonomy();
 		}
 
@@ -545,8 +545,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $name ) {
-		return $this->get_attribute( $name );
+	public function __get($name) {
+		return $this->get_attribute($name);
 	}
 
 	/**
@@ -558,17 +558,17 @@ 
 	 *
 	 * @throws PropertyDoesNotExistException If property isn't found.
 	 */
-	public function get_attribute( $name ) {
-		if ( $method = $this->has_map_method( $name ) ) {
-			$value = $this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()};
-		} elseif ( $method = $this->has_compute_method( $name ) ) {
+	public function get_attribute($name) {
+		if ($method = $this->has_map_method($name)) {
+			$value = $this->attributes[self::OBJECT_KEY]->{$this->{$method}()};
+		} elseif ($method = $this->has_compute_method($name)) {
 			$value = $this->{$method}();
 		} else {
-			if ( ! isset( $this->attributes[ self::TABLE_KEY ][ $name ] ) ) {
-				throw new PropertyDoesNotExistException( $name );
+			if (!isset($this->attributes[self::TABLE_KEY][$name])) {
+				throw new PropertyDoesNotExistException($name);
 			}
 
-			$value = $this->attributes[ self::TABLE_KEY ][ $name ];
+			$value = $this->attributes[self::TABLE_KEY][$name];
 		}
 
 		return $value;
@@ -583,18 +583,18 @@ 
 	 *
 	 * @throws PropertyDoesNotExistException If property isn't found.
 	 */
-	public function get_original_attribute( $name ) {
+	public function get_original_attribute($name) {
 		$original_attributes = $this->original;
 
-		if ( ! is_object( $original_attributes[ static::OBJECT_KEY ] ) ) {
-			unset( $original_attributes[ static::OBJECT_KEY ] );
+		if (!is_object($original_attributes[static::OBJECT_KEY])) {
+			unset($original_attributes[static::OBJECT_KEY]);
 		}
 
-		$original = new static( $original_attributes );
+		$original = new static($original_attributes);
 
 		try {
-			return $original->get_attribute( $name );
-		} catch ( Exception $exception ) {
+			return $original->get_attribute($name);
+		} catch (Exception $exception) {
 			return null;
 		}
 	}
@@ -608,11 +608,11 @@ 
 	 * @throws LogicException
 	 */
 	public function get_primary_id() {
-		if ( $this instanceof UsesWordPressPost ) {
+		if ($this instanceof UsesWordPressPost) {
 			return $this->get_underlying_wp_object()->ID;
 		}
 
-		if ( $this instanceof UsesWordPressTerm ) {
+		if ($this instanceof UsesWordPressTerm) {
 			return $this->get_underlying_wp_object()->term_id;
 		}
 
@@ -631,8 +631,8 @@ 
 	 *
 	 * @return false|string
 	 */
-	protected function has_map_method( $name ) {
-		if ( method_exists( $this, $method = "map_{$name}" ) ) {
+	protected function has_map_method($name) {
+		if (method_exists($this, $method = "map_{$name}")) {
 			return $method;
 		}
 
@@ -649,8 +649,8 @@ 
 	 *
 	 * @return false|string
 	 */
-	protected function has_compute_method( $name ) {
-		if ( method_exists( $this, $method = "compute_{$name}" ) ) {
+	protected function has_compute_method($name) {
+		if (method_exists($this, $method = "compute_{$name}")) {
 			return $method;
 		}
 
@@ -671,10 +671,10 @@ 
 			$this->get_wp_object_keys()
 		);
 
-		foreach ( $keys as $key ) {
+		foreach ($keys as $key) {
 			try {
-				$this->set_attribute( $key, null );
-			} catch ( GuardedPropertyException $e ) {
+				$this->set_attribute($key, null);
+			} catch (GuardedPropertyException $e) {
 				// We won't clear out guarded attributes.
 			}
 		}
@@ -708,13 +708,13 @@ 
 	 * @return array
 	 */
 	protected function get_compute_methods() {
-		$methods = get_class_methods( get_called_class() );
-		$methods = array_filter( $methods, function ( $method ) {
-			return strrpos( $method, 'compute_', - strlen( $method ) ) !== false;
+		$methods = get_class_methods(get_called_class());
+		$methods = array_filter($methods, function($method) {
+			return strrpos($method, 'compute_', - strlen($method)) !== false;
 		} );
-		$methods = array_map( function ( $method ) {
-			return substr( $method, strlen( 'compute_' ) );
-		}, $methods );
+		$methods = array_map(function($method) {
+			return substr($method, strlen('compute_'));
+		}, $methods);
 
 		return $methods;
 	}
@@ -723,8 +723,8 @@ 
 	 * Sets up the memo array for the creating model.
 	 */
 	private function maybe_boot() {
-		if ( ! isset( self::$memo[ get_called_class() ] ) ) {
-			self::$memo[ get_called_class() ] = array();
+		if (!isset(self::$memo[get_called_class()])) {
+			self::$memo[get_called_class()] = array();
 		}
 	}
 

src/Axolotl/Collection.php

Spacing +30 added lines, -30 removed lines

@@ -48,11 +48,11 @@ 
 	 * @param array $elements
 	 * @param array $config
 	 */
-	public function __construct( array $elements = array(), array $config = array() ) {
-		$this->parse_config( $this->config = $config );
+	public function __construct(array $elements = array(), array $config = array()) {
+		$this->parse_config($this->config = $config);
 
-		foreach ( $elements as $element ) {
-			$this->add( $element );
+		foreach ($elements as $element) {
+			$this->add($element);
 		}
 	}
 
@@ -63,12 +63,12 @@ 
 	 *
 	 * @throws RuntimeException
 	 */
-	public function add( $element ) {
-		if ( $this->model && is_array( $element ) ) {
-			$element = new $this->model( $element );
+	public function add($element) {
+		if ($this->model && is_array($element)) {
+			$element = new $this->model($element);
 		}
 
-		if ( $this->model && ! ( $element instanceof $this->model ) ) {
+		if ($this->model && !($element instanceof $this->model)) {
 			throw new RuntimeException;
 		}
 
@@ -82,19 +82,19 @@ 
 	 *
 	 * @return $this
 	 */
-	public function remove( $index ) {
-		if ( ! is_string( $index ) || ! is_numeric( $index ) || ! isset( $this->elements[ $index ] ) ) {
-			foreach ( $this->elements as $key => $element ) {
-				if ( $element === $index ) {
+	public function remove($index) {
+		if (!is_string($index) || !is_numeric($index) || !isset($this->elements[$index])) {
+			foreach ($this->elements as $key => $element) {
+				if ($element === $index) {
 					$index = $key;
 					break;
 				}
 			}
 		}
 
-		if ( isset( $this->elements[ $index ] ) ) {
-			unset( $this->elements[ $index ] );
-			$this->elements = array_values( $this->elements );
+		if (isset($this->elements[$index])) {
+			unset($this->elements[$index]);
+			$this->elements = array_values($this->elements);
 		}
 
 		return $this;
@@ -107,8 +107,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function at( $index ) {
-		return isset( $this->elements[ $index ] ) ? $this->elements[ $index ] : null;
+	public function at($index) {
+		return isset($this->elements[$index]) ? $this->elements[$index] : null;
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 *
 	 * @return Collection
 	 */
-	protected function map( callable $callback ) {
-		return new Collection( array_map( $callback, $this->elements ), $this->config );
+	protected function map(callable $callback) {
+		return new Collection(array_map($callback, $this->elements), $this->config);
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function filter( callable $callback ) {
-		return new Collection( array_filter( $this->elements, $callback ) );
+	public function filter(callable $callback) {
+		return new Collection(array_filter($this->elements, $callback));
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 * @return array
 	 */
 	public function serialize() {
-		return array_map(function( $element ) {
-			if ( $element instanceof Serializes ) {
+		return array_map(function($element) {
+			if ($element instanceof Serializes) {
 				return $element->serialize();
 			}
 
@@ -154,14 +154,14 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return $this->at( $this->position );
+		return $this->at($this->position);
 	}
 
 	/**
 	 * Move forward to next element.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->elements[ $this->position ] );
+		return isset($this->elements[$this->position]);
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->elements );
+		return count($this->elements);
 	}
 
 	/**
@@ -205,11 +205,11 @@ 
 	 *
 	 * @throws LogicException
 	 */
-	protected function parse_config( array $config ) {
-		if ( isset( $config['model'] ) ) {
+	protected function parse_config(array $config) {
+		if (isset($config['model'])) {
 			$model = $config['model'];
 
-			if ( ! is_subclass_of( $model, 'Intraxia\Jaxion\Axolotl\Model' ) ) {
+			if (!is_subclass_of($model, 'Intraxia\Jaxion\Axolotl\Model')) {
 				throw new LogicException;
 			}
 

src/Core/Application.php

Spacing +29 added lines, -29 removed lines

@@ -36,21 +36,21 @@ 
 	 *
 	 * @throws ApplicationAlreadyBootedException
 	 */
-	public function __construct( $file, array $providers = array() ) {
-		if ( null !== static::$instance ) {
+	public function __construct($file, array $providers = array()) {
+		if (null !== static::$instance) {
 			throw new ApplicationAlreadyBootedException;
 		}
 
 		static::$instance = $this;
 
-		$this->register_constants( $file );
+		$this->register_constants($file);
 		$this->register_core_services();
 		$this->load_i18n();
 
-		register_activation_hook( $file, array( $this, 'activate' ) );
-		register_deactivation_hook( $file, array( $this, 'deactivate' ) );
+		register_activation_hook($file, array($this, 'activate'));
+		register_deactivation_hook($file, array($this, 'deactivate'));
 
-		parent::__construct( $providers );
+		parent::__construct($providers);
 	}
 
 	/**
@@ -59,27 +59,27 @@ 
 	 * @throws UnexpectedValueException
 	 */
 	public function boot() {
-		$loader = $this->fetch( 'loader' );
+		$loader = $this->fetch('loader');
 
-		if ( ! $loader instanceof LoaderContract ) {
+		if (!$loader instanceof LoaderContract) {
 			throw new UnexpectedValueException;
 		}
 
-		foreach ( $this as $alias => $value ) {
-			if ( $value instanceof HasActions ) {
-				$loader->register_actions( $value );
+		foreach ($this as $alias => $value) {
+			if ($value instanceof HasActions) {
+				$loader->register_actions($value);
 			}
 
-			if ( $value instanceof HasFilters ) {
-				$loader->register_filters( $value );
+			if ($value instanceof HasFilters) {
+				$loader->register_filters($value);
 			}
 
-			if ( $value instanceof HasShortcode ) {
-				$loader->register_shortcode( $value );
+			if ($value instanceof HasShortcode) {
+				$loader->register_shortcode($value);
 			}
 		}
 
-		add_action( 'plugins_loaded', array( $loader, 'run' ) );
+		add_action('plugins_loaded', array($loader, 'run'));
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 * @throws ApplicationNotBootedException
 	 */
 	public static function instance() {
-		if ( null === static::$instance ) {
+		if (null === static::$instance) {
 			throw new ApplicationNotBootedException;
 		}
 
@@ -118,7 +118,7 @@ 
 	 * {@inheritDoc}
 	 */
 	public static function shutdown() {
-		if ( null !== static::$instance ) {
+		if (null !== static::$instance) {
 			static::$instance = null;
 		}
 	}
@@ -128,20 +128,20 @@ 
 	 *
 	 * @param string $file
 	 */
-	private function register_constants( $file ) {
-		$this->share( 'url', plugin_dir_url( $file ) );
-		$this->share( 'path', plugin_dir_path( $file ) );
-		$this->share( 'basename', $basename = plugin_basename( $file ) );
-		$this->share( 'slug', dirname( $basename ) );
-		$this->share( 'version', static::VERSION );
+	private function register_constants($file) {
+		$this->share('url', plugin_dir_url($file));
+		$this->share('path', plugin_dir_path($file));
+		$this->share('basename', $basename = plugin_basename($file));
+		$this->share('slug', dirname($basename));
+		$this->share('version', static::VERSION);
 	}
 
 	/**
 	 * Registers the built-in services with the Application container.
 	 */
 	private function register_core_services() {
-		$this->share( array( 'loader' => 'Intraxia\Jaxion\Contract\Core\Loader' ), function ( $app ) {
-			return new Loader( $app );
+		$this->share(array('loader' => 'Intraxia\Jaxion\Contract\Core\Loader'), function($app) {
+			return new Loader($app);
 		} );
 	}
 
@@ -149,11 +149,11 @@ 
 	 * Load's the plugin's translation files.
 	 */
 	private function load_i18n() {
-		add_action( 'init', function(){
+		add_action('init', function() {
 			load_plugin_textdomain(
-				$this->fetch( 'basename' ),
+				$this->fetch('basename'),
 				false,
-				basename( $this->fetch( 'path' ) ) . '/languages/'
+				basename($this->fetch('path')).'/languages/'
 			);
 		});
 	}