Use laravel's locking from version 5.8 upwards

Author: GrahamCampbell

composer.json

@@ -41,7 +41,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.1-dev"
+            "dev-master": "6.2-dev"
         },
         "laravel": {
             "providers": [

src/Connections/LockProviderConnection.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Locker.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Locker\Connections;
+
+use Illuminate\Contracts\Cache\LockProvider;
+
+/**
+ * This is the lock provider connection class.
+ *
+ * @author Graham Campbell <graham@alt-three.com>
+ */
+class LockProviderConnection implements ConnectionInterface
+{
+    /**
+     * The lock provider instance.
+     *
+     * @var \Illuminate\Contracts\Cache\LockProvider
+     */
+    protected $provider;
+
+    /**
+     * Create a new lock provider connection class.
+     *
+     * @param \Illuminate\Contracts\Cache\LockProvider $provider
+     *
+     * @return void
+     */
+    public function __construct(LockProvider $provider)
+    {
+        $this->provider = $provider;
+    }
+
+    /**
+     * Store the value at the given key.
+     *
+     * Returns true if the key was fresh.
+     *
+     * @param string $key
+     * @param string $value
+     * @param int    $timeout
+     *
+     * @return bool
+     */
+    public function store(string $key, string $value, int $timeout)
+    {
+        return $this->provider->lock($key, intdiv($timeout, 1000), $value)->get();
+    }
+
+    /**
+     * Remove the value at the given key.
+     *
+     * @param string $key
+     *
+     * @return void
+     */
+    public function remove(string $key)
+    {
+        return $this->provider->lock($key)->forceRelease();
+    }
+}

src/LockerServiceProvider.php

@@ -15,12 +15,14 @@
 
 use AltThree\Locker\Connections\ConnectionInterface;
 use AltThree\Locker\Connections\IlluminateConnection;
-use AltThree\Locker\Connections\PredisConnection;
+use AltThree\Locker\Connections\LockProviderConnection;
+use Illuminate\Cache\RedisStore;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Lumen\Application as LumenApplication;
 use Predis\ClientInterface;
+use ReflectionClass;
 
 /**
  * This is the locker service provider class.
@@ -76,12 +78,16 @@ public function register()
     protected function registerConnection()
     {
         $this->app->singleton('locker.connection', function (Container $app) {
-            $redis = $app['redis']->connection($app->config->get('locker.connection'));
+            $connection = $app->config->get('locker.connection');
 
-            if ($redis instanceof ClientInterface) {
-                return new PredisConnection($redis);
+            if (count((new ReflectionClass(RedisStore::class))->getMethod('lock')->getParameters()) > 2) {
+                $provider = new RedisStore($app['redis'], '', $connection);
+
+                return new LockProviderConnection($provider);
             }
 
+            $redis = $app['redis']->connection($connection);
+
             return new IlluminateConnection($redis);
         });
 

tests/AnalysisTest.php

@@ -14,7 +14,6 @@
 namespace AltThree\Tests\Locker;
 
 use GrahamCampbell\Analyzer\AnalysisTrait;
-use Illuminate\Redis\Connections\Connection;
 use Laravel\Lumen\Application;
 use PHPUnit\Framework\TestCase;
 
@@ -48,6 +47,6 @@ protected function getPaths()
      */
     protected function getIgnored()
     {
-        return [Application::class, Connection::class];
+        return [Application::class];
     }
 }

tests/ServiceProviderTest.php

@@ -15,7 +15,7 @@
 
 use AltThree\Locker\Connections\ConnectionInterface;
 use AltThree\Locker\Connections\IlluminateConnection;
-use AltThree\Locker\Connections\PredisConnection;
+use AltThree\Locker\Connections\LockProviderConnection;
 use AltThree\Locker\Http\Middleware\LockingMiddleware;
 use AltThree\Locker\Locker;
 use GrahamCampbell\TestBenchCore\ServiceProviderTrait;
@@ -49,7 +49,7 @@ public function testConnectionIsInjectable()
         $this->assertIsInjectable(ConnectionInterface::class);
 
         $this->assertInstanceOf(
-            class_exists(Connection::class) ? IlluminateConnection::class : PredisConnection::class,
+            version_compare($this->app->version(), '5.8') >= 0 ? LockProviderConnection::class : IlluminateConnection::class,
             $this->app->make('locker.connection')
         );
     }