intraxia / jaxion

src/Contract/Core/Loader.php

Indentation +34 added lines, -34 removed lines

@@ -2,41 +2,41 @@
 namespace Intraxia\Jaxion\Contract\Core;
 
 interface Loader {
-	/**
-	 * Register all the actions and filters with WordPress.
-	 *
-	 * Loops through all the registered actions/filters and fires add_* for each of
-	 * them respectively.
-	 */
-	public function run();
+    /**
+     * Register all the actions and filters with WordPress.
+     *
+     * Loops through all the registered actions/filters and fires add_* for each of
+     * them respectively.
+     */
+    public function run();
 
-	/**
-	 * Registers the service's actions with the loader.
-	 *
-	 * Actions retrieved from the service are registered with the Loader.
-	 * When the loader runs, this actions are registered with WordPress.
-	 *
-	 * @param HasActions $service
-	 */
-	public function register_actions( HasActions $service );
+    /**
+     * Registers the service's actions with the loader.
+     *
+     * Actions retrieved from the service are registered with the Loader.
+     * When the loader runs, this actions are registered with WordPress.
+     *
+     * @param HasActions $service
+     */
+    public function register_actions( HasActions $service );
 
-	/**
-	 * Registers the service's filters with the loader.
-	 *
-	 * Filters retrieved from the service are registered with the Loader.
-	 * When the loader runs, these filters are registered with WordPress.
-	 *
-	 * @param HasFilters $service
-	 */
-	public function register_filters( HasFilters $service );
+    /**
+     * Registers the service's filters with the loader.
+     *
+     * Filters retrieved from the service are registered with the Loader.
+     * When the loader runs, these filters are registered with WordPress.
+     *
+     * @param HasFilters $service
+     */
+    public function register_filters( HasFilters $service );
 
-	/**
-	 * Registers the service's shortcode with the loader.
-	 *
-	 * Service's method definitions are passed into the add_shortcode hook
-	 * in WordPress to register the shortcode.
-	 *
-	 * @param HasShortcode $service
-	 */
-	public function register_shortcode( HasShortcode $service );
+    /**
+     * Registers the service's shortcode with the loader.
+     *
+     * Service's method definitions are passed into the add_shortcode hook
+     * in WordPress to register the shortcode.
+     *
+     * @param HasShortcode $service
+     */
+    public function register_shortcode( HasShortcode $service );
 }

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 	 *
 	 * @param HasActions $service
 	 */
-	public function register_actions( HasActions $service );
+	public function register_actions(HasActions $service);
 
 	/**
 	 * Registers the service's filters with the loader.
@@ -28,7 +28,7 @@ 
 	 *
 	 * @param HasFilters $service
 	 */
-	public function register_filters( HasFilters $service );
+	public function register_filters(HasFilters $service);
 
 	/**
 	 * Registers the service's shortcode with the loader.
@@ -38,5 +38,5 @@ 
 	 *
 	 * @param HasShortcode $service
 	 */
-	public function register_shortcode( HasShortcode $service );
+	public function register_shortcode(HasShortcode $service);
 }

src/Contract/Core/HasFilters.php

Indentation +9 added lines, -9 removed lines

@@ -2,13 +2,13 @@
 namespace Intraxia\Jaxion\Contract\Core;
 
 interface HasFilters {
-	/**
-	 * Provides the array of filters the class wants to register with WordPress.
-	 *
-	 * These filters are retrieved by the Loader class and used to register the
-	 * correct service methods with WordPress.
-	 *
-	 * @return array[]
-	 */
-	public function filter_hooks();
+    /**
+     * Provides the array of filters the class wants to register with WordPress.
+     *
+     * These filters are retrieved by the Loader class and used to register the
+     * correct service methods with WordPress.
+     *
+     * @return array[]
+     */
+    public function filter_hooks();
 }

src/Contract/Core/ServiceProvider.php

Indentation +9 added lines, -9 removed lines

