Use global loop accessor

composer.json

@@ -14,7 +14,7 @@
         "php": ">=5.3",
         "clue/redis-protocol": "0.3.*",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
-        "react/event-loop": "^1.0 || ^0.5",
+        "react/event-loop": "dev-global-event-loop-accessor-part-four as 1.2.0",
         "react/promise": "^2.0 || ^1.1",
         "react/promise-timer": "^1.5",
         "react/socket": "^1.1"
@@ -28,5 +28,11 @@
     },
     "autoload-dev": {
         "psr-4": { "Clue\\Tests\\React\\Redis\\": "tests/" }
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/wyrihaximus-labs/event-loop"
+        }
+    ]
 }

examples/cli.php

@@ -2,23 +2,23 @@
 
 use Clue\React\Redis\Client;
 use Clue\React\Redis\Factory;
+use React\EventLoop\Loop;
 use React\Promise\PromiseInterface;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$factory = new Factory($loop);
+$factory = new Factory();
 
 echo '# connecting to redis...' . PHP_EOL;
 
-$factory->createClient('localhost')->then(function (Client $client) use ($loop) {
+$factory->createClient('localhost')->then(function (Client $client) {
     echo '# connected! Entering interactive mode, hit CTRL-D to quit' . PHP_EOL;
 
-    $loop->addReadStream(STDIN, function () use ($client, $loop) {
+    Loop::get()->addReadStream(STDIN, function () use ($client) {
         $line = fgets(STDIN);
         if ($line === false || $line === '') {
             echo '# CTRL-D -> Ending connection...' . PHP_EOL;
-            $loop->removeReadStream(STDIN);
+            Loop::get()->removeReadStream(STDIN);
             return $client->end();
         }
 
@@ -43,10 +43,10 @@
         });
     });
 
-    $client->on('close', function() use ($loop) {
+    $client->on('close', function() {
         echo '## DISCONNECTED' . PHP_EOL;
 
-        $loop->removeReadStream(STDIN);
+        Loop::get()->removeReadStream(STDIN);
     });
 }, function (Exception $error) {
     echo 'CONNECTION ERROR: ' . $error->getMessage() . PHP_EOL;
@@ -56,4 +56,4 @@
     exit(1);
 });
 
-$loop->run();
+Loop::get()->run();

examples/incr.php

@@ -1,11 +1,11 @@
 <?php
 
 use Clue\React\Redis\Factory;
+use React\EventLoop\Loop;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$factory = new Factory($loop);
+$factory = new Factory();
 
 $client = $factory->createLazyClient('localhost');
 $client->incr('test');
@@ -22,4 +22,4 @@
 
 $client->end();
 
-$loop->run();
+Loop::get()->run();

examples/publish.php

@@ -1,11 +1,11 @@
 <?php
 
 use Clue\React\Redis\Factory;
+use React\EventLoop\Loop;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$factory = new Factory($loop);
+$factory = new Factory();
 
 $channel = isset($argv[1]) ? $argv[1] : 'channel';
 $message = isset($argv[2]) ? $argv[2] : 'message';
@@ -23,4 +23,4 @@
 
 $client->end();
 
-$loop->run();
+Loop::get()->run();

examples/subscribe.php

@@ -1,11 +1,11 @@
 <?php
 
 use Clue\React\Redis\Factory;
+use React\EventLoop\Loop;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$factory = new Factory($loop);
+$factory = new Factory();
 
 $channel = isset($argv[1]) ? $argv[1] : 'channel';
 
@@ -22,17 +22,17 @@
 });
 
 // automatically re-subscribe to channel on connection issues
-$client->on('unsubscribe', function ($channel) use ($client, $loop) {
+$client->on('unsubscribe', function ($channel) use ($client) {
     echo 'Unsubscribed from ' . $channel . PHP_EOL;
 
-    $loop->addPeriodicTimer(2.0, function ($timer) use ($client, $channel, $loop){
-        $client->subscribe($channel)->then(function () use ($timer, $loop) {
+    Loop::get()->addPeriodicTimer(2.0, function ($timer) use ($client, $channel){
+        $client->subscribe($channel)->then(function () use ($timer) {
             echo 'Now subscribed again' . PHP_EOL;
-            $loop->cancelTimer($timer);
+            Loop::get()->cancelTimer($timer);
         }, function (Exception $e) {
             echo 'Unable to subscribe again: ' . $e->getMessage() . PHP_EOL;
         });
     });
 });
 
-$loop->run();
+Loop::get()->run();

src/Factory.php

@@ -3,6 +3,7 @@
 namespace Clue\React\Redis;
 
 use Clue\Redis\Protocol\Factory as ProtocolFactory;
+use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 use React\Promise\Deferred;
 use React\Promise\Timer\TimeoutException;
@@ -13,27 +14,24 @@
 
 class Factory
 {
-    private $loop;
     private $connector;
     private $protocol;
 
     /**
-     * @param LoopInterface $loop
      * @param ConnectorInterface|null $connector [optional] Connector to use.
      *     Should be `null` in order to use default Connector.
      * @param ProtocolFactory|null $protocol
      */
-    public function __construct(LoopInterface $loop, ConnectorInterface $connector = null, ProtocolFactory $protocol = null)
+    public function __construct(ConnectorInterface $connector = null, ProtocolFactory $protocol = null)
     {
         if ($connector === null) {
-            $connector = new Connector($loop);
+            $connector = new Connector(Loop::get());
         }
 
         if ($protocol === null) {
             $protocol = new ProtocolFactory();
         }
 
-        $this->loop = $loop;
         $this->connector = $connector;
         $this->protocol = $protocol;
     }
@@ -121,7 +119,7 @@ function ($error) use ($client) {
             return $deferred->promise();
         }
 
-        return \React\Promise\Timer\timeout($deferred->promise(), $timeout, $this->loop)->then(null, function ($e) {
+        return \React\Promise\Timer\timeout($deferred->promise(), $timeout, Loop::get())->then(null, function ($e) {
             if ($e instanceof TimeoutException) {
                 throw new \RuntimeException(
                     'Connection to Redis server timed out after ' . $e->getTimeout() . ' seconds'
@@ -139,7 +137,7 @@ function ($error) use ($client) {
      */
     public function createLazyClient($target)
     {
-        return new LazyClient($target, $this, $this->loop);
+        return new LazyClient($target, $this);
     }
 
     /**

src/LazyClient.php

@@ -3,6 +3,7 @@
 namespace Clue\React\Redis;
 
 use Evenement\EventEmitter;
+use React\EventLoop\Loop;
 use React\Stream\Util;
 use React\EventLoop\LoopInterface;
 
@@ -17,7 +18,6 @@ class LazyClient extends EventEmitter implements Client
     private $closed = false;
     private $promise;
 
-    private $loop;
     private $idlePeriod = 60.0;
     private $idleTimer;
     private $pending = 0;
@@ -28,7 +28,7 @@ class LazyClient extends EventEmitter implements Client
     /**
      * @param $target
      */
-    public function __construct($target, Factory $factory, LoopInterface $loop)
+    public function __construct($target, Factory $factory)
     {
         $args = array();
         \parse_str(\parse_url($target, \PHP_URL_QUERY), $args);
@@ -38,7 +38,6 @@ public function __construct($target, Factory $factory, LoopInterface $loop)
 
         $this->target = $target;
         $this->factory = $factory;
-        $this->loop = $loop;
     }
 
     private function client()
@@ -52,10 +51,9 @@ private function client()
         $idleTimer=& $this->idleTimer;
         $subscribed =& $this->subscribed;
         $psubscribed =& $this->psubscribed;
-        $loop = $this->loop;
-        return $pending = $this->factory->createClient($this->target)->then(function (Client $client) use ($self, &$pending, &$idleTimer, &$subscribed, &$psubscribed, $loop) {
+        return $pending = $this->factory->createClient($this->target)->then(function (Client $client) use ($self, &$pending, &$idleTimer, &$subscribed, &$psubscribed) {
             // connection completed => remember only until closed
-            $client->on('close', function () use (&$pending, $self, &$subscribed, &$psubscribed, &$idleTimer, $loop) {
+            $client->on('close', function () use (&$pending, $self, &$subscribed, &$psubscribed, &$idleTimer) {
                 $pending = null;
 
                 // foward unsubscribe/punsubscribe events when underlying connection closes
@@ -71,7 +69,7 @@ private function client()
                 $psubscribed = array();
 
                 if ($idleTimer !== null) {
-                    $loop->cancelTimer($idleTimer);
+                    Loop::get()->cancelTimer($idleTimer);
                     $idleTimer = null;
                 }
             });
@@ -173,7 +171,7 @@ public function close()
         }
 
         if ($this->idleTimer !== null) {
-            $this->loop->cancelTimer($this->idleTimer);
+            Loop::get()->cancelTimer($this->idleTimer);
             $this->idleTimer = null;
         }
 
@@ -189,7 +187,7 @@ public function awake()
         ++$this->pending;
 
         if ($this->idleTimer !== null) {
-            $this->loop->cancelTimer($this->idleTimer);
+            Loop::get()->cancelTimer($this->idleTimer);
             $this->idleTimer = null;
         }
     }
@@ -204,7 +202,7 @@ public function idle()
         if ($this->pending < 1 && $this->idlePeriod >= 0 && !$this->subscribed && !$this->psubscribed && $this->promise !== null) {
             $idleTimer =& $this->idleTimer;
             $promise =& $this->promise;
-            $idleTimer = $this->loop->addTimer($this->idlePeriod, function () use (&$idleTimer, &$promise) {
+            $idleTimer = Loop::get()->addTimer($this->idlePeriod, function () use (&$idleTimer, &$promise) {
                 $promise->then(function (Client $client) {
                     $client->close();
                 });

tests/FactoryLazyClientTest.php

@@ -3,6 +3,7 @@
 namespace Clue\Tests\React\Redis;
 
 use Clue\React\Redis\Factory;
+use React\EventLoop\Loop;
 use React\Promise;
 
 class FactoryLazyClientTest extends TestCase
@@ -17,8 +18,18 @@ class FactoryLazyClientTest extends TestCase
     public function setUpFactory()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        Loop::set($this->loop);
         $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
-        $this->factory = new Factory($this->loop, $this->connector);
+        $this->factory = new Factory($this->connector);
+    }
+
+
+    /**
+     * @after
+     */
+    public function resetLoop()
+    {
+        Loop::reset();
     }
 
     public function testWillConnectWithDefaultPort()

tests/FactoryStreamingClientTest.php

@@ -3,6 +3,7 @@
 namespace Clue\Tests\React\Redis;
 
 use Clue\React\Redis\Factory;
+use React\EventLoop\Loop;
 use React\Promise;
 use React\Promise\Deferred;
 
@@ -18,16 +19,25 @@ class FactoryStreamingClientTest extends TestCase
     public function setUpFactory()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        Loop::set($this->loop);
         $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
-        $this->factory = new Factory($this->loop, $this->connector);
+        $this->factory = new Factory($this->connector);
+    }
+
+    /**
+     * @after
+     */
+    public function resetLoop()
+    {
+        Loop::reset();
     }
 
     /**
      * @doesNotPerformAssertions
      */
     public function testCtor()
     {
-        $this->factory = new Factory($this->loop);
+        $this->factory = new Factory();
     }
 
     public function testWillConnectWithDefaultPort()