Altered namespace and some of the structure, added some more documentation to the README.

Author: seeruk

README.md

@@ -18,10 +18,59 @@ $ composer require strident/container ~1.0
 The container is incredibly simple to instantiate. Simply do the following:
 
 ```php
-use Container\Container;
+use Strident\Container\Container;
 
 $container = new Container();
 ```
 
+###Defining Services
+
+From there, you can define services like so:
+
+```php
+// 'Service' class defined somewhere, and 'dependency_name' service defined
+
+$container->set("service_name", function($container) {
+    return new Service($container->get("dependency_name"));
+});
+```
+
+The services are lazy loaded (i.e. nothing is instantiated until it is called).
+
+###Extending a Service After Definition
+
+You may also extend services once they have been defined (for example, if you wish to augment a service, alter settings, swap out dependencies etc). But note that once a service is used, it becomes locked and cannot be modified further.
+
+```php
+$container->extend("service_name", function($service, $container) {
+    $service->doSomething();
+    $service->addSomething($container->get("dependency_name"));
+    
+    return $service;
+});
+```
+
+###Defining Factory Services
+
+If you wish to return a new instance of your service every time instead of the same instance, you may define a factory service like so:
+
+```php
+$container->set("service_name", $container->factory(function($container) {
+    return new Service($container->get("dependency_name"));
+}));
+```
+
+###Parameters
+
+Parameters are get / set by accessing the container like an array:
+
+```php
+// Set
+$container["foo"] = "A parameter can be anything";
+
+// Get
+$foo = $container["foo"];
+```
+
 [1]: https://github.com/silexphp/Pimple
 

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "strident/container",
     "type": "library",
-    "description": "Simple dependency injection container, inspired by Pimple.",
-    "keywords": [ "dic" ],
+    "description": "Dependency injection container component designed for ease of use and speed. Built for Trident. Heavily inspired by Pimple.",
+    "keywords": [ "dic", "component", "strident", "trident" ],
     "license": "MIT",
     "homepage": "https://github.com/Strident/Container",
     "authors": [
@@ -19,10 +19,10 @@
         "codeclimate/php-test-reporter": "~0.1"
     },
     "autoload": {
-        "psr-0": { "Container\\": "src/" }
+        "psr-4": { "Strident\\Container\\": "src/" }
     },
     "autoload-dev": {
-        "psr-4": { "Container\\Tests\\": "tests/" }
+        "psr-4": { "Strident\\Container\\Tests\\": "tests/" }
     },
     "minimum-stability": "dev"
 }

src/Container/Container.php src/Container.phpsrc/Container/Container.php renamed to src/Container.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Container;
+namespace Strident\Container;
 
 use ArrayAccess;
 use Closure;
