ICM: Laravel 5.2 support.

Author: dmitry-ivanov

src/Mutex.php

@@ -8,10 +8,8 @@
 use NinjaMutex\Lock\FlockLock;
 use NinjaMutex\Lock\MemcachedLock;
 use NinjaMutex\Lock\MySqlLock;
-use NinjaMutex\Lock\PhpRedisLock;
 use NinjaMutex\Lock\PredisRedisLock;
 use NinjaMutex\Mutex as Ninja;
-use Predis\Client as PredisClient;
 
 class Mutex
 {
@@ -42,7 +40,7 @@ public function getStrategy()
                 );
 
             case 'redis':
-                return $this->getRedisLock(config('database.redis.client', 'predis'));
+                return $this->getRedisLock();
 
             case 'memcached':
                 return new MemcachedLock(Cache::getStore()->getMemcached());
@@ -53,28 +51,14 @@ public function getStrategy()
         }
     }
 
-    private function getRedisLock($client)
+    private function getRedisLock()
     {
-        if ($client === 'phpredis') {
-            return new PhpRedisLock($this->getPhpRedisClient());
-        }
-
         return new PredisRedisLock($this->getPredisClient());
     }
 
-    public function getPhpRedisClient()
-    {
-        return RedisFacade::connection()->client();
-    }
-
     public function getPredisClient()
     {
-        $connection = RedisFacade::connection();
-
-        /* @laravel-versions */
-        $predisClient = ($connection instanceof PredisClient) ? $connection : $connection->client();
-
-        return $predisClient;
+        return RedisFacade::connection();
     }
 
     public function __call($method, $parameters)

tests/ConsoleMutex/MutexTest.php

@@ -3,17 +3,14 @@
 namespace Illuminated\Console\ConsoleMutex\Tests;
 
 use GenericCommand;
-use Illuminate\Redis\Connectors\PhpRedisConnector;
 use Illuminate\Support\Facades\Cache;
 use Illuminated\Console\Mutex;
 use Mockery;
 use NinjaMutex\Lock\FlockLock;
 use NinjaMutex\Lock\MemcachedLock;
 use NinjaMutex\Lock\MySqlLock;
-use NinjaMutex\Lock\PhpRedisLock;
 use NinjaMutex\Lock\PredisRedisLock;
 use Predis\Client as PredisClient;
-use Redis;
 
 class MutexTest extends TestCase
 {
@@ -76,44 +73,13 @@ public function it_supports_redis_strategy_with_predis_client_which_is_default()
         $this->assertEquals($expectedStrategy, $mutex->getStrategy());
     }
 
-    /** @test */
-    public function it_supports_redis_strategy_with_phpredis_client()
-    {
-        /* @laravel-versions */
-        if (!class_exists(PhpRedisConnector::class)) {
-            return;
-        }
-
-        config(['database.redis.client' => 'phpredis']);
-
-        $this->command->shouldReceive('getMutexStrategy')->withNoArgs()->once()->andReturn('redis');
-
-        $mutex = new Mutex($this->command);
-        $expectedStrategy = new PhpRedisLock($mutex->getPhpRedisClient());
-        $this->assertEquals($expectedStrategy, $mutex->getStrategy());
-    }
-
     /** @test */
     public function it_has_get_predis_client_method_which_always_returns_an_instance_of_predis_client_class()
     {
         $mutex = new Mutex($this->command);
         $this->assertInstanceOf(PredisClient::class, $mutex->getPredisClient());
     }
 
-    /** @test */
-    public function it_has_get_phpredis_client_method_which_always_returns_an_instance_of_redis_class()
-    {
-        /* @laravel-versions */
-        if (!class_exists(PhpRedisConnector::class)) {
-            return;
-        }
-
-        config(['database.redis.client' => 'phpredis']);
-
-        $mutex = new Mutex($this->command);
-        $this->assertInstanceOf(Redis::class, $mutex->getPhpRedisClient());
-    }
-
     /** @test */
     public function it_supports_memcached_strategy()
     {