[EventLoop] Apply changes after code review.

nrk · nrk · commit cf697fe4f6b3 · 2013-01-14T21:15:06.000+01:00
Also removed a couple of unneeded use directives.
diff --git a/LibEvLoop.php b/LibEvLoop.php
@@ -3,7 +3,6 @@
 namespace React\EventLoop;
 
 use SplObjectStorage;
-use libev\TimerEvent as LibEvTimer;
 use React\EventLoop\Timer\Timer;
 use React\EventLoop\Timer\TimerInterface;
 
@@ -127,7 +126,7 @@ private function setupTimer(TimerInterface $timer)
         $libevTimer->setCallback(function () use ($timer) {
             call_user_func($timer->getCallback(), $timer);
 
-            if ($timer->isPeriodic() === false) {
+            if (!$timer->isPeriodic()) {
                 $timer->cancel();
             }
         });
diff --git a/LibEventLoop.php b/LibEventLoop.php
@@ -159,15 +159,16 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
         }
 
         $timer = new Timer($this, $interval, $callback, $periodic);
+        $resource = event_new();
 
         $timers = $this->timers;
-        $timers->attach($timer, $resource = event_new());
+        $timers->attach($timer, $resource);
 
         $callback = function () use ($timers, $timer, &$callback) {
-            if (isset($timers[$timer]) === true) {
+            if (isset($timers[$timer])) {
                 call_user_func($timer->getCallback(), $timer);
 
-                if ($timer->isPeriodic() === true && isset($timers[$timer]) === true) {
+                if ($timer->isPeriodic() && isset($timers[$timer])) {
                     event_add($timers[$timer], $timer->getInterval() * 1000000);
                 } else {
                     $timer->cancel();
diff --git a/Timer/Timers.php b/Timer/Timers.php
@@ -5,7 +5,6 @@
 use SplObjectStorage;
 use SplPriorityQueue;
 use InvalidArgumentException;
-use React\EventLoop\LoopInterface;
 
 class Timers
 {
@@ -77,10 +76,10 @@ public function tick()
         $timers = $this->timers;
         $scheduler = $this->scheduler;
 
-        while ($scheduler->isEmpty() === false) {
+        while (!$scheduler->isEmpty()) {
             $timer = $scheduler->top();
 
-            if (isset($timers[$timer]) === false) {
+            if (!isset($timers[$timer])) {
                 $scheduler->extract();
                 $timers->detach($timer);
 
