Merge pull request #141 from clue-labs/callable

[RFC] Remove all callable type hints for consistency and performance reasons

Author: jsor

src/ExtEventLoop.php

@@ -68,7 +68,7 @@ function ($signal) {
         $this->createStreamCallback();
     }
 
-    public function addReadStream($stream, callable $listener)
+    public function addReadStream($stream, $listener)
     {
         $key = (int) $stream;
         if (isset($this->readListeners[$key])) {
@@ -87,7 +87,7 @@ public function addReadStream($stream, callable $listener)
         }
     }
 
-    public function addWriteStream($stream, callable $listener)
+    public function addWriteStream($stream, $listener)
     {
         $key = (int) $stream;
         if (isset($this->writeListeners[$key])) {
@@ -134,7 +134,7 @@ public function removeWriteStream($stream)
         }
     }
 
-    public function addTimer($interval, callable $callback)
+    public function addTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, false);
 
@@ -143,7 +143,7 @@ public function addTimer($interval, callable $callback)
         return $timer;
     }
 
-    public function addPeriodicTimer($interval, callable $callback)
+    public function addPeriodicTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, true);
 
@@ -160,17 +160,17 @@ public function cancelTimer(TimerInterface $timer)
         }
     }
 
-    public function futureTick(callable $listener)
+    public function futureTick($listener)
     {
         $this->futureTickQueue->add($listener);
     }
 
-    public function addSignal($signal, callable $listener)
+    public function addSignal($signal, $listener)
     {
         $this->signals->add($signal, $listener);
     }
 
-    public function removeSignal($signal, callable $listener)
+    public function removeSignal($signal, $listener)
     {
         $this->signals->remove($signal, $listener);
     }

src/ExtLibevLoop.php

@@ -63,7 +63,7 @@ function ($signal) {
         );
     }
 
-    public function addReadStream($stream, callable $listener)
+    public function addReadStream($stream, $listener)
     {
         if (isset($this->readEvents[(int) $stream])) {
             return;
@@ -79,7 +79,7 @@ public function addReadStream($stream, callable $listener)
         $this->readEvents[(int) $stream] = $event;
     }
 
-    public function addWriteStream($stream, callable $listener)
+    public function addWriteStream($stream, $listener)
     {
         if (isset($this->writeEvents[(int) $stream])) {
             return;
@@ -115,7 +115,7 @@ public function removeWriteStream($stream)
         }
     }
 
-    public function addTimer($interval, callable $callback)
+    public function addTimer($interval, $callback)
     {
         $timer = new Timer( $interval, $callback, false);
 
@@ -134,7 +134,7 @@ public function addTimer($interval, callable $callback)
         return $timer;
     }
 
-    public function addPeriodicTimer($interval, callable $callback)
+    public function addPeriodicTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, true);
 
@@ -157,17 +157,17 @@ public function cancelTimer(TimerInterface $timer)
         }
     }
 
-    public function futureTick(callable $listener)
+    public function futureTick($listener)
     {
         $this->futureTickQueue->add($listener);
     }
 
-    public function addSignal($signal, callable $listener)
+    public function addSignal($signal, $listener)
     {
         $this->signals->add($signal, $listener);
     }
 
-    public function removeSignal($signal, callable $listener)
+    public function removeSignal($signal, $listener)
     {
         $this->signals->remove($signal, $listener);
     }

src/ExtLibeventLoop.php

@@ -85,7 +85,7 @@ function ($signal) {
         $this->createStreamCallback();
     }
 
-    public function addReadStream($stream, callable $listener)
+    public function addReadStream($stream, $listener)
     {
         $key = (int) $stream;
         if (isset($this->readListeners[$key])) {
@@ -101,7 +101,7 @@ public function addReadStream($stream, callable $listener)
         $this->readListeners[$key] = $listener;
     }
 
-    public function addWriteStream($stream, callable $listener)
+    public function addWriteStream($stream, $listener)
     {
         $key = (int) $stream;
         if (isset($this->writeListeners[$key])) {
@@ -149,7 +149,7 @@ public function removeWriteStream($stream)
         }
     }
 
-    public function addTimer($interval, callable $callback)
+    public function addTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, false);
 
@@ -158,7 +158,7 @@ public function addTimer($interval, callable $callback)
         return $timer;
     }
 
-    public function addPeriodicTimer($interval, callable $callback)
+    public function addPeriodicTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, true);
 
@@ -178,17 +178,17 @@ public function cancelTimer(TimerInterface $timer)
         }
     }
 
-    public function futureTick(callable $listener)
+    public function futureTick($listener)
     {
         $this->futureTickQueue->add($listener);
     }
 
-    public function addSignal($signal, callable $listener)
+    public function addSignal($signal, $listener)
     {
         $this->signals->add($signal, $listener);
     }
 
-    public function removeSignal($signal, callable $listener)
+    public function removeSignal($signal, $listener)
     {
         $this->signals->remove($signal, $listener);
     }

src/LoopInterface.php

@@ -49,7 +49,7 @@ interface LoopInterface
      * @param callable $listener Invoked when the stream is ready.
      * @see self::removeReadStream()
      */
