Browse Source

Move the PipelineContext class in the Predis\Pipeline namespace.

Daniele Alessandri 13 years ago
parent
commit
e048ac2d51
3 changed files with 11 additions and 8 deletions
  1. 1 0
      lib/Predis/Client.php
  2. 4 3
      lib/Predis/Pipeline/PipelineContext.php
  3. 6 5
      test/ClientFeaturesTest.php

+ 1 - 0
lib/Predis/Client.php

@@ -7,6 +7,7 @@ use Predis\Network\IConnection;
 use Predis\Network\IConnectionSingle;
 use Predis\Profiles\IServerProfile;
 use Predis\Profiles\ServerProfile;
+use Predis\Pipeline\PipelineContext;
 
 class Client {
     const VERSION = '0.7.0-dev';

+ 4 - 3
lib/Predis/PipelineContext.php → lib/Predis/Pipeline/PipelineContext.php

@@ -1,16 +1,17 @@
 <?php
 
-namespace Predis;
+namespace Predis\Pipeline;
 
+use Predis\Client;
+use Predis\ClientException;
 use Predis\Commands\ICommand;
-use Predis\Pipeline\IPipelineExecutor;
 
 class PipelineContext {
     private $_client, $_pipelineBuffer, $_returnValues, $_running, $_executor;
 
     public function __construct(Client $client, IPipelineExecutor $executor = null) {
         $this->_client         = $client;
-        $this->_executor       = $executor ?: new Pipeline\StandardExecutor();
+        $this->_executor       = $executor ?: new StandardExecutor();
         $this->_pipelineBuffer = array();
         $this->_returnValues   = array();
     }

+ 6 - 5
test/ClientFeaturesTest.php

@@ -390,14 +390,15 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
         $client->flushdb();
 
         $pipe = $client->pipeline();
+        $pipelineClass = '\Predis\Pipeline\PipelineContext';
 
-        $this->assertInstanceOf('\Predis\PipelineContext', $pipe);
-        $this->assertInstanceOf('\Predis\PipelineContext', $pipe->set('foo', 'bar'));
-        $this->assertInstanceOf('\Predis\PipelineContext', $pipe->set('hoge', 'piyo'));
-        $this->assertInstanceOf('\Predis\PipelineContext', $pipe->mset(array(
+        $this->assertInstanceOf($pipelineClass, $pipe);
+        $this->assertInstanceOf($pipelineClass, $pipe->set('foo', 'bar'));
+        $this->assertInstanceOf($pipelineClass, $pipe->set('hoge', 'piyo'));
+        $this->assertInstanceOf($pipelineClass, $pipe->mset(array(
             'foofoo' => 'barbar', 'hogehoge' => 'piyopiyo'
         )));
-        $this->assertInstanceOf('\Predis\PipelineContext', $pipe->mget(array(
+        $this->assertInstanceOf($pipelineClass, $pipe->mget(array(
             'foo', 'hoge', 'foofoo', 'hogehoge'
         )));