From 620ddd24d44ed1fd9181c80390b04f7d520f1969 Mon Sep 17 00:00:00 2001
From: Maksim Kotlyar <kotlyar.maksim@gmail.com>
Date: Tue, 3 Oct 2017 11:23:50 +0300
Subject: [PATCH 1/2] [bundle][profiler] Fix array to string conversion notice.

---
 .../Profiler/MessageQueueCollector.php              | 13 ++++---------
 .../Resources/views/Profiler/panel.html.twig        |  5 ++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
index de5fa59bc..b3e2b5f0f 100644
--- a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
+++ b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
@@ -5,6 +5,7 @@
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Client\TraceableProducer;
+use Enqueue\Util\JSON;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
@@ -65,19 +66,13 @@ public function prettyPrintPriority($priority)
     }
 
     /**
-     * @param string $message
+     * @param mixed $body
      *
      * @return string
      */
-    public function prettyPrintMessage($message)
+    public function ensureString($body)
     {
-        if (is_scalar($message)) {
-            return htmlspecialchars($message);
-        }
-
-        return htmlspecialchars(
-            json_encode($message, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
-        );
+        return is_string($body) ? $body : JSON::encode($body);
     }
 
     /**
diff --git a/pkg/enqueue-bundle/Resources/views/Profiler/panel.html.twig b/pkg/enqueue-bundle/Resources/views/Profiler/panel.html.twig
index a8f783dfc..635a540d7 100644
--- a/pkg/enqueue-bundle/Resources/views/Profiler/panel.html.twig
+++ b/pkg/enqueue-bundle/Resources/views/Profiler/panel.html.twig
@@ -44,7 +44,10 @@
                 <td>{{ sentMessage.topic }}</td>
                 <td style="width: 70%">
                         <span class="metadata">
-                            <span>{{ sentMessage.body[0:40] }}... </span><a class="btn btn-link text-small sf-toggle" data-toggle-selector="#message-body-{{ loop.index }}" data-toggle-alt-content="Hide trace">Show trace</a>
+                            <span>
+                                {{ collector.ensureString(sentMessage.body)[0:40] }}{% if collector.ensureString(sentMessage.body)[0:40] != collector.ensureString(sentMessage.body) %}...{% endif %}
+                            </span>
+                            <a class="btn btn-link text-small sf-toggle" data-toggle-selector="#message-body-{{ loop.index }}" data-toggle-alt-content="Hide trace">Show trace</a>
 
                             <div id="message-body-{{ loop.index }}" class="context sf-toggle-content sf-toggle-hidden">
                                 {{ profiler_dump(sentMessage.body) }}

From 6e1f3e9062204c1014397a51d8823c59b6372983 Mon Sep 17 00:00:00 2001
From: Maksim Kotlyar <kotlyar.maksim@gmail.com>
Date: Tue, 3 Oct 2017 11:52:24 +0300
Subject: [PATCH 2/2] [bundle] fix tests.

---
 .../Unit/Profiler/MessageQueueCollectorTest.php      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkg/enqueue-bundle/Tests/Unit/Profiler/MessageQueueCollectorTest.php b/pkg/enqueue-bundle/Tests/Unit/Profiler/MessageQueueCollectorTest.php
index b6ec4f842..62f7d6c1c 100644
--- a/pkg/enqueue-bundle/Tests/Unit/Profiler/MessageQueueCollectorTest.php
+++ b/pkg/enqueue-bundle/Tests/Unit/Profiler/MessageQueueCollectorTest.php
@@ -71,21 +71,19 @@ public function testShouldPrettyPrintUnknownPriority()
         $this->assertEquals('unknownPriority', $collector->prettyPrintPriority('unknownPriority'));
     }
 
-    public function testShouldPrettyPrintScalarMessage()
+    public function testShouldEnsureStringKeepStringSame()
     {
         $collector = new MessageQueueCollector($this->createProducerMock());
 
-        $this->assertEquals('foo', $collector->prettyPrintMessage('foo'));
-        $this->assertEquals('&lt;p&gt;', $collector->prettyPrintMessage('<p>'));
+        $this->assertEquals('foo', $collector->ensureString('foo'));
+        $this->assertEquals('bar baz', $collector->ensureString('bar baz'));
     }
 
-    public function testShouldPrettyPrintArrayMessage()
+    public function testShouldEnsureStringEncodeArrayToJson()
     {
         $collector = new MessageQueueCollector($this->createProducerMock());
 
-        $expected = "[\n    &quot;foo&quot;,\n    &quot;bar&quot;\n]";
-
-        $this->assertEquals($expected, $collector->prettyPrintMessage(['foo', 'bar']));
+        $this->assertEquals('["foo","bar"]', $collector->ensureString(['foo', 'bar']));
     }
 
     /**