repejota#145 : fix reply to inbox for req/res

src/Nats/Connection.php

@@ -371,19 +371,21 @@ private function handleMSG($line)
     {
         $parts   = explode(' ', $line);
         $subject = null;
+        $inbox = null;
         $length  = trim($parts[3]);
         $sid     = $parts[2];
 
         if (count($parts) === 5) {
             $length  = trim($parts[4]);
-            $subject = $parts[3];
+            $subject = $parts[1];
+            $inbox = $parts[3];
         } elseif (count($parts) === 4) {
             $length  = trim($parts[3]);
             $subject = $parts[1];
         }
 
         $payload = $this->receive($length);
-        $msg     = new Message($subject, $payload, $sid, $this);
+        $msg     = new Message($subject, $payload, $sid, $this, $inbox);
 
         if (isset($this->subscriptions[$sid]) === false) {
             throw Exception::forSubscriptionNotFound($sid);

src/Nats/Message.php

@@ -24,6 +24,13 @@ class Message
      */
     public $body;
 
+    /**
+     * Message Inbox
+     *
+     * @var string|null
+     */
+    private $inbox = null;
+
     /**
      * Message Ssid.
      *
@@ -47,10 +54,11 @@ class Message
      * @param string $sid Message Sid.
      * @param Connection $conn Message Connection.
      */
-    public function __construct($subject, $body, $sid, Connection $conn)
+    public function __construct($subject, $body, $sid, Connection $conn, $inbox = null)
     {
         $this->setSubject($subject);
         $this->setBody($body);
+        $this->setInbox($inbox);
         $this->setSid($sid);
         $this->setConn($conn);
     }
@@ -100,6 +108,22 @@ public function getBody()
         return $this->body;
     }
 
+    /**
+     * @return string|null
+     */
+    public function getInbox(): ?string
+    {
+        return $this->inbox;
+    }
+
+    /**
+     * @param string|null $inbox
+     */
+    public function setInbox(?string $inbox): void
+    {
+        $this->inbox = $inbox;
+    }
+
     /**
      * Set Ssid.
      *
@@ -163,7 +187,7 @@ public function getConn()
     public function reply($body)
     {
         $this->conn->publish(
-            $this->subject,
+            $this->inbox,
             $body
         );
     }