From 6abac4590d69a0bd672048ff8c031d91e16bdc80 Mon Sep 17 00:00:00 2001
From: Daniele Alessandri <suppakilla@gmail.com>
Date: Fri, 4 Mar 2011 17:00:23 +0100
Subject: [PATCH] Rename protocol interfaces.

---
 lib/Predis/Network/ComposableStreamConnection.php           | 6 +++---
 lib/Predis/Network/IConnectionComposable.php                | 4 ++--
 lib/Predis/Protocols/ComposableTextProtocol.php             | 2 +-
 .../{IRedisProtocol.php => IProtocolProcessor.php}          | 2 +-
 ...sProtocolExtended.php => IProtocolProcessorExtended.php} | 2 +-
 lib/Predis/Protocols/TextProtocol.php                       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/Predis/Protocols/{IRedisProtocol.php => IProtocolProcessor.php} (90%)
 rename lib/Predis/Protocols/{IRedisProtocolExtended.php => IProtocolProcessorExtended.php} (79%)

diff --git a/lib/Predis/Network/ComposableStreamConnection.php b/lib/Predis/Network/ComposableStreamConnection.php
index 3c9a019c..cf6a39f5 100644
--- a/lib/Predis/Network/ComposableStreamConnection.php
+++ b/lib/Predis/Network/ComposableStreamConnection.php
@@ -5,18 +5,18 @@ namespace Predis\Network;
 use Predis\ICommand;
 use Predis\ConnectionParameters;
 use Predis\CommunicationException;
-use Predis\Protocols\IRedisProtocol;
+use Predis\Protocols\IProtocolProcessor;
 use Predis\Protocols\TextProtocol;
 
 class ComposableStreamConnection extends StreamConnection implements IConnectionComposable {
     private $_protocol;
 
-    public function __construct(ConnectionParameters $parameters, IRedisProtocol $protocol = null) {
+    public function __construct(ConnectionParameters $parameters, IProtocolProcessor $protocol = null) {
         parent::__construct($parameters);
         $this->_protocol = $protocol ?: new TextProtocol();
     }
 
-    public function setProtocol(IRedisProtocol $protocol) {
+    public function setProtocol(IProtocolProcessor $protocol) {
         if ($protocol === null) {
             throw new \InvalidArgumentException("The protocol instance cannot be a null value");
         }
diff --git a/lib/Predis/Network/IConnectionComposable.php b/lib/Predis/Network/IConnectionComposable.php
index a9284079..6af5816f 100644
--- a/lib/Predis/Network/IConnectionComposable.php
+++ b/lib/Predis/Network/IConnectionComposable.php
@@ -2,10 +2,10 @@
 
 namespace Predis\Network;
 
-use Predis\Protocols\IRedisProtocol;
+use Predis\Protocols\IProtocolProcessor;
 
 interface IConnectionComposable extends IConnectionSingle {
-    public function setProtocol(IRedisProtocol $protocol);
+    public function setProtocol(IProtocolProcessor $protocol);
     public function getProtocol();
     public function writeBytes($buffer);
     public function readBytes($length);
diff --git a/lib/Predis/Protocols/ComposableTextProtocol.php b/lib/Predis/Protocols/ComposableTextProtocol.php
index 076a48c1..88ee5a89 100644
--- a/lib/Predis/Protocols/ComposableTextProtocol.php
+++ b/lib/Predis/Protocols/ComposableTextProtocol.php
@@ -5,7 +5,7 @@ namespace Predis\Protocols;
 use Predis\ICommand;
 use Predis\Network\IConnectionComposable;
 
-class ComposableTextProtocol implements IRedisProtocolExtended {
+class ComposableTextProtocol implements IProtocolProcessorExtended {
     private $_serializer, $_reader;
 
     public function __construct(Array $options = array()) {
diff --git a/lib/Predis/Protocols/IRedisProtocol.php b/lib/Predis/Protocols/IProtocolProcessor.php
similarity index 90%
rename from lib/Predis/Protocols/IRedisProtocol.php
rename to lib/Predis/Protocols/IProtocolProcessor.php
index b05091df..e69ebafb 100644
--- a/lib/Predis/Protocols/IRedisProtocol.php
+++ b/lib/Predis/Protocols/IProtocolProcessor.php
@@ -5,7 +5,7 @@ namespace Predis\Protocols;
 use Predis\ICommand;
 use Predis\Network\IConnectionComposable;
 
-interface IRedisProtocol {
+interface IProtocolProcessor {
     public function write(IConnectionComposable $connection, ICommand $command);
     public function read(IConnectionComposable $connection);
     public function setOption($option, $value);
diff --git a/lib/Predis/Protocols/IRedisProtocolExtended.php b/lib/Predis/Protocols/IProtocolProcessorExtended.php
similarity index 79%
rename from lib/Predis/Protocols/IRedisProtocolExtended.php
rename to lib/Predis/Protocols/IProtocolProcessorExtended.php
index 278765a2..19539ff8 100644
--- a/lib/Predis/Protocols/IRedisProtocolExtended.php
+++ b/lib/Predis/Protocols/IProtocolProcessorExtended.php
@@ -4,7 +4,7 @@ namespace Predis\Protocols;
 
 use Predis\ICommand;
 
-interface IRedisProtocolExtended extends IRedisProtocol {
+interface IProtocolProcessorExtended extends IProtocolProcessor {
     public function setSerializer(ICommandSerializer $serializer);
     public function getSerializer();
     public function setReader(IResponseReader $reader);
diff --git a/lib/Predis/Protocols/TextProtocol.php b/lib/Predis/Protocols/TextProtocol.php
index b1980ac6..2e723b42 100644
--- a/lib/Predis/Protocols/TextProtocol.php
+++ b/lib/Predis/Protocols/TextProtocol.php
@@ -10,7 +10,7 @@ use Predis\CommunicationException;
 use Predis\Network\IConnectionComposable;
 use Predis\Iterators\MultiBulkResponseSimple;
 
-class TextProtocol implements IRedisProtocol {
+class TextProtocol implements IProtocolProcessor {
     const NEWLINE = "\r\n";
     const OK      = 'OK';
     const ERROR   = 'ERR';