Merge pull request #145 from seregazhuk/master

WyriHaximus · web-flow · commit 502b4b6b9833 · 2018-01-13T12:44:37.000+01:00
Small code cleanup
diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -7,7 +7,6 @@
 use EventConfig as EventBaseConfig;
 use React\EventLoop\Tick\FutureTickQueue;
 use React\EventLoop\Timer\Timer;
-use React\EventLoop\TimerInterface;
 use SplObjectStorage;
 
 /**
diff --git a/src/ExtLibevLoop.php b/src/ExtLibevLoop.php
@@ -8,7 +8,6 @@
 use libev\TimerEvent;
 use React\EventLoop\Tick\FutureTickQueue;
 use React\EventLoop\Timer\Timer;
-use React\EventLoop\TimerInterface;
 use SplObjectStorage;
 
 /**
diff --git a/src/ExtLibeventLoop.php b/src/ExtLibeventLoop.php
@@ -6,7 +6,6 @@
 use EventBase;
 use React\EventLoop\Tick\FutureTickQueue;
 use React\EventLoop\Timer\Timer;
-use React\EventLoop\TimerInterface;
 use SplObjectStorage;
 
 /**
@@ -245,9 +244,10 @@ private function createTimerCallback()
             // Timer already cancelled ...
             if (!$this->timerEvents->contains($timer)) {
                 return;
+            }
 
             // Reschedule periodic timers ...
-            } elseif ($timer->isPeriodic()) {
+            if ($timer->isPeriodic()) {
                 event_add(
                     $this->timerEvents[$timer],
                     $timer->getInterval() * self::MICROSECONDS_PER_SECOND
diff --git a/src/SignalsHandler.php b/src/SignalsHandler.php
@@ -2,8 +2,6 @@
 
 namespace React\EventLoop;
 
-use React\EventLoop\TimerInterface;
-
 /**
  * @internal
  */
@@ -32,7 +30,7 @@ public function __destruct()
 
     public function add($signal, $listener)
     {
-        if (count($this->signals) == 0 && $this->timer === null) {
+        if (empty($this->signals) && $this->timer === null) {
             /**
              * Timer to keep the loop alive as long as there are any signal handlers registered
              */
@@ -69,7 +67,7 @@ public function remove($signal, $listener)
             $off($signal);
         }
 
-        if (count($this->signals) == 0 && $this->timer instanceof TimerInterface) {
+        if (empty($this->signals) && $this->timer instanceof TimerInterface) {
             $this->loop->cancelTimer($this->timer);
             $this->timer = null;
         }
diff --git a/src/StreamSelectLoop.php b/src/StreamSelectLoop.php
@@ -5,7 +5,6 @@
 use React\EventLoop\Signal\Pcntl;
 use React\EventLoop\Tick\FutureTickQueue;
 use React\EventLoop\Timer\Timer;
-use React\EventLoop\TimerInterface;
 use React\EventLoop\Timer\Timers;
 
 /**
@@ -277,20 +276,4 @@ private function streamSelect(array &$read, array &$write, $timeout)
 
         return 0;
     }
-
-    /**
-     * Iterate over signal listeners for the given signal
-     * and call each of them with the signal as first
-     * argument.
-     *
-     * @param int $signal
-     *
-     * @return void
-     */
-    private function handleSignal($signal)
-    {
-        foreach ($this->signals[$signal] as $listener) {
-            \call_user_func($listener, $signal);
-        }
-    }
 }
diff --git a/tests/Timer/TimersTest.php b/tests/Timer/TimersTest.php
@@ -10,10 +10,6 @@ class TimersTest extends TestCase
 {
     public function testBlockedTimer()
     {
-        $loop = $this
-            ->getMockBuilder('React\EventLoop\LoopInterface')
-            ->getMock();
-
         $timers = new Timers();
         $timers->tick();
 

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,6 @@ class TimersTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`public function testBlockedTimer()`
`12`	`12`	`{`
`13`		`- $loop = $this`
`14`		`- ->getMockBuilder('React\EventLoop\LoopInterface')`
`15`		`- ->getMock();`
`16`		`-`
`17`	`13`	`$timers = new Timers();`
`18`	`14`	`$timers->tick();`
`19`	`15`