[EventLoop] Pass timer signature and associated loop to timer callbacks.

This change allows periodic timers to be easily cancelled in an explicit
way from inside their callbacks. Returning FALSE from a callback to cancel
the associated timer is no more supported.

Author: nrk

LibEventLoop.php

@@ -178,12 +178,10 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
         $timer->signature = spl_object_hash($timer);
 
         $callback = function () use ($timer) {
-            $rearm = call_user_func($timer->callback);
+            call_user_func($timer->callback, $timer->signature, $timer->loop);
 
-            if ($timer->periodic && $rearm !== false) {
+            if ($timer->periodic === true) {
                 event_add($timer->resource, $timer->interval);
-            } else {
-                $timer->loop->cancelTimer($timer->signature);
             }
         };
 

StreamSelectLoop.php

@@ -17,7 +17,7 @@ class StreamSelectLoop implements LoopInterface
 
     public function __construct()
     {
-        $this->timers = new Timers();
+        $this->timers = new Timers($this);
     }
 
     public function addReadStream($stream, $listener)

Timer/Timers.php

@@ -2,16 +2,20 @@
 
 namespace React\EventLoop\Timer;
 
+use React\EventLoop\LoopInterface;
+
 class Timers
 {
     const MIN_RESOLUTION = 0.001;
 
+    private $loop;
     private $time;
     private $active = array();
     private $timers;
 
-    public function __construct()
+    public function __construct(LoopInterface $loop)
     {
+        $this->loop = $loop;
         $this->timers = new \SplPriorityQueue();
     }
 
@@ -79,13 +83,11 @@ public function tick()
             $timer = $timers->extract();
 
             if (isset($this->active[$timer->signature])) {
-                $rearm = call_user_func($timer->callback);
+                call_user_func($timer->callback, $timer->signature, $this->loop);
 
-                if ($timer->periodic === true && $rearm !== false) {
+                if ($timer->periodic === true) {
                     $timer->scheduled = $timer->interval + $time;
-                    $this->timers->insert($timer, -$timer->scheduled);
-                } else {
-                    unset($this->active[$timer->signature]);
+                    $timers->insert($timer, -$timer->scheduled);
                 }
             }
         }