fix: make sure everything had same instance

Signed-off-by: Fery Wardiyanto <ferywardiyanto@gmail.com>

src/Container.php

@@ -18,6 +18,13 @@ class Container implements ContainerInterface
      */
     private $instances = [];
 
+    /**
+     * List of instances that been resolved.
+     *
+     * @var array<string, mixed>
+     */
+    private $resolved = [];
+
     /**
      * Service container resolver.
      *
@@ -52,10 +59,14 @@ public function get($id)
             throw new NotFoundException($id);
         }
 
+        if (isset($this->resolved[$id])) {
+            return $this->resolved[$id];
+        }
+
         $instance = $this->instances[$id];
 
         if (is_callable($instance)) {
-            return $this->resolver->handle($instance);
+            return $this->resolved[$id] = $this->resolver->handle($instance);
         }
 
         if (is_string($instance) && $this->has($instance)) {

test/spec/Container.spec.php

@@ -302,4 +302,32 @@
             $this->c->make([new Stubs\SomeClass(), 'shouldCalled'], ['new value'])
         )->toEqual('new value');
     });
+
+    it('Should have same instance everywhere', function () {
+        $this->c->set('foobar', function () {
+            return new class {
+                protected $items = [];
+                public function set($item, $value) {
+                    $this->items[$item] = $value;
+                }
+                public function get($item) {
+                    return $this->items[$item] ?? null;
+                }
+            };
+        });
+
+        $here = $this->c->get('foobar');
+        $here->set('key', 'value');
+
+        $there = $this->c->get('foobar');
+        $there->set('name', 'john');
+
+        $somewhere = $this->c->get('foobar');
+
+        foreach (['key', 'name'] as $key) {
+            expect($here->get($key))->toBe($there->get($key));
+            expect($there->get($key))->toBe($here->get($key));
+            expect($somewhere->get($key))->toBe($here->get($key));
+        }
+    });
 });