Merge pull request #1383 from ytetsuro/fix/#1204

fix TypeError in MemcachedHandler::__construct()
codeigniter4 · Oct 31, 2018 · feed450 · feed450
2 parents 7f2e6a5 + 0181fb8
commit feed450
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
@@ -68,13 +68,14 @@ class MemcachedHandler implements CacheInterface
 
 	//--------------------------------------------------------------------
 
-	public function __construct(array $config)
+	public function __construct($config)
 	{
+		$config = (array)$config;
 		$this->prefix = $config['prefix'] ?? '';
 
 		if ( ! empty($config))
 		{
-			$this->config = array_merge($this->config, $config);
+			$this->config = array_merge($this->config, $config['memcached']);
 		}
 	}
 

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -22,7 +22,7 @@ public function setUp()
 
 		$this->config = new \Config\Cache();
 
-		$this->memcachedHandler = new MemcachedHandler($this->config->memcached, '127.0.0.1');
+		$this->memcachedHandler = new MemcachedHandler($this->config);
 		if (!$this->memcachedHandler->isSupported()) {
 			$this->markTestSkipped('Not support memcached and memcache');
 		}
@@ -74,7 +74,7 @@ public function testIncrement()
 
 		$config = new \Config\Cache();
 		$config->memcached['raw'] = true;
-		$memcachedHandler = new MemcachedHandler($config->memcached, '127.0.0.1');
+		$memcachedHandler = new MemcachedHandler($config);
 		$memcachedHandler->initialize();
 
 		$memcachedHandler->save(self::$key1, 1);
@@ -93,7 +93,7 @@ public function testDecrement()
 
 		$config = new \Config\Cache();
 		$config->memcached['raw'] = true;
-		$memcachedHandler = new MemcachedHandler($config->memcached, '127.0.0.1');
+		$memcachedHandler = new MemcachedHandler($config);
 		$memcachedHandler->initialize();
 
 		$memcachedHandler->save(self::$key1, 10);