Merge pull request #341 from namoscato/drivers-redis

Move Redis drivers to new namespace
bernardphp · Feb 11, 2018 · 3f42ede · 3f42ede
2 parents ce2bdcf + 1f4ef28
commit 3f42ede
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/doc/drivers.rst b/doc/drivers.rst
@@ -389,13 +389,13 @@ your ``composer.json`` file, to make sure it is installed:
 
     <?php
 
-    use Bernard\Driver\PhpRedisDriver;
+    use Bernard\Driver\PhpRedis\Driver;
 
     $redis = new Redis();
     $redis->connect('127.0.0.1', 6379);
     $redis->setOption(Redis::OPT_PREFIX, 'bernard:');
 
-    $driver = new PhpRedisDriver($redis);
+    $driver = new Driver($redis);
 
 Predis
 ------
@@ -415,14 +415,14 @@ Requires the installation of predis. Add the following to your
 
     <?php
 
-    use Bernard\Driver\PredisDriver;
+    use Bernard\Driver\Predis\Driver;
     use Predis\Client;
 
     $predis = new Client('tcp://localhost', array(
         'prefix' => 'bernard:',
     ));
 
-    $driver = new PredisDriver($predis);
+    $driver = new Driver($predis);
 
 Amazon SQS
 ----------

diff --git a/example/phpredis.php b/example/phpredis.php
@@ -1,6 +1,6 @@
 <?php
 
-use Bernard\Driver\PhpRedisDriver;
+use Bernard\Driver\PhpRedis\Driver;
 
 /**
  * Must be defined before including bootstrap.php
@@ -11,7 +11,7 @@ function get_driver() {
     $redis->connect('localhost');
     $redis->setOption(Redis::OPT_PREFIX, 'bernard:');
 
-    return new PhpRedisDriver($redis);
+    return new Driver($redis);
 }
 
 require 'bootstrap.php';
diff --git a/example/predis.php b/example/predis.php
@@ -1,14 +1,14 @@
 <?php
 
 use Predis\Client;
-use Bernard\Driver\PredisDriver;
+use Bernard\Driver\Predis\Driver;
 
 /**
  * Must be defined before including bootstrap.php
  * as this is the only custom part in the example.
  */
 function get_driver() {
-    return new PredisDriver(new Client(null, array(
+    return new Driver(new Client(null, array(
         'prefix' => 'bernard:',
     )));
 }

diff --git a/src/Driver/PhpRedisDriver.php → src/Driver/PhpRedis/Driver.php b/src/Driver/PhpRedisDriver.php → src/Driver/PhpRedis/Driver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bernard\Driver;
+namespace Bernard\Driver\PhpRedis;
 
 use Redis;
 
@@ -9,7 +9,7 @@
  *
  * @package Bernard
  */
-class PhpRedisDriver implements \Bernard\Driver
+class Driver implements \Bernard\Driver
 {
     protected $redis;
 

diff --git a/src/Driver/PredisDriver.php → src/Driver/Predis/Driver.php b/src/Driver/PredisDriver.php → src/Driver/Predis/Driver.php
@@ -1,16 +1,14 @@
 <?php
 
-namespace Bernard\Driver;
+namespace Bernard\Driver\Predis;
 
 use Predis\ClientInterface;
 
 /**
  * @package Bernard
  */
-class PredisDriver extends PhpRedisDriver
+final class Driver extends \Bernard\Driver\PhpRedis\Driver
 {
-    protected $redis;
-
     /**
      * @param ClientInterface $redis
      */

diff --git a/tests/Driver/PhpRedisDriverTest.php → tests/Driver/PhpRedis/DriverTest.php b/tests/Driver/PhpRedisDriverTest.php → tests/Driver/PhpRedis/DriverTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bernard\Tests\Driver;
+namespace Bernard\Tests\Driver\PhpRedis;
 
-use Bernard\Driver\PhpRedisDriver;
+use Bernard\Driver\PhpRedis\Driver;
 
-class PhpRedisDriverTest extends \PHPUnit\Framework\TestCase
+class DriverTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {
@@ -25,12 +25,12 @@ public function setUp()
             'sRem',
         ))->getMock();
 
-        $this->connection = new PhpRedisDriver($this->redis);
+        $this->connection = new Driver($this->redis);
     }
 
     public function testItImplementsDriverInterface()
     {
-        $this->assertInstanceOf('Bernard\Driver', $this->connection);
+        $this->assertInstanceOf(\Bernard\Driver::class, $this->connection);
     }
 
     public function testItCountsNumberOfMessagesInQueue()

diff --git a/tests/Driver/PredisDriverTest.php → tests/Driver/Predis/DriverTest.php b/tests/Driver/PredisDriverTest.php → tests/Driver/Predis/DriverTest.php
@@ -1,16 +1,17 @@
 <?php
 
-namespace Bernard\Tests\Driver;
+namespace Bernard\Tests\Driver\Predis;
 
-use Bernard\Driver\PredisDriver;
+use Bernard\Driver\Predis\Driver;
+use Predis\Client;
 
-class PredisDriverTest extends PhpRedisDriverTest
+class DriverTest extends \Bernard\Tests\Driver\PhpRedis\DriverTest
 {
     public function setUp()
     {
         // Because predis uses __call all methods that needs mocking must be
         // explicitly defined.
-        $this->redis = $this->getMockBuilder('Predis\Client')->setMethods(array(
+        $this->redis = $this->getMockBuilder(Client::class)->setMethods(array(
             'lLen',
             'sMembers',
             'lRange',
@@ -23,7 +24,7 @@ public function setUp()
             'sRem',
         ))->getMock();
 
-        $this->connection = new PredisDriver($this->redis);
+        $this->connection = new Driver($this->redis);
     }
 
     public function testItPopMessages()