Rename Predis\Connection\ConnectionParameters.

lib/Predis/Client.php

@@ -17,9 +17,9 @@ use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
 use Predis\Command\ScriptCommand;
 use Predis\Configuration;
+use Predis\Connection;
 use Predis\Connection\AggregatedConnectionInterface;
 use Predis\Connection\ConnectionInterface;
-use Predis\Connection\ConnectionParametersInterface;
 use Predis\Monitor;
 use Predis\Pipeline;
 use Predis\PubSub;
@@ -83,7 +83,7 @@ class Client implements ClientInterface
      * Accepted types for connection parameters are:
      *
      *  - Instance of Predis\Connection\ConnectionInterface.
-     *  - Instance of Predis\Connection\ConnectionParametersInterface.
+     *  - Instance of Predis\Connection\ParametersInterface.
      *  - Array
      *  - String
      *  - Callable
@@ -97,7 +97,7 @@ class Client implements ClientInterface
             return $parameters;
         }
 
-        if ($parameters instanceof ConnectionParametersInterface || is_string($parameters)) {
+        if ($parameters instanceof Connection\ParametersInterface || is_string($parameters)) {
             return $this->options->connections->create($parameters);
         }
 

lib/Predis/Connection/AbstractConnection.php

@@ -33,9 +33,9 @@ abstract class AbstractConnection implements SingleConnectionInterface
     protected $initCmds = array();
 
     /**
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      */
-    public function __construct(ConnectionParametersInterface $parameters)
+    public function __construct(ParametersInterface $parameters)
     {
         $this->parameters = $this->assertParameters($parameters);
     }
@@ -52,9 +52,9 @@ abstract class AbstractConnection implements SingleConnectionInterface
     /**
      * Checks some of the parameters used to initialize the connection.
      *
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      */
-    protected function assertParameters(ConnectionParametersInterface $parameters)
+    protected function assertParameters(ParametersInterface $parameters)
     {
         $scheme = $parameters->scheme;
 

lib/Predis/Connection/ComposableStreamConnection.php

@@ -26,11 +26,11 @@ class ComposableStreamConnection extends StreamConnection implements ComposableC
     protected $protocol;
 
     /**
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      * @param ProtocolProcessorInterface $protocol Protocol processor.
      */
     public function __construct(
-        ConnectionParametersInterface $parameters,
+        ParametersInterface $parameters,
         ProtocolProcessorInterface $protocol = null
     ) {
         $this->parameters = $this->assertParameters($parameters);

lib/Predis/Connection/Factory.php

@@ -74,8 +74,8 @@ class Factory implements FactoryInterface
      */
     public function create($parameters)
     {
-        if (!$parameters instanceof ConnectionParametersInterface) {
-            $parameters = ConnectionParameters::create($parameters);
+        if (!$parameters instanceof ParametersInterface) {
+            $parameters = Parameters::create($parameters);
         }
 
         $scheme = $parameters->scheme;

lib/Predis/Connection/ConnectionParameters.php → lib/Predis/Connection/Parameters.php

@@ -18,7 +18,7 @@ use InvalidArgumentException;
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ConnectionParameters implements ConnectionParametersInterface
+class Parameters implements ParametersInterface
 {
     private $parameters;
 
@@ -70,7 +70,7 @@ class ConnectionParameters implements ConnectionParametersInterface
      * form of an URI string or a named array.
      *
      * @param array|string $parameters Set of connection parameters.
-     * @return ConnectionParameters
+     * @return Parameters
      */
     public static function create($parameters)
     {

lib/Predis/Connection/ConnectionParametersInterface.php → lib/Predis/Connection/ParametersInterface.php

@@ -12,12 +12,11 @@
 namespace Predis\Connection;
 
 /**
- * Interface that must be implemented by classes that provide their own mechanism
- * to parse and handle connection parameters.
+ * Interface for classes providing their own logic for connection parameters.
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-interface ConnectionParametersInterface
+interface ParametersInterface
 {
     /**
      * Checks if the specified parameters is set.

lib/Predis/Connection/PhpiredisSocketConnection.php

@@ -48,7 +48,7 @@ class PhpiredisSocketConnection extends AbstractConnection
     /**
      * {@inheritdoc}
      */
-    public function __construct(ConnectionParametersInterface $parameters)
+    public function __construct(ParametersInterface $parameters)
     {
         $this->assertExtensions();
 
@@ -89,7 +89,7 @@ class PhpiredisSocketConnection extends AbstractConnection
     /**
      * {@inheritdoc}
      */
-    protected function assertParameters(ConnectionParametersInterface $parameters)
+    protected function assertParameters(ParametersInterface $parameters)
     {
         if (isset($parameters->persistent)) {
             throw new NotSupportedException(
@@ -186,9 +186,9 @@ class PhpiredisSocketConnection extends AbstractConnection
      * Sets options on the socket resource from the connection parameters.
      *
      * @param resource $socket Socket resource.
-     * @param ConnectionParametersInterface $parameters Parameters used to initialize the connection.
+     * @param ParametersInterface $parameters Parameters used to initialize the connection.
      */
-    private function setSocketOptions($socket, ConnectionParametersInterface $parameters)
+    private function setSocketOptions($socket, ParametersInterface $parameters)
     {
         if ($parameters->scheme !== 'tcp') {
             return;
@@ -225,10 +225,10 @@ class PhpiredisSocketConnection extends AbstractConnection
     /**
      * Gets the address from the connection parameters.
      *
-     * @param ConnectionParametersInterface $parameters Parameters used to initialize the connection.
+     * @param ParametersInterface $parameters Parameters used to initialize the connection.
      * @return string
      */
-    private static function getAddress(ConnectionParametersInterface $parameters)
+    private static function getAddress(ParametersInterface $parameters)
     {
         if ($parameters->scheme === 'unix') {
             return $parameters->path;
@@ -250,10 +250,10 @@ class PhpiredisSocketConnection extends AbstractConnection
     /**
      * Opens the actual connection to the server with a timeout.
      *
-     * @param ConnectionParametersInterface $parameters Parameters used to initialize the connection.
+     * @param ParametersInterface $parameters Parameters used to initialize the connection.
      * @return string
      */
-    private function connectWithTimeout(ConnectionParametersInterface $parameters)
+    private function connectWithTimeout(ParametersInterface $parameters)
     {
         $host = self::getAddress($parameters);
         $socket = $this->getResource();

lib/Predis/Connection/PhpiredisStreamConnection.php

@@ -51,7 +51,7 @@ class PhpiredisStreamConnection extends StreamConnection
     /**
      * {@inheritdoc}
      */
-    public function __construct(ConnectionParametersInterface $parameters)
+    public function __construct(ParametersInterface $parameters)
     {
         $this->assertExtensions();
 

lib/Predis/Connection/SingleConnectionInterface.php

@@ -37,7 +37,7 @@ interface SingleConnectionInterface extends ConnectionInterface
     /**
      * Returns the parameters used to initialize the connection.
      *
-     * @return ConnectionParametersInterface
+     * @return ParametersInterface
      */
     public function getParameters();
 

lib/Predis/Connection/StreamConnection.php

@@ -60,10 +60,10 @@ class StreamConnection extends AbstractConnection
     /**
      * Initializes a TCP stream resource.
      *
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      * @return resource
      */
-    private function tcpStreamInitializer(ConnectionParametersInterface $parameters)
+    private function tcpStreamInitializer(ParametersInterface $parameters)
     {
         $uri = "tcp://{$parameters->host}:{$parameters->port}";
         $flags = STREAM_CLIENT_CONNECT;
@@ -102,10 +102,10 @@ class StreamConnection extends AbstractConnection
     /**
      * Initializes a UNIX stream resource.
      *
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      * @return resource
      */
-    private function unixStreamInitializer(ConnectionParametersInterface $parameters)
+    private function unixStreamInitializer(ParametersInterface $parameters)
     {
         $uri = "unix://{$parameters->path}";
         $flags = STREAM_CLIENT_CONNECT;

lib/Predis/Connection/WebdisConnection.php

@@ -50,9 +50,9 @@ class WebdisConnection implements SingleConnectionInterface
     private $reader;
 
     /**
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      */
-    public function __construct(ConnectionParametersInterface $parameters)
+    public function __construct(ParametersInterface $parameters)
     {
         $this->assertExtensions();
 
@@ -105,10 +105,10 @@ class WebdisConnection implements SingleConnectionInterface
     /**
      * Initializes cURL.
      *
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      * @return resource
      */
-    private function createCurl(ConnectionParametersInterface $parameters)
+    private function createCurl(ParametersInterface $parameters)
     {
         $options = array(
             CURLOPT_FAILONERROR => true,
@@ -131,10 +131,10 @@ class WebdisConnection implements SingleConnectionInterface
     /**
      * Initializes the phpiredis protocol reader.
      *
-     * @param ConnectionParametersInterface $parameters Initialization parameters for the connection.
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
      * @return resource
      */
-    private function createReader(ConnectionParametersInterface $parameters)
+    private function createReader(ParametersInterface $parameters)
     {
         $reader = phpiredis_reader_create();
 

tests/PHPUnit/PredisTestCase.php

@@ -106,12 +106,12 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
      * Returns a new instance of connection parameters.
      *
      * @param array $additional Additional connection parameters.
-     * @return Connection\ConnectionParameters Default connection parameters.
+     * @return Connection\Parameters Default connection parameters.
      */
     protected function getParameters($additional = array())
     {
         $parameters = array_merge($this->getDefaultParametersArray(), $additional);
-        $parameters = new Connection\ConnectionParameters($parameters);
+        $parameters = new Connection\Parameters($parameters);
 
         return $parameters;
     }

tests/Predis/CommunicationExceptionTest.php

@@ -12,7 +12,7 @@
 namespace Predis;
 
 use PredisTestCase;
-use Predis\Connection\SingleConnectionInterface;
+use Predis\Connection;
 
 /**
  *
@@ -79,7 +79,7 @@ class CommunicationExceptionTest extends PredisTestCase
      * Returns a mocked connection instance.
      *
      * @param mixed $parameters Connection parameters.
-     * @return SingleConnectionInterface
+     * @return Connection\SingleConnectionInterface
      */
     protected function getMockedConnectionBase($parameters = null)
     {
@@ -87,8 +87,8 @@ class CommunicationExceptionTest extends PredisTestCase
 
         if ($parameters === null) {
             $builder->disableOriginalConstructor();
-        } else if (!$parameters instanceof ConnectionParametersInterface) {
-            $parameters = new ConnectionParameters($parameters);
+        } else if (!$parameters instanceof Connection\ParametersInterface) {
+            $parameters = new Connection\Parameters($parameters);
         }
 
         return $builder->getMockForAbstractClass(array($parameters));
@@ -97,14 +97,18 @@ class CommunicationExceptionTest extends PredisTestCase
     /**
      * Returns a connection exception instance.
      *
-     * @param SingleConnectionInterface $message Connection instance.
+     * @param Connection\SingleConnectionInterface $message Connection instance.
      * @param string $message Exception message.
      * @param int $code Exception code.
      * @param \Exception $inner Inner exception.
      * @return \Exception
      */
-    protected function getException(SingleConnectionInterface $connection, $message, $code = 0, \Exception $inner = null)
-    {
+    protected function getException(
+        Connection\SingleConnectionInterface $connection,
+        $message,
+        $code = 0,
+        \Exception $inner = null
+    ) {
         $arguments = array($connection, $message, $code, $inner);
         $mock = $this->getMockForAbstractClass('Predis\CommunicationException', $arguments);
 

tests/Predis/Connection/FactoryTest.php

@@ -35,7 +35,7 @@ class FactoryTest extends PredisTestCase
     {
         $factory = new Factory();
 
-        $tcp = new ConnectionParameters(array(
+        $tcp = new Parameters(array(
             'scheme' => 'tcp',
             'host' => 'locahost',
         ));
@@ -48,7 +48,7 @@ class FactoryTest extends PredisTestCase
         $this->assertEquals($tcp->database, $parameters->database);
 
 
-        $unix = new ConnectionParameters(array(
+        $unix = new Parameters(array(
             'scheme' => 'unix',
             'path' => '/tmp/redis.sock',
         ));
@@ -117,7 +117,7 @@ class FactoryTest extends PredisTestCase
         $profile->expects($this->never())->method('create');
 
         $factory = new Factory($profile);
-        $parameters = new ConnectionParameters();
+        $parameters = new Parameters();
         $connection = $factory->create($parameters);
 
         $this->assertInstanceOf('Predis\Connection\SingleConnectionInterface', $connection);
@@ -129,7 +129,7 @@ class FactoryTest extends PredisTestCase
      */
     public function testCreateConnectionWithInitializationCommands()
     {
-        $parameters = new ConnectionParameters(array(
+        $parameters = new Parameters(array(
             'database' => '0',
             'password' => 'foobar'
         ));
@@ -162,7 +162,7 @@ class FactoryTest extends PredisTestCase
         $this->setExpectedException('InvalidArgumentException', "Unknown connection scheme: $scheme");
 
         $factory = new Factory();
-        $factory->create(new ConnectionParameters(array('scheme' => $scheme)));
+        $factory->create(new Parameters(array('scheme' => $scheme)));
     }
 
     /**
@@ -172,7 +172,7 @@ class FactoryTest extends PredisTestCase
     {
         list(, $connectionClass) = $this->getMockConnectionClass();
 
-        $parameters = new ConnectionParameters(array('scheme' => 'foobar'));
+        $parameters = new Parameters(array('scheme' => 'foobar'));
         $factory = new Factory();
 
         $factory->define($parameters->scheme, $connectionClass);
@@ -188,7 +188,7 @@ class FactoryTest extends PredisTestCase
     {
         list(, $connectionClass) = $this->getMockConnectionClass();
 
-        $parameters = new ConnectionParameters(array('scheme' => 'foobar'));
+        $parameters = new Parameters(array('scheme' => 'foobar'));
 
         $initializer = function ($parameters) use ($connectionClass) {
             return new $connectionClass($parameters);

tests/Predis/Connection/MasterSlaveReplicationTest.php

@@ -576,7 +576,7 @@ class MasterSlaveReplicationTest extends PredisTestCase
         $connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
 
         if ($parameters) {
-            $parameters = ConnectionParameters::create($parameters);
+            $parameters = Parameters::create($parameters);
             $hash = "{$parameters->host}:{$parameters->port}";
 
             $connection->expects($this->any())

tests/Predis/Connection/ConnectionParametersTest.php → tests/Predis/Connection/ParametersTest.php

@@ -14,10 +14,10 @@ namespace Predis\Connection;
 use PredisTestCase;
 
 /**
- * @todo ConnectionParameters::define();
- * @todo ConnectionParameters::undefine();
+ * @todo Parameters::define();
+ * @todo Parameters::undefine();
  */
-class ConnectionParametersTest extends PredisTestCase
+class ParametersTest extends PredisTestCase
 {
     /**
      * @group disconnected
@@ -25,7 +25,7 @@ class ConnectionParametersTest extends PredisTestCase
     public function testDefaultValues()
     {
         $defaults = $this->getDefaultParametersArray();
-        $parameters = new ConnectionParameters();
+        $parameters = new Parameters();
 
         $this->assertEquals($defaults['scheme'], $parameters->scheme);
         $this->assertEquals($defaults['host'], $parameters->host);
@@ -38,13 +38,13 @@ class ConnectionParametersTest extends PredisTestCase
      */
     public function testIsSet()
     {
-        $parameters = new ConnectionParameters();
+        $parameters = new Parameters();
 
         $this->assertTrue(isset($parameters->scheme));
         $this->assertFalse(isset($parameters->unknown));
     }
 
-    public function sharedTestsWithArrayParameters(ConnectionParameters $parameters)
+    public function sharedTestsWithArrayParameters(Parameters $parameters)
     {
         $this->assertTrue(isset($parameters->scheme));
         $this->assertSame('tcp', $parameters->scheme);
@@ -64,7 +64,7 @@ class ConnectionParametersTest extends PredisTestCase
      */
     public function testConstructWithArrayParameters()
     {
-        $parameters = new ConnectionParameters(array(
+        $parameters = new Parameters(array(
             'port' => 7000,
             'custom' => 'foobar'
         ));
@@ -77,7 +77,7 @@ class ConnectionParametersTest extends PredisTestCase
      */
     public function testCreateWithArrayParameters()
     {
-        $parameters = new ConnectionParameters(array(
+        $parameters = new Parameters(array(
             'port' => 7000,
             'custom' => 'foobar'
         ));
@@ -99,7 +99,7 @@ class ConnectionParametersTest extends PredisTestCase
         );
 
         $uriString = $this->getParametersString($overrides);
-        $parameters = ConnectionParameters::create($uriString);
+        $parameters = Parameters::create($uriString);
 
         $this->sharedTestsWithArrayParameters($parameters);
         $this->assertEquals($overrides['database'], $parameters->database);
@@ -111,7 +111,7 @@ class ConnectionParametersTest extends PredisTestCase
     public function testToArray()
     {
         $additional = array('port' => 7000, 'custom' => 'foobar');
-        $parameters = new ConnectionParameters($additional);
+        $parameters = new Parameters($additional);
 
         $this->assertEquals($this->getParametersArray($additional), $parameters->toArray());
     }
@@ -121,7 +121,7 @@ class ConnectionParametersTest extends PredisTestCase
      */
     public function testSerialization()
     {
-        $parameters = new ConnectionParameters(array('port' => 7000, 'custom' => 'foobar'));
+        $parameters = new Parameters(array('port' => 7000, 'custom' => 'foobar'));
         $unserialized = unserialize(serialize($parameters));
 
         $this->assertEquals($parameters->scheme, $unserialized->scheme);
@@ -149,7 +149,7 @@ class ConnectionParametersTest extends PredisTestCase
             'persistent' => '1',
         );
 
-        $this->assertSame($expected, ConnectionParameters::parse($uri));
+        $this->assertSame($expected, Parameters::parse($uri));
     }
 
     /**
@@ -167,7 +167,7 @@ class ConnectionParametersTest extends PredisTestCase
             'persistent' => '1',
         );
 
-        $this->assertSame($expected, ConnectionParameters::parse($uri));
+        $this->assertSame($expected, Parameters::parse($uri));
     }
 
     /**
@@ -185,7 +185,7 @@ class ConnectionParametersTest extends PredisTestCase
             'bar' => '',
         );
 
-        $this->assertSame($expected, ConnectionParameters::parse($uri));
+        $this->assertSame($expected, Parameters::parse($uri));
     }
 
     /**
@@ -202,7 +202,7 @@ class ConnectionParametersTest extends PredisTestCase
             'persistent' => '1',
         );
 
-        $this->assertSame($expected, ConnectionParameters::parse($uri));
+        $this->assertSame($expected, Parameters::parse($uri));
     }
 
     /**
@@ -219,7 +219,7 @@ class ConnectionParametersTest extends PredisTestCase
             'metavars' => array('foo', 'hoge'),
         );
 
-        $this->assertSame($expected, ConnectionParameters::parse($uri));
+        $this->assertSame($expected, Parameters::parse($uri));
     }
 
     /**
@@ -229,7 +229,7 @@ class ConnectionParametersTest extends PredisTestCase
      */
     public function testParsingURIThrowOnInvalidURI()
     {
-        ConnectionParameters::parse('tcp://invalid:uri');
+        Parameters::parse('tcp://invalid:uri');
     }
 
     // ******************************************************************** //

tests/Predis/Connection/PredisClusterTest.php

@@ -388,7 +388,7 @@ class PredisClusterTest extends PredisTestCase
         $connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
 
         if ($parameters) {
-            $parameters = ConnectionParameters::create($parameters);
+            $parameters = Parameters::create($parameters);
             $hash = "{$parameters->host}:{$parameters->port}";
 
             $connection->expects($this->any())

tests/Predis/Connection/RedisClusterTest.php

@@ -652,7 +652,7 @@ class RedisClusterTest extends PredisTestCase
         $connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
 
         if ($parameters) {
-            $parameters = ConnectionParameters::create($parameters);
+            $parameters = Parameters::create($parameters);
             $hash = "{$parameters->host}:{$parameters->port}";
 
             $connection->expects($this->any())

tests/Predis/Response/Iterator/MultiBulkTest.php

@@ -14,7 +14,6 @@ namespace Predis\Response\Iterator;
 use PredisTestCase;
 use Predis\Client;
 use Predis\Connection\ComposableStreamConnection;
-use Predis\Connection\ConnectionParameters;
 use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
 
 /**

tests/Predis/Response/Iterator/MultiBulkTupleTest.php

@@ -14,7 +14,6 @@ namespace Predis\Response\Iterator;
 use PredisTestCase;
 use Predis\Client;
 use Predis\Connection\ComposableStreamConnection;
-use Predis\Connection\ConnectionParameters;
 use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
 
 /**