Return instantiated objects

Author: damianopetrungaro

src/Container.php

@@ -8,8 +8,20 @@
 
 class Container implements ContainerInterface
 {
+    /**
+     * Contains all entries
+     *
+     * @var $container array
+     */
     private $container = [];
 
+    /**
+     * Contains all instantiated entries
+     *
+     * @var $instances array
+     */
+    private $instances = [];
+
     /**
      * Container constructor accept an array.
      * It must be an associative array with a 'alias' key and a 'entry' value.
@@ -36,14 +48,19 @@ public function __construct($entries = [])
      */
     public function get($alias)
     {
-        if (isset($this->container[$alias])) {
-            if (is_callable($this->container[$alias])) {
-                return $this->container[$alias]($this);
-            }
+        if (!isset($this->container[$alias])) {
+            throw new NotFoundException("$alias doesn't exists in the container");
+        }
 
+        if (!is_callable($this->container[$alias])) {
             return $this->container[$alias];
         }
-        throw new NotFoundException("$alias doesn't exists in the container");
+
+        if (!isset($this->instances[$alias])) {
+            $this->instances[$alias] = $this->container[$alias]($this);
+        }
+
+        return $this->instances[$alias];
     }
 
     /**

tests/Unit/ContainerTest.php

@@ -94,6 +94,20 @@ public function testHasEntry()
         $this->assertTrue($c->has('entry'));
     }
 
+    /**
+     * Test that is always returned the same object
+     */
+    public function testReturnAlwaysSameInstances()
+    {
+        $entries = [
+            'instance' => function () {
+                return new \SplObjectStorage();
+            }
+        ];
+        $c = new Container($entries);
+        $this->assertTrue($c->get('instance') === $c->get('instance'));
+    }
+
     /**
      * Test that has not an entry
      */