-    public function addReadStream($stream, callable $listener);
+    public function addReadStream($stream, $listener);
 
     /**
      * [Advanced] Register a listener to be notified when a stream is ready to write.
@@ -104,7 +104,7 @@ public function addReadStream($stream, callable $listener);
      * @param callable $listener Invoked when the stream is ready.
      * @see self::removeWriteStream()
      */
-    public function addWriteStream($stream, callable $listener);
+    public function addWriteStream($stream, $listener);
 
     /**
      * Remove the read event listener for the given stream.
@@ -176,7 +176,7 @@ public function removeWriteStream($stream);
      *
      * @return TimerInterface
      */
-    public function addTimer($interval, callable $callback);
+    public function addTimer($interval, $callback);
 
     /**
      * Enqueue a callback to be invoked repeatedly after the given interval.
@@ -246,7 +246,7 @@ public function addTimer($interval, callable $callback);
      *
      * @return TimerInterface
      */
-    public function addPeriodicTimer($interval, callable $callback);
+    public function addPeriodicTimer($interval, $callback);
 
     /**
      * Cancel a pending timer.
@@ -312,7 +312,7 @@ public function cancelTimer(TimerInterface $timer);
      *
      * @return void
      */
-    public function futureTick(callable $listener);
+    public function futureTick($listener);
 
     /**
      * Register a listener to be notified when a signal has been caught by this process.
@@ -354,7 +354,7 @@ public function futureTick(callable $listener);
      *
      * @return void
      */
-    public function addSignal($signal, callable $listener);
+    public function addSignal($signal, $listener);
 
     /**
      * Removes a previously added signal listener.
@@ -370,7 +370,7 @@ public function addSignal($signal, callable $listener);
      *
      * @return void
      */
-    public function removeSignal($signal, callable $listener);
+    public function removeSignal($signal, $listener);
 
     /**
      * Run the event loop until there are no more tasks to perform.

src/SignalsHandler.php

@@ -15,7 +15,7 @@ final class SignalsHandler
     private $on;
     private $off;
 
-    public function __construct(LoopInterface $loop, callable $on, callable $off)
+    public function __construct(LoopInterface $loop, $on, $off)
     {
         $this->loop = $loop;
         $this->on = $on;
@@ -30,7 +30,7 @@ public function __destruct()
         }
     }
 
-    public function add($signal, callable $listener)
+    public function add($signal, $listener)
     {
         if (count($this->signals) == 0 && $this->timer === null) {
             /**
@@ -53,7 +53,7 @@ public function add($signal, callable $listener)
         $this->signals[$signal][] = $listener;
     }
 
-    public function remove($signal, callable $listener)
+    public function remove($signal, $listener)
     {
         if (!isset($this->signals[$signal])) {
             return;

src/StreamSelectLoop.php

@@ -90,7 +90,7 @@ function ($signal) {
         );
     }
 
-    public function addReadStream($stream, callable $listener)
+    public function addReadStream($stream, $listener)
     {
         $key = (int) $stream;
 
@@ -100,7 +100,7 @@ public function addReadStream($stream, callable $listener)
         }
     }
 
-    public function addWriteStream($stream, callable $listener)
+    public function addWriteStream($stream, $listener)
     {
         $key = (int) $stream;
 
@@ -130,7 +130,7 @@ public function removeWriteStream($stream)
         );
     }
 
-    public function addTimer($interval, callable $callback)
+    public function addTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, false);
 
@@ -139,7 +139,7 @@ public function addTimer($interval, callable $callback)
         return $timer;
     }
 
-    public function addPeriodicTimer($interval, callable $callback)
+    public function addPeriodicTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, true);
 
@@ -153,12 +153,12 @@ public function cancelTimer(TimerInterface $timer)
         $this->timers->cancel($timer);
     }
 
-    public function futureTick(callable $listener)
+    public function futureTick($listener)
     {
         $this->futureTickQueue->add($listener);
     }
 
-    public function addSignal($signal, callable $listener)
+    public function addSignal($signal, $listener)
     {
         if ($this->pcntl === false) {
             throw new \BadMethodCallException('Event loop feature "signals" isn\'t supported by the "StreamSelectLoop"');
@@ -167,7 +167,7 @@ public function addSignal($signal, callable $listener)
         $this->signals->add($signal, $listener);
     }
 
-    public function removeSignal($signal, callable $listener)
+    public function removeSignal($signal, $listener)
     {
         $this->signals->remove($signal, $listener);
     }

src/Tick/FutureTickQueue.php

@@ -28,7 +28,7 @@ public function __construct()
      *
      * @param callable $listener The callback to invoke.
      */
-    public function add(callable $listener)
+    public function add($listener)
     {
         $this->queue->enqueue($listener);
     }

src/Timer/Timer.php

@@ -27,7 +27,7 @@ final class Timer implements TimerInterface
      * @param callable      $callback The callback that will be executed when this timer elapses
      * @param bool          $periodic Whether the time is periodic
      */
-    public function __construct($interval, callable $callback, $periodic = false)
+    public function __construct($interval, $callback, $periodic = false)
     {
         if ($interval < self::MIN_INTERVAL) {
             $interval = self::MIN_INTERVAL;