@@ -96,30 +96,20 @@ public function offsetUnset($name)
         return $this->removeParameter($name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function set($name, $value)
-    {
-        $this->services->set($name, $value);
-
-        return $this;
-    }
-
     /**
      * {@inheritDoc}
      */
     public function get($name)
     {
         if (!$this->services->has($name)) {
-            throw new InvalidArgumentException(sprintf('Service "%s" is not defined.', $name));
+            throw new InvalidArgumentException(sprintf("Service \"%s\" is not defined.", $name));
         }
 
         /** @var Closure $service */
         $service = $this->services->get($name);
 
         if ($this->services->isLocked($name)
-            || !method_exists($this->services->get($name), '__invoke')) {
+            || !method_exists($this->services->get($name), "__invoke")) {
             return $service;
         }
 
@@ -160,9 +150,9 @@ public function remove($name)
     /**
      * {@inheritDoc}
      */
-    public function setParameter($name, $value)
+    public function set($name, $value)
     {
-        $this->parameters->set($name, $value);
+        $this->services->set($name, $value);
 
         return $this;
     }
@@ -173,7 +163,7 @@ public function setParameter($name, $value)
     public function getParameter($name)
     {
         if (!$this->parameters->has($name)) {
-            throw new InvalidArgumentException(sprintf('Parameter "%s" is not defined.', $name));
+            throw new InvalidArgumentException(sprintf("Parameter \"%s\" is not defined.", $name));
         }
 
         return $this->parameters->get($name);
@@ -195,6 +185,16 @@ public function removeParameter($name)
         return $this->parameters->remove($name);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameters->set($name, $value);
+
+        return $this;
+    }
+
     /**
      * All array access keys
      *
@@ -216,8 +216,10 @@ public function keys()
      */
     public function factory($callable)
     {
-        if (!is_object($callable) || !method_exists($callable, '__invoke')) {
-            throw new InvalidArgumentException('Service definition is not a Closure or invokable object.');
+        if (!is_object($callable) || !method_exists($callable, "__invoke")) {
+            throw new InvalidArgumentException(
+                "Service definition is not a Closure or invokable object."
+            );
         }
 
         $this->factories->attach($callable);
@@ -240,20 +242,28 @@ public function extend($name, $callable, $strict = true)
     {
         if (!$this->services->has($name)) {
             if ($strict) {
-                throw new InvalidArgumentException(sprintf('Service "%s" is not defined.', $name));
+                throw new InvalidArgumentException(sprintf(
+                    "Service \"%s\" is not defined.",
+                    $name
+                ));
             } else {
                 return false;
             }
         }
 
         $factory = $this->services->get($name);
 
-        if (!is_object($factory) || !method_exists($factory, '__invoke')) {
-            throw new InvalidArgumentException(sprintf('Service "%s" does not contain an object definition.', $name));
+        if (!is_object($factory) || !method_exists($factory, "__invoke")) {
+            throw new InvalidArgumentException(sprintf(
+                "Service \"%s\" does not contain an object definition.",
+                $name
+            ));
         }
 
-        if (!is_object($callable) || !method_exists($callable, '__invoke')) {
-            throw new InvalidArgumentException('Extension service definition is not a Closure or invokable object.');
+        if (!is_object($callable) || !method_exists($callable, "__invoke")) {
+            throw new InvalidArgumentException(
+                "Extension service definition is not a Closure or invokable object."
+            );
         }
 
         $extended = function($c) use($callable, $factory) {

src/Container/ContainerInterface.php src/ContainerInterface.phpsrc/Container/ContainerInterface.php renamed to src/ContainerInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Container;
+namespace Strident\Container;
 
 /**
  * Container Interface
@@ -18,16 +18,6 @@
  */
 interface ContainerInterface
 {
-    /**
-     * Set item in container
-     *
-     * @param string $name
-     * @param mixed  $value
-     *
-     * @return mixed
-     */
-    public function set($name, $value);
-
     /**
      * Get item in container
      *
@@ -56,14 +46,14 @@ public function has($name);
     public function remove($name);
 
     /**
-     * Set a parameter
+     * Set item in container
      *
      * @param string $name
      * @param mixed  $value
      *
      * @return mixed
      */
-    public function setParameter($name, $value);
+    public function set($name, $value);
 
     /**
      * Get a parameter
@@ -91,4 +81,14 @@ public function hasParameter($name);
      * @return mixed
      */
     public function removeParameter($name);
+
+    /**
+     * Set a parameter
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return mixed
+     */
+    public function setParameter($name, $value);
 }

…iner/Exception/ItemNotFoundException.php src/Exception/ItemNotFoundException.phpsrc/Container/Exception/ItemNotFoundException.php renamed to src/Exception/ItemNotFoundException.php src/Container/Exception/ItemNotFoundException.php renamed to src/Exception/ItemNotFoundException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Container\Exception;
+namespace Strident\Container\Exception;
 
 /**
  * Item Not Found Exception
@@ -26,6 +26,6 @@ class ItemNotFoundException extends \InvalidArgumentException
      */
     public function __construct($name, \Exception $previous = null)
     {
-        parent::__construct(sprintf('Item "%s" could not be found.', $name), 0, $previous);
+        parent::__construct(sprintf("Item \"%s\" could not be found.", $name), 0, $previous);
     }
 }

…tainer/Exception/LockedItemException.php src/Exception/LockedItemException.phpsrc/Container/Exception/LockedItemException.php renamed to src/Exception/LockedItemException.php src/Container/Exception/LockedItemException.php renamed to src/Exception/LockedItemException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Container\Exception;
+namespace Strident\Container\Exception;
 
 /**
  * Locked Item Exception
@@ -26,6 +26,6 @@ class LockedItemException extends \RuntimeException
      */
     public function __construct($name, \Exception $previous = null)
     {
-        parent::__construct(sprintf('Cannot override locked item "%s".', $name), 0, $previous);
+        parent::__construct(sprintf("Cannot override locked item \"%s\".", $name), 0, $previous);
     }
 }

src/Container/LockBox.php src/LockBox.phpsrc/Container/LockBox.php renamed to src/LockBox.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Container;
+namespace Strident\Container;
 
-use Container\Exception\ItemNotFoundException;
-use Container\Exception\LockedItemException;
+use Strident\Container\Exception\ItemNotFoundException;
+use Strident\Container\Exception\LockedItemException;
 
 /**
  * LockBox stores items, and can lock them on request.