Merge pull request #196 from mbonneau/event-loop-update

Forward compatibility with react/event-loop 1.0 and 0.5 while still support 0.4
ReactiveX · Apr 18, 2018 · 0045d54 · 0045d54
2 parents e44b2ae + c3d223a
commit 0045d54
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "satooshi/php-coveralls": "~1.0",
         "phpunit/phpcov": "^3.1",
         "phpunit/phpunit": "^5.7",
-        "react/event-loop": "^0.4.2"
+        "react/event-loop": "^1.0 || ^0.5 || ^0.4.2"
     },
     "suggest": {
         "react/event-loop": "Used for scheduling async operations"

diff --git a/demo/subscribeOn/subscribeOn.php b/demo/subscribeOn/subscribeOn.php
@@ -18,10 +18,10 @@
     // Change scheduler for here
     $timer = $loop->addTimer(0.001, $handler);
 
-    return new CallbackDisposable(function () use ($timer) {
+    return new CallbackDisposable(function () use ($loop, $timer) {
         // And change scheduler for here
         if ($timer) {
-            $timer->cancel();
+            $loop->cancelTimer($timer);
         }
     });
 });

diff --git a/src/Scheduler/EventLoopScheduler.php b/src/Scheduler/EventLoopScheduler.php
@@ -29,8 +29,8 @@ public function __construct($timerCallableOrLoop)
         $this->delayCallback = $timerCallableOrLoop instanceof LoopInterface ?
             function ($ms, $callable) use ($timerCallableOrLoop) {
                 $timer = $timerCallableOrLoop->addTimer($ms / 1000, $callable);
-                return new CallbackDisposable(function () use ($timer) {
-                    $timer->cancel();
+                return new CallbackDisposable(function () use ($timer, $timerCallableOrLoop) {
+                    $timerCallableOrLoop->cancelTimer($timer);
                 });
             } :
             $timerCallableOrLoop;

diff --git a/test/Rx/Scheduler/EventLoopSchedulerTest.php b/test/Rx/Scheduler/EventLoopSchedulerTest.php
@@ -147,8 +147,8 @@ public function testScheduledItemsFromOutsideOfSchedulerDontCreateExtraTimers()
                 $timersExecuted++;
                 $action();
             });
-            return new CallbackDisposable(function () use ($timer) {
-                $timer->cancel();
+            return new CallbackDisposable(function () use ($loop, $timer) {
+                $loop->cancelTimer($timer);
             });
         });
 
@@ -176,8 +176,8 @@ public function testMultipleSchedulesFromOutsideInSameTickDontCreateExtraTimers(
                 $timersExecuted++;
                 $action();
             });
-            return new CallbackDisposable(function () use ($timer) {
-                $timer->cancel();
+            return new CallbackDisposable(function () use ($loop, $timer) {
+                $loop->cancelTimer($timer);
             });
         });
 
@@ -206,8 +206,8 @@ public function testThatStuffScheduledWayInTheFutureDoesntKeepTheLoopRunningIfDi
                 $timersExecuted++;
                 $action();
             });
-            return new CallbackDisposable(function () use ($timer) {
-                $timer->cancel();
+            return new CallbackDisposable(function () use ($loop, $timer) {
+                $loop->cancelTimer($timer);
             });
         });