Remove unneeded getLoop() method and cyclic dependency with loop

Thid can easily be replaced by using closure binding as documented.

Author: clue

src/ExtEventLoop.php

@@ -112,7 +112,7 @@ public function removeStream($stream)
      */
     public function addTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, false);
+        $timer = new Timer($interval, $callback, false);
 
         $this->scheduleTimer($timer);
 
@@ -124,7 +124,7 @@ public function addTimer($interval, callable $callback)
      */
     public function addPeriodicTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, true);
+        $timer = new Timer($interval, $callback, true);
 
         $this->scheduleTimer($timer);
 

src/LibEvLoop.php

@@ -108,7 +108,7 @@ public function removeStream($stream)
      */
     public function addTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, false);
+        $timer = new Timer( $interval, $callback, false);
 
         $callback = function () use ($timer) {
             call_user_func($timer->getCallback(), $timer);
@@ -130,7 +130,7 @@ public function addTimer($interval, callable $callback)
      */
     public function addPeriodicTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, true);
+        $timer = new Timer($interval, $callback, true);
 
         $callback = function () use ($timer) {
             call_user_func($timer->getCallback(), $timer);

src/LibEventLoop.php

@@ -116,7 +116,7 @@ public function removeStream($stream)
      */
     public function addTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, false);
+        $timer = new Timer($interval, $callback, false);
 
         $this->scheduleTimer($timer);
 
@@ -128,7 +128,7 @@ public function addTimer($interval, callable $callback)
      */
     public function addPeriodicTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, true);
+        $timer = new Timer($interval, $callback, true);
 
         $this->scheduleTimer($timer);
 

src/StreamSelectLoop.php

@@ -94,7 +94,7 @@ public function removeStream($stream)
      */
     public function addTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, false);
+        $timer = new Timer($interval, $callback, false);
 
         $this->timers->add($timer);
 
@@ -106,7 +106,7 @@ public function addTimer($interval, callable $callback)
      */
     public function addPeriodicTimer($interval, callable $callback)
     {
-        $timer = new Timer($this, $interval, $callback, true);
+        $timer = new Timer($interval, $callback, true);
 
         $this->timers->add($timer);
 

src/Timer/Timer.php

@@ -2,45 +2,32 @@
 
 namespace React\EventLoop\Timer;
 
-use React\EventLoop\LoopInterface;
-
 class Timer implements TimerInterface
 {
     const MIN_INTERVAL = 0.000001;
 
-    protected $loop;
     protected $interval;
     protected $callback;
     protected $periodic;
 
     /**
      * Constructor initializes the fields of the Timer
      *
-     * @param LoopInterface $loop     The loop with which this timer is associated
      * @param float         $interval The interval after which this timer will execute, in seconds
      * @param callable      $callback The callback that will be executed when this timer elapses
      * @param bool          $periodic Whether the time is periodic
      */
-    public function __construct(LoopInterface $loop, $interval, callable $callback, $periodic = false)
+    public function __construct($interval, callable $callback, $periodic = false)
     {
         if ($interval < self::MIN_INTERVAL) {
             $interval = self::MIN_INTERVAL;
         }
 
-        $this->loop = $loop;
         $this->interval = (float) $interval;
         $this->callback = $callback;
         $this->periodic = (bool) $periodic;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getLoop()
-    {
-        return $this->loop;
-    }
-
     /**
      * {@inheritdoc}
      */

src/Timer/TimerInterface.php

@@ -2,17 +2,8 @@
 
 namespace React\EventLoop\Timer;
 
-use React\EventLoop\LoopInterface;
-
 interface TimerInterface
 {
-    /**
-     * Get the loop with which this timer is associated
-     *
-     * @return LoopInterface
-     */
-    public function getLoop();
-
     /**
      * Get the interval after which this timer will execute, in seconds
      *

tests/Timer/TimersTest.php

@@ -13,14 +13,14 @@ public function testBlockedTimer()
         $loop = $this
             ->getMockBuilder('React\EventLoop\LoopInterface')
             ->getMock();
-        
+
         $timers = new Timers();
         $timers->tick();
-        
+
         // simulate a bunch of processing on stream events,
         // part of which schedules a future timer...
         sleep(1);
-        $timers->add(new Timer($loop, 0.5, function () {
+        $timers->add(new Timer(0.5, function () {
             $this->fail("Timer shouldn't be called");
         }));