Complete reorganization of the Predis\Connection namespace.

* Renamed SingleConnectionInterface to NodeConnectionInterface since
  this name is better and makes even more sense in the context of
  cluster and replication scenarios.

* Moved specialized aggregate connections (the ones implementing both
  predis and redis cluster and master/slave replication) in a newly
  created Predis\Connection\Aggregate sub-namespace.

* Removed the "Connection" part from names of aggregate connection
  interfaces in the Predis\Connection\Aggregate sub-namespace.

* Changed "Composable" to "Composite" in the name of interfaces and
  classes that can use pluggable protocol processors.
This commit is contained in:
Daniele Alessandri
2014-06-03 11:59:41 +02:00
parent ff2e0823ec
commit abd284c972
70 changed files with 320 additions and 304 deletions
+7 -7
View File
@@ -28,7 +28,7 @@ class MultiExecTest extends PredisTestCase
*/
public function testThrowsExceptionOnUnsupportedMultiExecInProfile()
{
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$connection = $this->getMock('Predis\Connection\NodeConnectionInterface');
$client = new Client($connection, array('profile' => '1.2'));
$tx = new MultiExec($client);
}
@@ -40,7 +40,7 @@ class MultiExecTest extends PredisTestCase
*/
public function testThrowsExceptionOnUnsupportedWatchInProfile()
{
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$connection = $this->getMock('Predis\Connection\NodeConnectionInterface');
$client = new Client($connection, array('profile' => '2.0'));
$tx = new MultiExec($client, array('options' => 'cas'));
@@ -54,7 +54,7 @@ class MultiExecTest extends PredisTestCase
*/
public function testThrowsExceptionOnUnsupportedUnwatchInProfile()
{
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$connection = $this->getMock('Predis\Connection\NodeConnectionInterface');
$client = new Client($connection, array('profile' => '2.0'));
$tx = new MultiExec($client, array('options' => 'cas'));
@@ -727,15 +727,15 @@ class MultiExecTest extends PredisTestCase
// ******************************************************************** //
/**
* Returns a mocked instance of Predis\Connection\SingleConnectionInterface
* Returns a mocked instance of Predis\Connection\NodeConnectionInterface
* using the specified callback to return values from executeCommand().
*
* @param \Closure $executeCallback
* @return \Predis\Connection\SingleConnectionInterface
* @param \Closure $executeCallback
* @return \Predis\Connection\NodeConnectionInterface
*/
protected function getMockedConnection($executeCallback)
{
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$connection = $this->getMock('Predis\Connection\NodeConnectionInterface');
$connection->expects($this->any())
->method('executeCommand')
->will($this->returnCallback($executeCallback));