Browse Source

Rename connection to Predis\Connection\PhpiredisSocketConnection.

Daniele Alessandri 11 years ago
parent
commit
cebdf889a4

+ 4 - 0
CHANGELOG.md

@@ -51,6 +51,10 @@ v0.9.0 (201x-xx-xx)
   renamed to `writeRequest()` for consistency with its counterpart, the method
   `readResponse()`.
 
+- The connection based on ext-phpiredis and ext-socket has been renamed for the
+  sake of consistency to `Predis\Connection\PhpiredisSocketConnection`. The one
+  based on PHP's streams is still `Predis\Connection\PhpiredisStreamConnection`.
+
 - The connection factory has been simplified and does not need anymore a profile
   to create `AUTH` and `SELECT` commands when connection parameters contain both
   `password` and `database`. Raw commands will be used instead.

+ 2 - 2
README.md

@@ -183,8 +183,8 @@ is based on socket resources provided by `ext-socket`. Both support TCP/IP or UN
 ```php
 $client = new Predis\Client('tcp://127.0.0.1', [
     'connections' => [
-        'tcp'  => 'Predis\Connection\PhpiredisStreamConnection', // PHP streams
-        'unix' => 'Predis\Connection\PhpiredisConnection',       // ext-socket
+        'tcp'  => 'Predis\Connection\PhpiredisStreamConnection',  // PHP streams
+        'unix' => 'Predis\Connection\PhpiredisSocketConnection',  // ext-socket
     ],
 ]);
 ```

+ 1 - 1
lib/Predis/Connection/PhpiredisConnection.php → lib/Predis/Connection/PhpiredisSocketConnection.php

@@ -40,7 +40,7 @@ use Predis\Response;
  * @link http://github.com/nrk/phpiredis
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PhpiredisConnection extends AbstractConnection
+class PhpiredisSocketConnection extends AbstractConnection
 {
     private $reader;
 

+ 7 - 7
tests/Predis/Connection/PhpiredisConnectionTest.php → tests/Predis/Connection/PhpiredisSocketConnectionTest.php

@@ -14,14 +14,14 @@ namespace Predis\Connection;
 /**
  * @group ext-phpiredis
  */
-class PhpiredisConnectionTest extends PredisConnectionTestCase
+class PhpiredisSocketConnectionTest extends PredisConnectionTestCase
 {
     /**
      * @group disconnected
      */
     public function testConstructorDoesNotOpenConnection()
     {
-        $connection = new PhpiredisConnection($this->getParameters());
+        $connection = new PhpiredisSocketConnection($this->getParameters());
 
         $this->assertFalse($connection->isConnected());
     }
@@ -32,7 +32,7 @@ class PhpiredisConnectionTest extends PredisConnectionTestCase
     public function testExposesParameters()
     {
         $parameters = $this->getParameters();
-        $connection = new PhpiredisConnection($parameters);
+        $connection = new PhpiredisSocketConnection($parameters);
 
         $this->assertSame($parameters, $connection->getParameters());
     }
@@ -45,7 +45,7 @@ class PhpiredisConnectionTest extends PredisConnectionTestCase
     public function testThrowsExceptionOnInvalidScheme()
     {
         $parameters = $this->getParameters(array('scheme' => 'udp'));
-        $connection = new PhpiredisConnection($parameters);
+        $connection = new PhpiredisSocketConnection($parameters);
     }
 
     /**
@@ -54,11 +54,11 @@ class PhpiredisConnectionTest extends PredisConnectionTestCase
     public function testCanBeSerialized()
     {
         $parameters = $this->getParameters(array('alias' => 'redis', 'read_write_timeout' => 10));
-        $connection = new PhpiredisConnection($parameters);
+        $connection = new PhpiredisSocketConnection($parameters);
 
         $unserialized = unserialize(serialize($connection));
 
-        $this->assertInstanceOf('Predis\Connection\PhpiredisConnection', $unserialized);
+        $this->assertInstanceOf('Predis\Connection\PhpiredisSocketConnection', $unserialized);
         $this->assertEquals($parameters, $unserialized->getParameters());
     }
 
@@ -114,7 +114,7 @@ class PhpiredisConnectionTest extends PredisConnectionTestCase
         $parameters = $this->getParameters($parameters);
         $profile = $this->getProfile();
 
-        $connection = new PhpiredisConnection($parameters);
+        $connection = new PhpiredisSocketConnection($parameters);
 
         if ($initialize) {
             $connection->pushInitCommand($profile->createCommand('select', array($parameters->database)));