Merge pull request #68 from WyriHaximus-labs/alias-timer-interface

Alias timer interface for event-loop 0.4 and 0.5 compatibility

composer.json

@@ -14,7 +14,7 @@
         "phergie/phergie-irc-parser": "~2.0",
         "phergie/phergie-irc-generator": "~1.5",
         "phergie/phergie-irc-connection": "~2.0",
-        "react/event-loop": "^1.0 || ^0.5 || ^0.4.0",
+        "react/event-loop": "^1.0 || ^0.5",
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4",
         "react/socket": "^1.0 || ^0.8 || ^0.7",
         "react/dns": "~0.4.0",

src/Client.php

@@ -19,7 +19,7 @@
 use React\Dns\Resolver\Factory;
 use React\Dns\Resolver\Resolver;
 use React\EventLoop\LoopInterface;
-use React\EventLoop\Timer\TimerInterface;
+use React\EventLoop\TimerInterface;
 use React\Promise\Deferred;
 use React\Promise\PromiseInterface;
 use React\Stream\DuplexResourceStream;
@@ -822,20 +822,6 @@ public function cancelTimer(TimerInterface $timer)
         $this->getLoop()->cancelTimer($timer);
     }
 
-    /**
-     * Checks if a timer created using addTimer() or addPeriodicTimer() is
-     * active. Proxies to the isTimerActive() implementation of the event loop
-     * implementation returned by getLoop().
-     *
-     * @param \React\EventLoop\Timer\TimerInterface $timer Timer returned by
-     *        addTimer() or addPeriodicTimer()
-     * @return boolean TRUE if the specified timer is active, FALSE otherwise
-     */
-    public function isTimerActive(TimerInterface $timer)
-    {
-        return $this->getLoop()->isTimerActive($timer);
-    }
-
     /**
      * There are certain incoming events that the client processes internally.
      * These functions are essential to the client-server relationship: for example,

tests/ClientTest.php

@@ -821,20 +821,6 @@ public function testCancelTimer()
         Phake::verify($loop)->cancelTimer($timer);
     }
 
-    /**
-     * Tests isTimerActive().
-     */
-    public function testIsTimerActive()
-    {
-        $timer = $this->getMockTimer();
-        $loop = $this->getMockLoop();
-        Phake::when($this->client)->getLoop()->thenReturn($loop);
-
-        $this->client->isTimerActive($timer);
-
-        Phake::verify($loop)->isTimerActive($timer);
-    }
-
     /**
      * Returns a mock logger.
      *
@@ -848,11 +834,11 @@ protected function getMockLogger()
     /**
      * Returns a mock timer.
      *
-     * @return \React\EventLoop\Timer\TimerInterface
+     * @return \React\EventLoop\TimerInterface
      */
     protected function getMockTimer()
     {
-        return Phake::mock('\React\EventLoop\Timer\TimerInterface');
+        return Phake::mock('\React\EventLoop\TimerInterface');
     }
 
     /**