Merge branch 'hotfix/cache-memcached-options'

Close zendframework/zendframework#2397
zendframework · Oct 1, 2012 · fbff658 · fbff658
commit fbff658
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Storage/Adapter/MemcachedOptions.php b/src/Storage/Adapter/MemcachedOptions.php
@@ -139,7 +139,7 @@ public function setLibOptions(array $libOptions)
         }
 
         $this->triggerOptionEvent('lib_options', $normalizedOptions);
-        $this->libOptions = array_merge($this->libOptions, $normalizedOptions);
+        $this->libOptions = array_diff_key($this->libOptions, $normalizedOptions) + $normalizedOptions;
 
         return $this;
     }

diff --git a/test/Storage/Adapter/MemcachedTest.php b/test/Storage/Adapter/MemcachedTest.php
@@ -79,6 +79,22 @@ public function testOptionsSetServers()
         $this->assertEquals($memcached->getOptions()->getServers(), $servers);
     }
 
+    public function testLibOptionsSet()
+    {
+        $options = new Cache\Storage\Adapter\MemcachedOptions();
+
+        $options->setLibOptions(array(
+            'COMPRESSION' => false
+        ));
+
+        $this->assertEquals($options->getLibOption(\Memcached::OPT_COMPRESSION), false);
+
+        $memcached = new Cache\Storage\Adapter\Memcached($options);
+        $this->assertEquals($memcached->getOptions()->getLibOptions(), array(
+            \Memcached::OPT_COMPRESSION => false
+        ));
+    }
+
     public function testNoOptionsSetsDefaultServer()
     {
         $memcached = new Cache\Storage\Adapter\Memcached();