@@ -2,13 +2,13 @@
 namespace Intraxia\Jaxion\Contract\Core;
 
 interface ServiceProvider {
-	/**
-	 * Register the provider's services on the container.
-	 *
-	 * This method is passed the container to register on, giving the service provider
-	 * an opportunity to register its services on the container in an encapsulated way.
-	 *
-	 * @param Container $container
-	 */
-	public function register( Container $container );
+    /**
+     * Register the provider's services on the container.
+     *
+     * This method is passed the container to register on, giving the service provider
+     * an opportunity to register its services on the container in an encapsulated way.
+     *
+     * @param Container $container
+     */
+    public function register( Container $container );
 }

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 	 *
 	 * @param Container $container
 	 */
-	public function register( Container $container );
+	public function register(Container $container);
 }

src/Contract/Core/Application.php

Indentation +44 added lines, -44 removed lines

@@ -4,52 +4,52 @@
 use Intraxia\Jaxion\Core\ApplicationNotBootedException;
 
 interface Application {
-	/**
-	 * Starts up the Application.
-	 *
-	 * Retrieves the Application's loader instance, and registers all of the Application's
-	 * services with the loader. It loops through its own services, and any services that
-	 * implement the required interface are passed into the loader. It then attaches the
-	 * loader to the required WordPress hook.
-	 */
-	public function boot();
+    /**
+     * Starts up the Application.
+     *
+     * Retrieves the Application's loader instance, and registers all of the Application's
+     * services with the loader. It loops through its own services, and any services that
+     * implement the required interface are passed into the loader. It then attaches the
+     * loader to the required WordPress hook.
+     */
+    public function boot();
 
-	/**
-	 * Fired on plugin activation.
-	 *
-	 * This function is attached to `register_activation_hook` and is fired when the plugin is
-	 * activated by WordPress. This gives the developer a place to set up any options,
-	 * add any custom tables, or flush rewrite rules, as required.
-	 */
-	public function activate();
+    /**
+     * Fired on plugin activation.
+     *
+     * This function is attached to `register_activation_hook` and is fired when the plugin is
+     * activated by WordPress. This gives the developer a place to set up any options,
+     * add any custom tables, or flush rewrite rules, as required.
+     */
+    public function activate();
 
-	/**
-	 * Fired on plugin deactivation.
-	 *
-	 * This function is attached to `register_deactivation_hook` and is fired when the plugin
-	 * is deactivated by WordPress. This gives the developer a place to clean up anything left
-	 * behind by the plugin.
-	 */
-	public function deactivate();
+    /**
+     * Fired on plugin deactivation.
+     *
+     * This function is attached to `register_deactivation_hook` and is fired when the plugin
+     * is deactivated by WordPress. This gives the developer a place to clean up anything left
+     * behind by the plugin.
+     */
+    public function deactivate();
 
-	/**
-	 * Retrieves the booted Application instance.
-	 *
-	 * If the Application has not yet been booted, an Exception will be thrown.
-	 *
-	 * @return Application
-	 * @throws ApplicationNotBootedException
-	 */
-	public static function instance();
+    /**
+     * Retrieves the booted Application instance.
+     *
+     * If the Application has not yet been booted, an Exception will be thrown.
+     *
+     * @return Application
+     * @throws ApplicationNotBootedException
+     */
+    public static function instance();
 
-	/**
-	 * Shuts down the booted Application.
-	 *
-	 * If the Application has already been booted, the Application instance
-	 * will be destroyed by assigning it a null value, freeing it from memory.
-	 * However, the service objects will likely remain in memory if they've been
-	 * attached to hooks when this method is called. This function is primarily
-	 * for uniting testing to make sure you can boot a new instance for each test.
-	 */
-	public static function shutdown();
+    /**
+     * Shuts down the booted Application.
+     *
+     * If the Application has already been booted, the Application instance
+     * will be destroyed by assigning it a null value, freeing it from memory.
+     * However, the service objects will likely remain in memory if they've been
+     * attached to hooks when this method is called. This function is primarily
+     * for uniting testing to make sure you can boot a new instance for each test.
+     */
+    public static function shutdown();
 }

