Fix issue #1

ICanBoogie · Jan 20, 2015 · cdf9c62 · cdf9c62
1 parent a5d80ee
commit cdf9c62
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/lib/Config.php b/lib/Config.php
@@ -144,14 +144,12 @@ public function offsetGet($id)
 	 */
 	private function get_cache_key($name)
 	{
-		if ($this->cache_key)
+		if (!$this->cache_key)
 		{
-			return $this->cache_key;
+			$this->cache_key = substr(sha1(implode('|', array_keys($this->paths))), 0, 8);
 		}
 
-		$hash = substr(sha1(implode('|', array_keys($this->paths))), 0, 8);
-
-		return $this->cache_key = $hash . '_' . $name;
+		return $this->cache_key . '_' . $name;
 	}
 
 	/**

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -71,5 +71,6 @@ public function test_states_with_cache()
 
 		$this->assertNotSame($app1, $app2);
 		$this->assertSame($app2, $app3);
+		$this->assertNotSame($app3, $configs->synthesize('event', 'recursive merge'));
 	}
 }
diff --git a/tests/fixtures/config02/event.php b/tests/fixtures/config02/event.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+
+	'one' => "one",
+	'two' => "two"
+
+];