Merge remote-tracking branch 'origin/master' into 0.8

Author: makasim

.travis.yml

@@ -16,9 +16,9 @@ matrix:
     - php: 7.0
       env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true SYMFONY_DEPRECATIONS_HELPER=weak
+      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
     - php: 7.0
-      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true SYMFONY_DEPRECATIONS_HELPER=weak
+      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
     - php: 7.1
       services: docker
       env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [0.7.17](https://github.com/php-enqueue/enqueue-dev/tree/0.7.17) (2017-10-03)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.7.16...0.7.17)
+
+- \[Symfony\] Error using profiler with symfony 2.8 [\#211](https://github.com/php-enqueue/enqueue-dev/issues/211)
+- \[fs\] ErrorException: The Symfony\Component\Filesystem\LockHandler class is deprecated since version 3.4 [\#166](https://github.com/php-enqueue/enqueue-dev/issues/166)
+- Fs do not throw error on user deprecate [\#214](https://github.com/php-enqueue/enqueue-dev/pull/214) ([makasim](https://github.com/makasim))
+- \[bundle\]\[profiler\] Fix array to string conversion notice. [\#212](https://github.com/php-enqueue/enqueue-dev/pull/212) ([makasim](https://github.com/makasim))
+
+## [0.7.16](https://github.com/php-enqueue/enqueue-dev/tree/0.7.16) (2017-09-28)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.7.15...0.7.16)
+
+- Fixes the notation for Twig template names in the data collector [\#207](https://github.com/php-enqueue/enqueue-dev/pull/207) ([Lctrs](https://github.com/Lctrs))
+
+- \[BC Break\]\[dsn\] replace xxx:// to xxx: [\#205](https://github.com/php-enqueue/enqueue-dev/pull/205) ([makasim](https://github.com/makasim))
+
 ## [0.7.15](https://github.com/php-enqueue/enqueue-dev/tree/0.7.15) (2017-09-25)
 [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.7.14...0.7.15)
 

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);
     }
 
     /**

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) }}

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']));
     }
 
     /**

pkg/fs/FsContext.php

@@ -2,6 +2,7 @@
 
 namespace Enqueue\Fs;
 
+use Doctrine\ORM\Cache\Lock;
 use Interop\Queue\InvalidDestinationException;
 use Interop\Queue\PsrContext;
 use Interop\Queue\PsrDestination;
@@ -94,6 +95,11 @@ public function declareDestination(PsrDestination $destination)
         InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class);
 
         set_error_handler(function ($severity, $message, $file, $line) {
+            // do not throw on a deprecation notice.
+            if (E_USER_DEPRECATED === $severity && false !== strpos($message, LockHandler::class)) {
+                return;
+            }
+
             throw new \ErrorException($message, 0, $severity, $file, $line);
         });