[EventLoop] Add typehint in loop interface for timer cancelling.

nrk · nrk · commit f08d6380bba9 · 2013-01-12T18:06:23.000+01:00
diff --git a/LibEvLoop.php b/LibEvLoop.php
@@ -105,7 +105,7 @@ public function addPeriodicTimer($interval, $callback)
         return $timer;
     }
 
-    public function cancelTimer($timer)
+    public function cancelTimer(TimerInterface $timer)
     {
         if (isset($this->timers[$timer])) {
             $this->loop->remove($this->timers[$timer]);
diff --git a/LibEventLoop.php b/LibEventLoop.php
@@ -192,7 +192,7 @@ public function addPeriodicTimer($interval, $callback)
         return $this->addTimerInternal($interval, $callback, true);
     }
 
-    public function cancelTimer($timer)
+    public function cancelTimer(TimerInterface $timer)
     {
         if (isset($this->timers[$timer])) {
             $resource = $this->timers[$timer];
diff --git a/LoopInterface.php b/LoopInterface.php
@@ -2,6 +2,8 @@
 
 namespace React\EventLoop;
 
+use React\EventLoop\Timer\TimerInterface;
+
 interface LoopInterface
 {
     public function addReadStream($stream, $listener);
@@ -13,7 +15,7 @@ public function removeStream($stream);
 
     public function addTimer($interval, $callback);
     public function addPeriodicTimer($interval, $callback);
-    public function cancelTimer($timer);
+    public function cancelTimer(TimerInterface $timer);
 
     public function tick();
     public function run();
diff --git a/StreamSelectLoop.php b/StreamSelectLoop.php
@@ -84,7 +84,7 @@ public function addPeriodicTimer($interval, $callback)
         return $timer;
     }
 
-    public function cancelTimer($timer)
+    public function cancelTimer(TimerInterface $timer)
     {
         $this->timers->cancel($timer);
     }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function addPeriodicTimer($interval, $callback)`
`105`	`105`	`return $timer;`
`106`	`106`	`}`
`107`	`107`
`108`		`- public function cancelTimer($timer)`
	`108`	`+ public function cancelTimer(TimerInterface $timer)`
`109`	`109`	`{`
`110`	`110`	`if (isset($this->timers[$timer])) {`
`111`	`111`	`$this->loop->remove($this->timers[$timer]);`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function addPeriodicTimer($interval, $callback)`
`192`	`192`	`return $this->addTimerInternal($interval, $callback, true);`
`193`	`193`	`}`
`194`	`194`
`195`		`- public function cancelTimer($timer)`
	`195`	`+ public function cancelTimer(TimerInterface $timer)`
`196`	`196`	`{`
`197`	`197`	`if (isset($this->timers[$timer])) {`
`198`	`198`	`$resource = $this->timers[$timer];`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function addPeriodicTimer($interval, $callback)`
`84`	`84`	`return $timer;`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function cancelTimer($timer)`
	`87`	`+ public function cancelTimer(TimerInterface $timer)`
`88`	`88`	`{`
`89`	`89`	`$this->timers->cancel($timer);`
`90`	`90`	`}`