geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-20 10:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pullreq_18'

Browse Source
This commit is contained in:
Daniele Alessandri
2011-01-06 00:27:45 +01:00
parent d04c6d2670 8a76c8c849
commit df268a1143
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis.php
+6 -4
View File
@@ -93,6 +93,9 @@ class Client {
}
$this->setConnection($cluster);
}
else if ($parameters instanceof IConnectionCluster) {
$this->setConnection($parameters);
}
else {
$this->setConnection($this->createConnection($parameters));
}
@@ -721,10 +724,6 @@ class CommandPipeline {
$this->_pipelineBuffer[] = $command;
}
private function getRecordedCommands() {
return $this->_pipelineBuffer;
}
public function flushPipeline() {
if (count($this->_pipelineBuffer) > 0) {
$connection = $this->_redisClient->getConnection();
@@ -1215,6 +1214,9 @@ interface IConnectionSingle extends IConnection {
public function writeBytes($buffer);
public function readBytes($length);
public function readLine();
public function getParameters();
public function pushInitCommand(ICommand $command);
public function __toString();
}
interface IConnectionCluster extends IConnection {
test/PredisClientFeatures.php
+6 -2
View File
@@ -408,8 +408,8 @@ class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
$params3 = new \Predis\ConnectionParameters($params1);
$params4 = new \Predis\TcpConnection($params3);
$client = new \Predis\Client(array($params1, $params2, $params3, $params4));
foreach ($client->getConnection() as $connection) {
$client1 = new \Predis\Client(array($params1, $params2, $params3, $params4));
foreach ($client1->getConnection() as $connection) {
$parameters = $connection->getParameters();
$this->assertEquals($params1['host'], $parameters->host);
$this->assertEquals($params1['port'], $parameters->port);
@@ -417,6 +417,10 @@ class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
$this->assertEquals($params1['read_write_timeout'], $parameters->read_write_timeout);
$this->assertNull($parameters->password);
}
$connectionCluster = $client1->getConnection();
$client2 = new \Predis\Client($connectionCluster);
$this->assertSame($connectionCluster, $client2->getConnection());
}