From e048ac2d518726f6730b9e6842c9b1d409f179bd Mon Sep 17 00:00:00 2001
From: Daniele Alessandri <suppakilla@gmail.com>
Date: Thu, 2 Jun 2011 16:03:33 +0200
Subject: [PATCH] Move the PipelineContext class in the Predis\Pipeline
 namespace.

---
 lib/Predis/Client.php                         |  1 +
 lib/Predis/{ => Pipeline}/PipelineContext.php |  7 ++++---
 test/ClientFeaturesTest.php                   | 11 ++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename lib/Predis/{ => Pipeline}/PipelineContext.php (93%)

diff --git a/lib/Predis/Client.php b/lib/Predis/Client.php
index 77e0af0f..12f73333 100644
--- a/lib/Predis/Client.php
+++ b/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';
diff --git a/lib/Predis/PipelineContext.php b/lib/Predis/Pipeline/PipelineContext.php
similarity index 93%
rename from lib/Predis/PipelineContext.php
rename to lib/Predis/Pipeline/PipelineContext.php
index 28f240b3..c263ccff 100644
--- a/lib/Predis/PipelineContext.php
+++ b/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();
     }
diff --git a/test/ClientFeaturesTest.php b/test/ClientFeaturesTest.php
index de24e3d5..2c9378c7 100644
--- a/test/ClientFeaturesTest.php
+++ b/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'
         )));