Merge pull request #109 from clue-labs/lazy-close

Fix explicit close() on lazy connection when connection is active

Author: jsor

src/Io/LazyConnection.php

@@ -217,8 +217,10 @@ public function close()
             $this->connecting->then(function (ConnectionInterface $connection) {
                 $connection->close();
             });
-            $this->connecting->cancel();
-            $this->connecting = null;
+            if ($this->connecting !== null) {
+                $this->connecting->cancel();
+                $this->connecting = null;
+            }
         }
 
         if ($this->idleTimer !== null) {

tests/Io/LazyConnectionTest.php

@@ -701,6 +701,25 @@ public function testCloseAfterPingWillCancelTimerWhenPingFromUnderlyingConnectio
         $connection->close();
     }
 
+    public function testCloseAfterPingHasResolvedWillCloseUnderlyingConnectionWithoutTryingToCancelConnection()
+    {
+        $base = $this->getMockBuilder('React\MySQL\Io\LazyConnection')->setMethods(array('ping', 'close'))->disableOriginalConstructor()->getMock();
+        $base->expects($this->once())->method('ping')->willReturn(\React\Promise\resolve());
+        $base->expects($this->once())->method('close')->willReturnCallback(function () use ($base) {
+            $base->emit('close');
+        });
+
+        $factory = $this->getMockBuilder('React\MySQL\Factory')->disableOriginalConstructor()->getMock();
+        $factory->expects($this->once())->method('createConnection')->willReturn(\React\Promise\resolve($base));
+
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $connection = new LazyConnection($factory, '', $loop);
+
+        $connection->ping();
+        $connection->close();
+    }
+
     public function testCloseAfterQuitAfterPingWillCloseUnderlyingConnectionWhenQuitIsStillPending()
     {
         $base = $this->getMockBuilder('React\MySQL\ConnectionInterface')->getMock();