Settings -> Config for Cache namespace

cakephp · Mar 20, 2014 · 3f01f75 · 3f01f75
1 parent 3a2dbec
commit 3f01f75
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/Cache/CacheEngine.php b/src/Cache/CacheEngine.php
@@ -169,10 +169,24 @@ public function groups() {
 /**
  * Cache Engine config
  *
- * @return array config
- */
-	public function config() {
-		return $this->_config;
+ * If called with no arguments, returns the full config array
+ * Otherwise returns the config for the specified key
+ *
+ * Usage:
+ * {{{
+ * $instance->config(); will return full config
+ * $instance->config('duration'); will return configured duration
+ * $instance->config('notset'); will return null
+ * }}}
+ *
+ * @param string|null $key to return
+ * @return mixed array or config value
+ */
+	public function config($key = null) {
+		if ($key === null) {
+			return $this->_config;
+		}
+		return isset($this->_config[$key]) ? $this->_config[$key] : null;
 	}
 
 /**

diff --git a/tests/TestCase/Cache/CacheTest.php b/tests/TestCase/Cache/CacheTest.php
@@ -275,7 +275,7 @@ public function testGroupConfigsThrowsException() {
 
 /**
  * test that configured returns an array of the currently configured cache
- * settings
+ * config
  *
  * @return void
  */

diff --git a/tests/TestCase/Cache/Engine/MemcachedEngineTest.php b/tests/TestCase/Cache/Engine/MemcachedEngineTest.php
@@ -242,14 +242,14 @@ public function testMsgpackSerializerSetting() {
 		);
 
 		$Memcached = new TestMemcachedEngine();
-		$settings = array(
+		$config = array(
 			'engine' => 'Memcached',
 			'servers' => array('127.0.0.1:11211'),
 			'persistent' => false,
 			'serialize' => 'msgpack'
 		);
 
-		$Memcached->init($settings);
+		$Memcached->init($config);
 		$this->assertEquals(Memcached::SERIALIZER_MSGPACK, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER));
 	}
 
@@ -290,7 +290,7 @@ public function testMsgpackSerializerThrowException() {
 		);
 
 		$Memcached = new TestMemcachedEngine();
-		$settings = array(
+		$config = array(
 			'engine' => 'Memcached',
 			'servers' => array('127.0.0.1:11211'),
 			'persistent' => false,
@@ -300,7 +300,7 @@ public function testMsgpackSerializerThrowException() {
 		$this->setExpectedException(
 			'Cake\Error\Exception', 'msgpack is not a valid serializer engine for Memcached'
 		);
-		$Memcached->init($settings);
+		$Memcached->init($config);
 	}
 
 /**