minor #27100 [Messenger] Late collect & clone messages (ogizanagi)

sroze · sroze · commit 74aa51507fa4 · 2018-04-30T18:35:47.000+02:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Messenger] Late collect & clone messages | Q | A | ------------- | --- | Branch? | master  | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | N/A  | License | MIT | Doc PR | N/A Commits ------- eb94361 [Messenger] Late collect & clone messages
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -14,14 +14,15 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
 use Symfony\Component\Messenger\TraceableMessageBus;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  *
  * @experimental in 4.1
  */
-class MessengerDataCollector extends DataCollector
+class MessengerDataCollector extends DataCollector implements LateDataCollectorInterface
 {
     private $traceableBuses = array();
 
@@ -34,6 +35,14 @@ public function registerBus(string $name, TraceableMessageBus $bus)
      * {@inheritdoc}
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
+    {
+        // Noop. Everything is collected live by the traceable buses & cloned as late as possible.
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function lateCollect()
     {
         $this->data = array('messages' => array());
 
diff --git a/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php b/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\Messenger\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\DataCollector\MessengerDataCollector;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
@@ -43,7 +41,7 @@ public function testHandle($returnedValue, $expected)
 
         $bus->dispatch($message);
 
-        $collector->collect(Request::create('/'), new Response());
+        $collector->lateCollect();
 
         $messages = $collector->getMessages();
         $this->assertCount(1, $messages);
@@ -120,7 +118,7 @@ public function testHandleWithException()
             // Ignore.
         }
 
-        $collector->collect(Request::create('/'), new Response());
+        $collector->lateCollect();
 
         $messages = $collector->getMessages();
         $this->assertCount(1, $messages);
