Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Storage/Adapter/RedisResourceManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function getPassword($id)
* Gets a redis resource
*
* @param string $id
* @return RedisResourceManager
* @return RedisResource
* @throws Exception\RuntimeException
*/
public function getResource($id)
Expand Down
16 changes: 9 additions & 7 deletions test/Storage/Adapter/RedisTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,12 @@ public function testRedisSetBoolean()

public function testGetCapabilitiesTtl()
{
$host = getenv('TESTS_ZEND_CACHE_REDIS_HOST') ? : '127.0.0.1';
$port = getenv('TESTS_ZEND_CACHE_REDIS_PORT') ? : 6379;
$redisResource = new RedisResource();
$redisResource->connect($host, $port);
$info = $redisResource->info();
$majorVersion = (int) $info['redis_version'];
$resourceManager = $this->_options->getResourceManager();
$resourceId = $this->_options->getResourceId();
$redis = $resourceManager->getResource($resourceId);
$majorVersion = (int) $redis->info()['redis_version'];

$this->assertEquals($majorVersion, $this->_options->getResourceManager()->getMajorVersion($this->_options->getResourceId()));
$this->assertEquals($majorVersion, $resourceManager->getMajorVersion($resourceId));

$capabilities = $this->_storage->getCapabilities();
if ($majorVersion < 2) {
Expand All @@ -145,6 +143,7 @@ public function testSocketConnection()
$normalized = $this->_options->getResourceManager()->getServer($this->_options->getResourceId());
$this->assertEquals($socket, $normalized['host'], 'Host should equal to socket {$socket}');

// Don't try to flush on shutdown
$this->_storage = null;
}

Expand Down Expand Up @@ -271,6 +270,9 @@ public function testGetSetServer()
];
$this->_options->setServer($server);
$this->assertEquals($server, $this->_options->getServer(), 'Server was not set correctly through RedisOptions');

// Don't try to flush on shutdown
$this->_storage = null;
}

public function testOptionsGetSetDatabase()
Expand Down