From 27786ad5a15e5997f043a88687a7445bf9b2f5a5 Mon Sep 17 00:00:00 2001
From: Alexei Plotnikov <alexei.plotnikov@intellectsoft.by>
Date: Thu, 27 Nov 2014 14:55:13 +0300
Subject: [PATCH 1/2] Fix #53 IronMqProvider return message's body with name of
 queue

---
 src/Provider/IronMqProvider.php       | 4 ++--
 tests/MockClient/IronMqMockClient.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Provider/IronMqProvider.php b/src/Provider/IronMqProvider.php
index 47795bd..a1045ab 100755
--- a/src/Provider/IronMqProvider.php
+++ b/src/Provider/IronMqProvider.php
@@ -183,14 +183,14 @@ public function receive(array $options = [])
         // Convert to Message Class
         foreach ($messages as &$message) {
             $id         = $message->id;
-            $body       = $message->body;
+            $body       = json_decode($message->body);
             $metadata   = [
                 'timeout'           => $message->timeout,
                 'reserved_count'    => $message->reserved_count,
                 'push_status'       => $message->push_status
             ];
 
-            $message = new Message($id, $body, $metadata);
+            $message = new Message($id, json_encode($body->{$this->name}), $metadata);
 
             $this->log(200, "Message has been received.", ['message_id' => $id]);
         }
diff --git a/tests/MockClient/IronMqMockClient.php b/tests/MockClient/IronMqMockClient.php
index ed17263..d488961 100644
--- a/tests/MockClient/IronMqMockClient.php
+++ b/tests/MockClient/IronMqMockClient.php
@@ -74,7 +74,7 @@ public function getMessages($queue, $count, $timeout)
     {
         $response                   = new \stdClass;
         $response->id               = 123;
-        $response->body             = "test";
+        $response->body             = '{"test":{"foo":"bar"}}';
         $response->timeout          = 60;
         $response->reserved_count   = 1;
         $response->push_status      = new \stdClass;

From adb8986d68b3537a8d222c44948674b1fa38eee1 Mon Sep 17 00:00:00 2001
From: Alexei Plotnikov <alexei.plotnikoff@gmail.com>
Date: Sun, 30 Nov 2014 13:27:49 +0300
Subject: [PATCH 2/2] Remove queue name from message in publish method in
 IronMqProvider fix #53

---
 src/Provider/IronMqProvider.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Provider/IronMqProvider.php b/src/Provider/IronMqProvider.php
index a1045ab..401923b 100755
--- a/src/Provider/IronMqProvider.php
+++ b/src/Provider/IronMqProvider.php
@@ -140,7 +140,7 @@ public function publish(array $message, array $options = [])
 
         $result = $this->ironmq->postMessage(
             $this->getNameWithPrefix(),
-            json_encode([$this->name => $message]),
+            json_encode($message),
             [
                 'timeout'       => $options['message_timeout'],
                 'delay'         => $options['message_delay'],
@@ -183,14 +183,14 @@ public function receive(array $options = [])
         // Convert to Message Class
         foreach ($messages as &$message) {
             $id         = $message->id;
-            $body       = json_decode($message->body);
+            $body       = $message->body;
             $metadata   = [
                 'timeout'           => $message->timeout,
                 'reserved_count'    => $message->reserved_count,
                 'push_status'       => $message->push_status
             ];
 
-            $message = new Message($id, json_encode($body->{$this->name}), $metadata);
+            $message = new Message($id, $body, $metadata);
 
             $this->log(200, "Message has been received.", ['message_id' => $id]);
         }