[Messenger] Fix stopwach usage if it has been reset

lyrixx · lyrixx · commit bf4b0cc02214 · 2020-12-28T10:51:48.000+01:00
diff --git a/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php b/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php
@@ -71,7 +71,7 @@ public function __construct(StackInterface $stack, Stopwatch $stopwatch, string
      */
     public function next(): MiddlewareInterface
     {
-        if (null !== $this->currentEvent) {
+        if (null !== $this->currentEvent && $this->stopwatch->isStarted($this->currentEvent)) {
             $this->stopwatch->stop($this->currentEvent);
         }
 
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php
@@ -42,7 +42,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         };
 
         $stopwatch = $this->createMock(Stopwatch::class);
-        $stopwatch->expects($this->once())->method('isStarted')->willReturn(true);
+        $stopwatch->expects($this->exactly(2))->method('isStarted')->willReturn(true);
         $stopwatch->expects($this->exactly(2))
             ->method('start')
             ->withConsecutive(
@@ -91,4 +91,36 @@ public function testHandleWithException()
         $traced = new TraceableMiddleware($stopwatch, $busId);
         $traced->handle(new Envelope(new DummyMessage('Hello')), new StackMiddleware(new \ArrayIterator([null, $middleware])));
     }
+
+    public function testHandleWhenStopwatchHasBeenReset()
+    {
+        $busId = 'command_bus';
+        $envelope = new Envelope(new DummyMessage('Hello'));
+
+        $stopwatch = new Stopwatch();
+
+        $middleware = new class($stopwatch) implements MiddlewareInterface {
+            public $calls = 0;
+            private $stopwatch;
+
+            public function __construct(Stopwatch $stopwatch)
+            {
+                $this->stopwatch = $stopwatch;
+            }
+
+            public function handle(Envelope $envelope, StackInterface $stack): Envelope
+            {
+                $this->stopwatch->reset();
+
+                ++$this->calls;
+
+                return $stack->next()->handle($envelope, $stack);
+            }
+        };
+
+        $traced = new TraceableMiddleware($stopwatch, $busId);
+
+        $traced->handle($envelope, new StackMiddleware(new \ArrayIterator([null, $middleware])));
+        $this->assertSame(1, $middleware->calls);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function __construct(StackInterface $stack, Stopwatch $stopwatch, string`
`71`	`71`	`*/`
`72`	`72`	`public function next(): MiddlewareInterface`
`73`	`73`	`{`
`74`		`- if (null !== $this->currentEvent) {`
	`74`	`+ if (null !== $this->currentEvent && $this->stopwatch->isStarted($this->currentEvent)) {`
`75`	`75`	`$this->stopwatch->stop($this->currentEvent);`
`76`	`76`	`}`
`77`	`77`