Merge branch '3.4' into 4.4

* 3.4:
  drop logger mock in favor of using the BufferingLogger
  [Yaml Parser] Fix edge cases when parsing multiple documents
  fix parsing comments not prefixed by a space

Author: xabbuh

Tests/Debug/TraceableEventDispatcherTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\EventDispatcher\Tests\Debug;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\BufferingLogger;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -206,41 +207,57 @@ public function testItDoesNotReturnHandledEvents()
 
     public function testLogger()
     {
-        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger = new BufferingLogger();
 
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
         $tdispatcher->addListener('foo', $listener1 = function () {});
         $tdispatcher->addListener('foo', $listener2 = function () {});
 
-        $logger->expects($this->exactly(2))
-            ->method('debug')
-            ->withConsecutive(
-                ['Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']],
-                ['Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']]
-            );
-
         $tdispatcher->dispatch(new Event(), 'foo');
+
+        $this->assertSame([
+            [
+                'debug',
+                'Notified event "{event}" to listener "{listener}".',
+                ['event' => 'foo', 'listener' => 'closure'],
+            ],
+            [
+                'debug',
+                'Notified event "{event}" to listener "{listener}".',
+                ['event' => 'foo', 'listener' => 'closure'],
+            ],
+        ], $logger->cleanLogs());
     }
 
     public function testLoggerWithStoppedEvent()
     {
-        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger = new BufferingLogger();
 
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
         $tdispatcher->addListener('foo', $listener1 = function (Event $event) { $event->stopPropagation(); });
         $tdispatcher->addListener('foo', $listener2 = function () {});
 
-        $logger->expects($this->exactly(3))
-            ->method('debug')
-            ->withConsecutive(
-                ['Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']],
-                ['Listener "{listener}" stopped propagation of the event "{event}".', ['event' => 'foo', 'listener' => 'closure']],
-                ['Listener "{listener}" was not called for event "{event}".', ['event' => 'foo', 'listener' => 'closure']]
-            );
-
         $tdispatcher->dispatch(new Event(), 'foo');
+
+        $this->assertSame([
+            [
+                'debug',
+                'Notified event "{event}" to listener "{listener}".',
+                ['event' => 'foo', 'listener' => 'closure'],
+            ],
+            [
+                'debug',
+                'Listener "{listener}" stopped propagation of the event "{event}".',
+                ['event' => 'foo', 'listener' => 'closure'],
+            ],
+            [
+                'debug',
+                'Listener "{listener}" was not called for event "{event}".',
+                ['event' => 'foo', 'listener' => 'closure'],
+            ],
+        ], $logger->cleanLogs());
     }
 
     public function testDispatchCallListeners()

composer.json

@@ -23,6 +23,7 @@
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/config": "^3.4|^4.0|^5.0",
+        "symfony/debug": "~3.4|~4.4",
         "symfony/http-foundation": "^3.4|^4.0|^5.0",
         "symfony/service-contracts": "^1.1|^2",
         "symfony/stopwatch": "^3.4|^4.0|^5.0",