src/Contract/Axolotl/UsesWordPressTerm.php

Indentation +6 added lines, -6 removed lines

@@ -8,10 +8,10 @@
  * @subpackage Contract\Axolotl
  */
 interface UsesWordPressTerm {
-	/**
-	 * Returns the taxonomy used by the Model.
-	 *
-	 * @return string
-	 */
-	public static function get_taxonomy();
+    /**
+     * Returns the taxonomy used by the Model.
+     *
+     * @return string
+     */
+    public static function get_taxonomy();
 }

src/Contract/Axolotl/Serializes.php

Indentation +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@
 namespace Intraxia\Jaxion\Contract\Axolotl;
 
 interface Serializes {
-	/**
-	 * Serializes the model's public data into an array.
-	 *
-	 * @return array
-	 */
-	public function serialize();
+    /**
+     * Serializes the model's public data into an array.
+     *
+     * @return array
+     */
+    public function serialize();
 }

src/Contract/Axolotl/UsesWordPressPost.php

Indentation +6 added lines, -6 removed lines

@@ -8,10 +8,10 @@
  * @subpackage Contract\Axolotl
  */
 interface UsesWordPressPost {
-	/**
-	 * Returns the custom post type used by the Model.
-	 *
-	 * @return string
-	 */
-	public static function get_post_type();
+    /**
+     * Returns the custom post type used by the Model.
+     *
+     * @return string
+     */
+    public static function get_post_type();
 }

src/Assets/ServiceProvider.php

Indentation +32 added lines, -32 removed lines

