⭐ Employing default React loop (react/loop v1.2+)

Author: cdosoftei

src/Custodian.php

@@ -5,7 +5,7 @@
 namespace RTCKit\React\Redlock;
 
 use Clue\React\Redis\Client;
-use React\EventLoop\LoopInterface;
+use React\EventLoop\Loop;
 use React\Promise\Deferred;
 use React\Promise\PromiseInterface;
 use function bin2hex;
@@ -23,21 +23,16 @@ final class Custodian
 end
 EOD;
 
-    /** @var LoopInterface Event loop we're bound to */
-    private $loop;
-
     /** @var Client ReactPHP Redis client */
     private $client;
 
     /**
      * Custodian constructor
      *
-     * @param LoopInterface $loop Event loop we're bound to
      * @param Client $client ReactPHP Redis client
      */
-    public function __construct(LoopInterface $loop, Client $client)
+    public function __construct(Client $client)
     {
-        $this->loop = $loop;
         $this->client = $client;
     }
 
@@ -91,7 +86,7 @@ public function spin(int $attempts, float $interval, string $resource, float $tt
                 if (!is_null($lock)) {
                     $deferred->resolve($lock);
                 } else {
-                    $this->loop->addTimer($interval, function () use ($deferred, $attempts, $interval, $resource, $ttl, $token) {
+                    Loop::addTimer($interval, function () use ($deferred, $attempts, $interval, $resource, $ttl, $token) {
                         $deferred->resolve($this->spin(--$attempts, $interval, $resource, $ttl, $token));
                     });
                 }

tests/CustodianTest.php

@@ -5,7 +5,7 @@
 namespace RTCKit\React\Redlock;
 
 use PHPUnit\Framework\TestCase;
-use React\EventLoop\Factory;
+use React\EventLoop\Loop;
 use React\Promise\PromiseInterface;
 use function React\Promise\resolve;
 
@@ -14,21 +14,19 @@
  */
 class CustodianTest extends TestCase
 {
-    private $loop;
     private $client;
 
     /**
      * @before
      */
     public function setUpFactory()
     {
-        $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
         $this->client = $this->getMockBuilder('Clue\React\Redis\Client')->getMock();
     }
 
     public function testConstructor()
     {
-        $custodian = new Custodian($this->loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $this->assertNotNull($custodian);
         $this->assertInstanceOf(Custodian::class, $custodian);
@@ -41,7 +39,7 @@ public function testSuccessfulAcquire()
             ->with('set', ['resource', 'r4nd0m', 'NX', 'PX', 60000])
             ->willReturn(resolve('OK'));
 
-        $custodian = new Custodian($this->loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->acquire('resource', 60, 'r4nd0m');
 
@@ -64,7 +62,7 @@ public function testFailedAcquire()
             ->with('set', ['2fail', 'r4nd0m', 'NX', 'PX', 60000])
             ->willReturn(resolve(null));
 
-        $custodian = new Custodian($this->loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->acquire('2fail', 60, 'r4nd0m');
 
@@ -82,7 +80,7 @@ public function testAcquireOptionalToken()
             ->method('__call')
             ->willReturn(resolve('OK'));
 
-        $custodian = new Custodian($this->loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->acquire('resource', 60);
 
@@ -100,8 +98,6 @@ public function testAcquireOptionalToken()
 
     public function testSuccessfulSpin()
     {
-        $loop = Factory::create();
-
         $this->client->expects($this->exactly(5))
             ->method('__call')
             ->with('set', ['resource', 'r4nd0m', 'NX', 'PX', 60000])
@@ -113,30 +109,28 @@ public function testSuccessfulSpin()
                 resolve('OK')
             );
 
-        $custodian = new Custodian($loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->spin(5, 0.000001, 'resource', 60, 'r4nd0m');
 
         $this->assertNotNull($promise);
         $this->assertInstanceOf(PromiseInterface::class, $promise);
 
-        $promise->then(function (?Lock $lock) use ($loop) {
+        $promise->then(function (?Lock $lock) {
             $this->assertNotNull($lock);
             $this->assertInstanceOf(Lock::class, $lock);
             $this->assertEquals('resource', $lock->getResource());
             $this->assertEquals(60, $lock->getTTL());
             $this->assertEquals('r4nd0m', $lock->getToken());
 
-            $loop->stop();
+            Loop::stop();
         });
 
-        $loop->run();
+        Loop::run();
     }
 
     public function testFailedSpin()
     {
-        $loop = Factory::create();
-
         $this->client->expects($this->exactly(5))
             ->method('__call')
             ->with('set', ['resource', 'r4nd0m', 'NX', 'PX', 60000])
@@ -148,20 +142,20 @@ public function testFailedSpin()
                 resolve(null)
             );
 
-        $custodian = new Custodian($loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->spin(5, 0.000001, 'resource', 60, 'r4nd0m');
 
         $this->assertNotNull($promise);
         $this->assertInstanceOf(PromiseInterface::class, $promise);
 
-        $promise->then(function (?Lock $lock) use ($loop) {
+        $promise->then(function (?Lock $lock) {
             $this->assertNull($lock);
 
-            $loop->stop();
+            Loop::stop();
         });
 
-        $loop->run();
+        Loop::run();
     }
 
     public function testSuccessfulRelease()
@@ -172,7 +166,7 @@ public function testSuccessfulRelease()
             ->willReturn(resolve('1'));
 
         $lock = new Lock('release', 60, 'r4nd0m');
-        $custodian = new Custodian($this->loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->release($lock);
 
@@ -192,7 +186,7 @@ public function testFailedRelease()
             ->willReturn(resolve('0'));
 
         $lock = new Lock('release', 60, 'r4nd0m');
-        $custodian = new Custodian($this->loop, $this->client);
+        $custodian = new Custodian($this->client);
 
         $promise = $custodian->release($lock);