geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-16 05:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/pr/556' into v1.1

Browse Source
This commit is contained in:
Daniele Alessandri
2020-08-23 17:47:26 +02:00
parent 0a6306b73e 4363345f7c
commit 2a932d7292
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Client.php
+3 -1
View File
@@ -535,7 +535,9 @@ class Client implements ClientInterface, \IteratorAggregate
$connection = $this->getConnection();
if (!$connection instanceof \Traversable) {
throw new ClientException('The underlying connection is not traversable');
return new \ArrayIterator(array(
(string) $connection => new static($connection, $this->getOptions())
));
}
foreach ($connection as $node) {
tests/Predis/ClientTest.php
+7 -5
View File
@@ -853,15 +853,17 @@ class ClientTest extends PredisTestCase
/**
* @group disconnected
* @expectedException \Predis\ClientException
* @expectedExceptionMessage The underlying connection is not traversable
*/
public function testGetIteratorWithNonTraversableConnectionThrowsException()
public function testGetIteratorWithNonTraversableConnectionNoException()
{
$connection = $this->getMock('Predis\Connection\NodeConnectionInterface');
$connection = $this->getMockConnection('tcp://127.0.0.1:6381');
$client = new Client($connection);
$client->getIterator();
$iterator = $client->getIterator();
$this->assertInstanceOf('\Predis\Client', $nodeClient = $iterator->current());
$this->assertSame($connection, $nodeClient->getConnection());
$this->assertSame('127.0.0.1:6381', $iterator->key());
}
// ******************************************************************** //