Register event handlers only when the API is busy

Author: clue

src/ResponseApi.php

@@ -17,9 +17,6 @@ class ResponseApi
     public function __construct(Client $client)
     {
         $this->client = $client;
-
-        $client->on('message', array($this, 'handleMessage'));
-        $client->on('close', array($this, 'handleClose'));
     }
 
     public function __call($name, $args)
@@ -29,6 +26,11 @@ public function __call($name, $args)
         if ($this->ending) {
             $request->reject(new RuntimeException('Connection closed'));
         } else {
+            if (!$this->isBusy()) {
+                $this->client->on('message', array($this, 'handleMessage'));
+                $this->client->on('close', array($this, 'handleClose'));
+            }
+
             $this->client->send($name, $args);
             $this->requests []= $request;
         }
@@ -38,10 +40,6 @@ public function __call($name, $args)
 
     public function handleMessage(ModelInterface $message)
     {
-        if (!$this->requests) {
-            throw new UnderflowException('Unexpected reply received, no matching request found');
-        }
-
         $request = array_shift($this->requests);
         /* @var $request Deferred */
 
@@ -51,8 +49,13 @@ public function handleMessage(ModelInterface $message)
             $request->resolve($message->getValueNative());
         }
 
-        if ($this->ending && !$this->isBusy()) {
-            $this->client->close();
+        if (!$this->isBusy()) {
+            $this->client->removeListener('message', array($this, 'handleMessage'));
+            $this->client->removeListener('close', array($this, 'handleClose'));
+
+            if ($this->ending) {
+                $this->client->close();
+            }
         }
     }
 

tests/FunctionalTest.php

@@ -149,14 +149,11 @@ public function testInvalidProtocol()
         $this->waitFor($api);
     }
 
-    public function testInvalidServerRepliesWithDuplicateMessages()
+    public function testAdditionalServerRepliesAreBeingIgnored()
     {
         $client = $this->createClientResponse("+OK\r\n-ERR invalid\r\n");
         $api = new ResponseApi($client);
 
-        $client->on('error', $this->expectCallableOnce());
-        $client->on('close', $this->expectCallableOnce());
-
         $api->set('a', 0)->then($this->expectCallableOnce('OK'));
 
         $this->waitFor($api);

tests/ResponseApiTest.php

@@ -55,10 +55,10 @@ public function testClosingClientRejectsAllRemainingRequests()
 
     public function testClosedClientRejectsAllNewRequests()
     {
-        $this->client->emit('close');
-
         $promise = $this->responseApi->ping();
 
+        $this->client->emit('close');
+
         $this->expectPromiseReject($promise);
         $this->assertFalse($this->responseApi->isBusy());
     }
@@ -86,10 +86,4 @@ public function testEndingBusyClosesClientWhenNotBusyAnymore()
         $this->client->emit('message', array(new BulkReply('PONG')));
         $this->assertEquals(1, $closed);
     }
-
-    public function testReceivingUnexpectedMessageThrowsException()
-    {
-        $this->setExpectedException('UnderflowException');
-        $this->client->emit('message', array(new BulkReply('PONG')));
-    }
 }