unsetting result on overriding

Author: tzappa

Container.php

@@ -57,6 +57,8 @@ public function set($id, $value)
 			throw new Exception("Cannot override locked key {$id}");
 		}
 		$this->definitions[$id] = $value;
+		// unset on override
+		unset($this->objects[$id]);
 	}
 
 	/**
@@ -72,7 +74,7 @@ public function get($id)
 			return null;
 		}
 
-		if (method_exists($this->definitions[$id], '__invoke')) {
+		if (method_exists($this->definitions[$id], "__invoke")) {
 			if (isset($this->raws[$this->definitions[$id]])) {
 				return $this->definitions[$id];
 			}

tests/ContainerTest.php

@@ -215,7 +215,7 @@ public function testGetFactory()
 		$this->assertNotSame($container->factory("closure"), $container->factory("closure"));
 	}
 
-	public function testOverriding()
+	public function testOverridingValueWithValue()
 	{
 		$container = new Container();
 		$container->set("param", "value");
@@ -224,6 +224,41 @@ public function testOverriding()
 		$this->assertSame("other value", $container->get("param"));
 	}
 
+	public function testOverridingClosureWithValue()
+	{
+		$container = new Container();
+		$container->set("random", function () {
+			return rand(1, 9);
+		});
+		$this->assertInternalType("int", $container->get("random"));
+		$container->set("random", "a");
+		$this->assertSame("a", $container->get("random"));
+	}
+
+	public function testOverridingValueWithClosure()
+	{
+		$container = new Container();
+		$container->set("random", "a");
+		$this->assertSame("a", $container->get("random"));
+		$container->set("random", function () {
+			return rand(1, 9);
+		});
+		$this->assertInternalType("int", $container->get("random"));
+	}
+
+	public function testOverridingClosureWithClosure()
+	{
+		$container = new Container();
+		$container->set("random", function () {
+			return rand(1, 9);
+		});
+		$this->assertInternalType("int", $container->get("random"));
+		$container->set("random", function () {
+			return "pi=" . (3 +  0.14);
+		});
+		$this->assertSame("pi=3.14", $container->get("random"));
+	}
+
 	public function testOverridingLockedValue()
 	{
 		$container = new Container();