Merge branch 'hotfix/147'

weierophinney · weierophinney · commit 90461f9f7865 · 2018-04-17T13:26:16.000-05:00
Close #147
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#147](https://github.com/zendframework/zend-cache/pull/147) fixes the Redis extension by ensuring it casts the results of `exists()` to a
+  boolean when testing if the storage contains an item.
+
 - [#146](https://github.com/zendframework/zend-cache/pull/146) fixes several methods to change `@return` annotations to `@throws` where applicable.
 
 - [#134](https://github.com/zendframework/zend-cache/pull/134) adds a missing import statement for `Traversable` within the `AdapterOptions` class.
diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
@@ -206,7 +206,7 @@ protected function internalHasItem(& $normalizedKey)
     {
         $redis = $this->getRedisResource();
         try {
-            return $redis->exists($this->namespacePrefix . $normalizedKey);
+            return (bool) $redis->exists($this->namespacePrefix . $normalizedKey);
         } catch (RedisResourceException $e) {
             throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
         }
diff --git a/test/Storage/Adapter/RedisTest.php b/test/Storage/Adapter/RedisTest.php
@@ -9,8 +9,12 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
+use PHPUnit_Framework_MockObject_MockObject;
 use Zend\Cache;
 use Redis as RedisResource;
+use Zend\Cache\Storage\Adapter\Redis;
+use Zend\Cache\Storage\Adapter\RedisOptions;
+use Zend\Cache\Storage\Adapter\RedisResourceManager;
 
 /**
  * @covers Zend\Cache\Storage\Adapter\Redis<extended>
@@ -337,4 +341,48 @@ public function testTouchItem()
         $this->assertTrue($this->_storage->touchItem($key));
         $this->assertEquals($ttl, ceil($this->_storage->getMetadata($key)['ttl']));
     }
+
+    public function testHasItemReturnsFalseIfRedisExistsReturnsZero()
+    {
+        $redis = $this->mockInitializedRedisResource();
+        $redis->method('exists')->willReturn(0);
+        $adapter = $this->createAdapterFromResource($redis);
+
+        $hasItem = $adapter->hasItem('does-not-exist');
+
+        $this->assertFalse($hasItem);
+    }
+
+    public function testHasItemReturnsTrueIfRedisExistsReturnsNonZeroInt()
+    {
+        $redis = $this->mockInitializedRedisResource();
+        $redis->method('exists')->willReturn(23);
+        $adapter = $this->createAdapterFromResource($redis);
+
+        $hasItem = $adapter->hasItem('does-not-exist');
+
+        $this->assertTrue($hasItem);
+    }
+
+    /**
+     * @return Redis
+     */
+    private function createAdapterFromResource(RedisResource $redis)
+    {
+        $resourceManager = new RedisResourceManager();
+        $resourceId = 'my-resource';
+        $resourceManager->setResource($resourceId, $redis);
+        $options = new RedisOptions(['resource_manager' => $resourceManager, 'resource_id' => $resourceId]);
+        return new Redis($options);
+    }
+
+    /**
+     * @return PHPUnit_Framework_MockObject_MockObject|RedisResource
+     */
+    private function mockInitializedRedisResource()
+    {
+        $redis = $this->getMock(RedisResource::class);
+        $redis->socket = true;
+        return $redis;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ protected function internalHasItem(& $normalizedKey)`
`206`	`206`	`{`
`207`	`207`	`$redis = $this->getRedisResource();`
`208`	`208`	`try {`
`209`		`- return $redis->exists($this->namespacePrefix . $normalizedKey);`
	`209`	`+ return (bool) $redis->exists($this->namespacePrefix . $normalizedKey);`
`210`	`210`	`} catch (RedisResourceException $e) {`
`211`	`211`	`throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);`
`212`	`212`	`}`