@@ -11,40 +11,40 @@
  * @subpackage Assets
  */
 class ServiceProvider implements ServiceProviderContract {
-	/**
-	 * Container to register with.
-	 *
-	 * @var Container
-	 */
-	protected $container;
+    /**
+     * Container to register with.
+     *
+     * @var Container
+     */
+    protected $container;
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param Container $container
-	 */
-	public function register( Container $container ) {
-		$this->container = $container;
+    /**
+     * {@inheritDoc}
+     *
+     * @param Container $container
+     */
+    public function register( Container $container ) {
+        $this->container = $container;
 
-		$container->define(
-			array( 'assets' => 'Intraxia\Jaxion\Contract\Assets\Register' ),
-			$register = new Register( $container->fetch( 'url' ), $container->fetch( 'version' ) )
-		);
+        $container->define(
+            array( 'assets' => 'Intraxia\Jaxion\Contract\Assets\Register' ),
+            $register = new Register( $container->fetch( 'url' ), $container->fetch( 'version' ) )
+        );
 
-		$this->add_assets( $register );
-	}
+        $this->add_assets( $register );
+    }
 
-	/**
-	 * Registers the assets on the generated Register.
-	 *
-	 * This is a no-op by default by can be overwritten by the implementing developer
-	 * to provide a single, clean location to register their assets.
-	 *
-	 * @param Register $register
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function add_assets( Register $register ) {
-		// no-op
-	}
+    /**
+     * Registers the assets on the generated Register.
+     *
+     * This is a no-op by default by can be overwritten by the implementing developer
+     * to provide a single, clean location to register their assets.
+     *
+     * @param Register $register
+     *
+     * @codeCoverageIgnore
+     */
+    protected function add_assets( Register $register ) {
+        // no-op
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -23,15 +23,15 @@ 
 	 *
 	 * @param Container $container
 	 */
-	public function register( Container $container ) {
+	public function register(Container $container) {
 		$this->container = $container;
 
 		$container->define(
-			array( 'assets' => 'Intraxia\Jaxion\Contract\Assets\Register' ),
-			$register = new Register( $container->fetch( 'url' ), $container->fetch( 'version' ) )
+			array('assets' => 'Intraxia\Jaxion\Contract\Assets\Register'),
+			$register = new Register($container->fetch('url'), $container->fetch('version'))
 		);
 
-		$this->add_assets( $register );
+		$this->add_assets($register);
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	protected function add_assets( Register $register ) {
+	protected function add_assets(Register $register) {
 		// no-op
 	}
 }

src/Core/Container.php

Indentation +318 added lines, -318 removed lines

@@ -13,322 +13,322 @@
  * @subpackage Core
  */
 class Container implements ContainerContract {
-	/**
-	 * ServiceProvider names to register with the container.
-	 *
-	 * Can be overwritten to include predefined providers.
-	 *
-	 * @var string[]
-	 */
-	protected $providers = array();
-
-	/**
-	 * Registered definitions.
-	 *
-	 * @var mixed[]
-	 */
-	private $definitions = array();
-
-	/**
-	 * Aliases to share between fetches.
-	 *
-	 * @var <string, true>[]
-	 */
-	private $shared = array();
-
-	/**
-	 * Aliases of all the registered services.
-	 *
-	 * @var <string, true>[]
-	 */
-	private $aliases = array();
-
-	/**
-	 * Array of classes registered on the container.
-	 *
-	 * @var <string, true>[]
-	 */
-	private $classes = array();
-
-	/**
-	 * Current position in the loop.
-	 *
-	 * @var int
-	 */
-	private $position;
-
-	/**
-	 * 0-indexed array of aliases for looping.
-	 *
-	 * @var string[]
-	 */
-	private $keys = array();
-
-	/**
-	 * Create a new container with the given providers.
-	 *
-	 * Providers can be instances or the class of the provider as a string.
-	 *
-	 * @param ServiceProvider[]|string[] $providers
-	 */
-	public function __construct( array $providers = array() ) {
-		// array_unique ensures we only register each provider once.
-		$providers = array_unique( array_merge( $this->providers, $providers ) );
-
-		foreach ( $providers as $provider ) {
-			if ( is_string( $provider ) && class_exists( $provider ) ) {
-				$provider = new $provider;
-			}
-
-			if ( $provider instanceof ServiceProvider ) {
-				$this->register( $provider );
-			}
-		}
-	}
-
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string|array $alias
-	 * @param mixed        $definition
-	 *
-	 * @throws DefinedAliasException
-	 *
-	 * @return $this
-	 */
-	public function define( $alias, $definition ) {
-		if ( is_array( $alias ) ) {
-			$class = current( $alias );
-			$alias = key( $alias );
-		}
-
-		if ( isset( $this->aliases[ $alias ] ) ) {
-			throw new DefinedAliasException( $alias );
-		}
-
-		$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 ( isset( $class ) ) {
-			$this->classes[ $class ] = $alias;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string|array $alias
-	 * @param mixed        $definition
-	 *
-	 * @throws DefinedAliasException
-	 *
-	 * @return $this
-	 */
-	public function share( $alias, $definition ) {
-		$this->define( $alias, $definition );
-
-		if ( is_array( $alias ) ) {
-			$alias = key( $alias );
-		}
-
-		$this->shared[ $alias ] = true;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string $alias
-	 *
-	 * @throws UndefinedAliasException
-	 *
-	 * @return mixed
-	 */
-	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 ];
-		}
-
-		if ( ! isset( $this->aliases[ $alias ] ) ) {
-			throw new UndefinedAliasException( $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 ) {
-			$factory = $value;
-			$value   = $factory( $this );
-		}
-
-		// If the value is shared, save the shared value.
-		if ( isset( $this->shared[ $alias ] ) ) {
-			$this->definitions[ $alias ] = $value;
-		}
-
-		// Return the fetched value.
-		return $value;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param  string $alias
-	 *
-	 * @return bool
-	 */
-	public function has( $alias ) {
-		return isset( $this->aliases[ $alias ] );
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param string $alias
-	 *
-	 * @return $this
-	 */
-	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
-			 * can be overwritten on setting.
-			 *
-			 * Pros: Quick setting/unsetting, faster
-			 * performance on those operations when doing
-			 * a lot of these.
-			 *
-			 * Cons: Objects and values set in the container
-			 * can't get garbage collected.
-			 *
-			 * If this is a problem, this may need to be revisited.
-			 */
-			unset( $this->aliases[ $alias ] );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param ServiceProvider $provider
-	 *
-	 * @return $this
-	 */
-	public function register( ServiceProvider $provider ) {
-		// @todo make sure provider is only registered once
-		$provider->register( $this );
-
-		return $this;
-	}
-
-	/**
-	 * Set a value into the container.
-	 *
-	 * @param  string $id
-	 * @param  mixed  $value
-	 *
-	 * @see    define
-	 */
-	public function offsetSet( $id, $value ) {
-		$this->define( $id, $value );
-	}
-
-	/**
-	 * Get an value from the container.
-	 *
-	 * @param  string $id
-	 *
-	 * @return object
-	 * @throws UndefinedAliasException
-	 *
-	 * @see    fetch
-	 */
-	public function offsetGet( $id ) {
-		return $this->fetch( $id );
-	}
-
-	/**
-	 * Checks if a key is set on the container.
-	 *
-	 * @param  string $id
-	 *
-	 * @return bool
-	 *
-	 * @see    has
-	 */
-	public function offsetExists( $id ) {
-		return $this->has( $id );
-	}
-
-	/**
-	 * Remove a key from the container.
-	 *
-	 * @param string $id
-	 *
-	 * @see   remove
-	 */
-	public function offsetUnset( $id ) {
-		$this->remove( $id );
-	}
-
-	/**
-	 * Sets the object properties to prepare for the loop.
-	 */
-	public function rewind() {
-		$this->position = 0;
-		$this->keys     = array_keys( $this->aliases );
-	}
-
-	/**
-	 * Retrieves the service object for the current step in the loop.
-	 *
-	 * @return object
-	 */
-	public function current() {
-		return $this->fetch( $this->keys[ $this->position ] );
-	}
-
-	/**
-	 * Retrieves the key for the current step in the loop.
-	 *
-	 * @return string
-	 */
-	public function key() {
-		return $this->keys[ $this->position ];
-	}
-
-	/**
-	 * Increments to the next step in the loop.
-	 */
-	public function next() {
-		$this->position ++;
-	}
-
-	/**
-	 * Checks if the next step in the loop in valid.
-	 *
-	 * @return bool
-	 */
-	public function valid() {
-		return isset( $this->keys[ $this->position ] );
-	}
+    /**
+     * ServiceProvider names to register with the container.
+     *
+     * Can be overwritten to include predefined providers.
+     *
+     * @var string[]
+     */
+    protected $providers = array();
+
+    /**
+     * Registered definitions.
+     *
+     * @var mixed[]
+     */
+    private $definitions = array();
+
+    /**
+     * Aliases to share between fetches.
+     *
+     * @var <string, true>[]
+     */
+    private $shared = array();
+
+    /**
+     * Aliases of all the registered services.
+     *
+     * @var <string, true>[]
+     */
+    private $aliases = array();
+
+    /**
+     * Array of classes registered on the container.
+     *
+     * @var <string, true>[]
+     */
+    private $classes = array();
+
+    /**
+     * Current position in the loop.
+     *
+     * @var int
+     */
+    private $position;
+
+    /**
+     * 0-indexed array of aliases for looping.
+     *
+     * @var string[]
+     */
+    private $keys = array();
+
+    /**
+     * Create a new container with the given providers.
+     *
+     * Providers can be instances or the class of the provider as a string.
+     *
+     * @param ServiceProvider[]|string[] $providers
+     */
+    public function __construct( array $providers = array() ) {
+        // array_unique ensures we only register each provider once.
+        $providers = array_unique( array_merge( $this->providers, $providers ) );
+
+        foreach ( $providers as $provider ) {
+            if ( is_string( $provider ) && class_exists( $provider ) ) {
+                $provider = new $provider;
+            }
+
+            if ( $provider instanceof ServiceProvider ) {
+                $this->register( $provider );
+            }
+        }
+    }
+
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string|array $alias
+     * @param mixed        $definition
+     *
+     * @throws DefinedAliasException
+     *
+     * @return $this
+     */
+    public function define( $alias, $definition ) {
+        if ( is_array( $alias ) ) {
+            $class = current( $alias );
+            $alias = key( $alias );
+        }
+
+        if ( isset( $this->aliases[ $alias ] ) ) {
+            throw new DefinedAliasException( $alias );
+        }
+
+        $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 ( isset( $class ) ) {
+            $this->classes[ $class ] = $alias;
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string|array $alias
+     * @param mixed        $definition
+     *
+     * @throws DefinedAliasException
+     *
+     * @return $this
+     */
+    public function share( $alias, $definition ) {
+        $this->define( $alias, $definition );
+
+        if ( is_array( $alias ) ) {
+            $alias = key( $alias );
+        }
+
+        $this->shared[ $alias ] = true;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string $alias
+     *
+     * @throws UndefinedAliasException
+     *
+     * @return mixed
+     */
+    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 ];
+        }
+
+        if ( ! isset( $this->aliases[ $alias ] ) ) {
+            throw new UndefinedAliasException( $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 ) {
+            $factory = $value;
+            $value   = $factory( $this );
+        }
+
+        // If the value is shared, save the shared value.
+        if ( isset( $this->shared[ $alias ] ) ) {
+            $this->definitions[ $alias ] = $value;
+        }
+
+        // Return the fetched value.
+        return $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param  string $alias
+     *
+     * @return bool
+     */
+    public function has( $alias ) {
+        return isset( $this->aliases[ $alias ] );
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $alias
+     *
+     * @return $this
+     */
+    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
+             * can be overwritten on setting.
+             *
+             * Pros: Quick setting/unsetting, faster
+             * performance on those operations when doing
+             * a lot of these.
+             *
+             * Cons: Objects and values set in the container
+             * can't get garbage collected.
+             *
+             * If this is a problem, this may need to be revisited.
+             */
+            unset( $this->aliases[ $alias ] );
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param ServiceProvider $provider
+     *
+     * @return $this
+     */
+    public function register( ServiceProvider $provider ) {
+        // @todo make sure provider is only registered once
+        $provider->register( $this );
+
+        return $this;
+    }
+
+    /**
+     * Set a value into the container.
+     *
+     * @param  string $id
+     * @param  mixed  $value
+     *
+     * @see    define
+     */
+    public function offsetSet( $id, $value ) {
+        $this->define( $id, $value );
+    }
+
+    /**
+     * Get an value from the container.
+     *
+     * @param  string $id
+     *
+     * @return object
+     * @throws UndefinedAliasException
+     *
+     * @see    fetch
+     */
+    public function offsetGet( $id ) {
+        return $this->fetch( $id );
+    }
+
+    /**
+     * Checks if a key is set on the container.
+     *
+     * @param  string $id
+     *
+     * @return bool
+     *
+     * @see    has
+     */
+    public function offsetExists( $id ) {
+        return $this->has( $id );
+    }
+
+    /**
+     * Remove a key from the container.
+     *
+     * @param string $id
+     *
+     * @see   remove
+     */
+    public function offsetUnset( $id ) {
+        $this->remove( $id );
+    }
+
+    /**
+     * Sets the object properties to prepare for the loop.
+     */
+    public function rewind() {
+        $this->position = 0;
+        $this->keys     = array_keys( $this->aliases );
+    }
+
+    /**
+     * Retrieves the service object for the current step in the loop.
+     *
+     * @return object
+     */
+    public function current() {
+        return $this->fetch( $this->keys[ $this->position ] );
+    }
+
+    /**
+     * Retrieves the key for the current step in the loop.
+     *
+     * @return string
+     */
+    public function key() {
+        return $this->keys[ $this->position ];
+    }
+
+    /**
+     * Increments to the next step in the loop.
+     */
+    public function next() {
+        $this->position ++;
+    }
+
+    /**
+     * Checks if the next step in the loop in valid.
+     *
+     * @return bool
+     */
+    public function valid() {
+        return isset( $this->keys[ $this->position ] );
+    }
 }

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