Merge pull request #23 from zf-fr/do-not-escape-slashs

Do not escape slashes
zf-fr · Mar 25, 2016 · 1bf5410 · 1bf5410
2 parents 0a88751 + 6cd0a5c
commit 1bf5410
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 4.0.1
+
+* Message body is now encoded in RFC4627-compliant JSON by using some encoding flags.
+
 # 4.0.0
 
 * `QueuePublisherInterface` has been removed and replaced by a single `MessageQueueInterface`, tied to a single queue.

diff --git a/src/MessageQueue/MessageQueue.php b/src/MessageQueue/MessageQueue.php
@@ -27,6 +27,17 @@
  */
 class MessageQueue implements MessageQueueInterface
 {
+    /**
+     * Default flags for json_encode; value of:
+     *
+     * <code>
+     * JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES
+     * </code>
+     *
+     * @const int
+     */
+    const DEFAULT_JSON_FLAGS = 79;
+
     /**
      * @var array[]
      */
@@ -98,7 +109,7 @@ private function doFlush(bool $async)
             foreach ($messagesToPush as $key => $message) {
                 $messageParameters = [
                     'Id'           => $key, // Identifier of the message in the batch
-                    'MessageBody'  => json_encode($message['body']),
+                    'MessageBody'  => json_encode($message['body'], self::DEFAULT_JSON_FLAGS),
                     'DelaySeconds' => $message['options']['delay_seconds'] ?? null
                 ];
 

diff --git a/test/MessageQueue/MessageQueueTest.php b/test/MessageQueue/MessageQueueTest.php
@@ -57,12 +57,7 @@ public function testCanPushToQueue(bool $async)
                 [
                     'Id'           => 0,
                     'DelaySeconds' => 0,
-                    'MessageBody'  => json_encode([
-                        'name'    => 'message-name',
-                        'payload' => [
-                            'id' => 123
-                        ]
-                    ]),
+                    'MessageBody'  => '{"name":"message-name","payload":{"id":123,"url":"https://www.test.com"}}'
                 ]
             ]
         ];
@@ -74,7 +69,7 @@ public function testCanPushToQueue(bool $async)
         }
 
         $queue = new MessageQueue('https://queue-url.aws.com', $this->sqsClient->reveal());
-        $queue->push(new Message('message-name', ['id' => 123]));
+        $queue->push(new Message('message-name', ['id' => 123, 'url' => 'https://www.test.com']));
         $queue->flush($async);
     }
 
@@ -86,12 +81,7 @@ public function testCanPushDelayedMessage()
                 [
                     'Id'           => 0,
                     'DelaySeconds' => 30,
-                    'MessageBody'  => json_encode([
-                        'name'    => 'message-name',
-                        'payload' => [
-                            'id' => 123
-                        ]
-                    ]),
+                    'MessageBody'  => '{"name":"message-name","payload":{"id":123}}'
                 ]
             ]
         ];