Merge commit 'refs/pull/3630/head' of github.com:zendframework/zf2 in…

…to hotfix/memcached-options
zendframework · Feb 1, 2013 · 13fb3c5 · 13fb3c5
2 parents 356ab3b + 227d7fa
commit 13fb3c5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/Storage/Adapter/MemcachedResourceManager.php b/src/Storage/Adapter/MemcachedResourceManager.php
@@ -213,7 +213,7 @@ public function setLibOptions($id, array $libOptions)
         $resource = & $this->resources[$id];
         if ($resource instanceof MemcachedResource) {
             if (method_exists($resource, 'setOptions')) {
-                $resource->setOptions($resource);
+                $resource->setOptions($libOptions);
             } else {
                 foreach ($libOptions as $key => $value) {
                     $resource->setOption($key, $value);

diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.php
@@ -1024,7 +1024,7 @@ public function testClearExpired()
         $this->assertTrue($this->_storage->hasItem('key2'));
     }
 
-    public function testTagable()
+    public function testTaggable()
     {
         if (!($this->_storage instanceof TaggableInterface)) {
             $this->markTestSkipped("Storage doesn't implement TaggableInterface");

diff --git a/test/Storage/Adapter/MemcachedResourceManagerTest.php b/test/Storage/Adapter/MemcachedResourceManagerTest.php
@@ -233,4 +233,25 @@ public function testValidResources($resourceId, $resource, $expectedPersistentId
         $this->assertSame($this->resourceManager, $this->resourceManager->removeResource($resourceId));
         $this->assertFalse($this->resourceManager->hasResource($resourceId));
     }
+
+    public function testSetLibOptionsOnExistingResource()
+    {
+        $memcachedInstalled = class_exists('Memcached', false);
+
+        $libOptions = array('compression' => false);
+        $resourceId = 'testResourceId';
+        $resourceMock = $this->getMock('Memcached', array('setOptions'));
+
+        if (!$memcachedInstalled) {
+            $this->setExpectedException('Zend\Cache\Exception\InvalidArgumentException');
+        } else {
+            $resourceMock
+                ->expects($this->once())
+                ->method('setOptions')
+                ->with($this->isType('array'));
+        }
+
+        $this->resourceManager->setResource($resourceId, $resourceMock);
+        $this->resourceManager->setLibOptions($resourceId, $libOptions);
+    }
 }