Add 1µs minimum interval to Timer, and remove Timers::MIN_RESOLUTION.

jmalloc · jmalloc · commit 49724dce9925 · 2013-11-22T19:47:34.000+10:00
diff --git a/Timer/Timer.php b/Timer/Timer.php
@@ -2,21 +2,22 @@
 
 namespace React\EventLoop\Timer;
 
-use InvalidArgumentException;
 use React\EventLoop\LoopInterface;
 
 class Timer implements TimerInterface
 {
+    const MIN_INTERVAL = 0.000001;
+
     protected $loop;
     protected $interval;
     protected $callback;
     protected $periodic;
     protected $data;
 
-    public function __construct(LoopInterface $loop, $interval, $callback, $periodic = false, $data = null)
+    public function __construct(LoopInterface $loop, $interval, callable $callback, $periodic = false, $data = null)
     {
-        if (false === is_callable($callback)) {
-            throw new InvalidArgumentException('The callback argument must be a valid callable object');
+        if ($interval < self::MIN_INTERVAL) {
+            $interval = self::MIN_INTERVAL;
         }
 
         $this->loop = $loop;
diff --git a/Timer/Timers.php b/Timer/Timers.php
@@ -4,12 +4,9 @@
 
 use SplObjectStorage;
 use SplPriorityQueue;
-use InvalidArgumentException;
 
 class Timers
 {
-    const MIN_RESOLUTION = 0.001;
-
     private $time;
     private $timers;
     private $scheduler;
@@ -33,11 +30,6 @@ public function getTime()
     public function add(TimerInterface $timer)
     {
         $interval = $timer->getInterval();
-
-        if ($interval < self::MIN_RESOLUTION) {
-            throw new InvalidArgumentException('Timer events do not support sub-millisecond timeouts.');
-        }
-
         $scheduledAt = $interval + $this->getTime();
 
         $this->timers->attach($timer, $scheduledAt);
