[Messenger] Fix stopwach usage if it has been reset

lyrixx · lyrixx · commit 3e053257a55e · 2020-12-23T18:18:22.000+01:00
diff --git a/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php b/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php
@@ -72,7 +72,11 @@ public function __construct(StackInterface $stack, Stopwatch $stopwatch, string
     public function next(): MiddlewareInterface
     {
         if (null !== $this->currentEvent) {
-            $this->stopwatch->stop($this->currentEvent);
+            try {
+                $this->stopwatch->stop($this->currentEvent);
+            } catch (\LogicException $th) {
+                // Maybe the stopwatch has been reset, noop
+            }
         }
 
         if ($this->stack === $nextMiddleware = $this->stack->next()) {
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php
@@ -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
`@@ -72,7 +72,11 @@ public function __construct(StackInterface $stack, Stopwatch $stopwatch, string`
`72`	`72`	`public function next(): MiddlewareInterface`
`73`	`73`	`{`
`74`	`74`	`if (null !== $this->currentEvent) {`
`75`		`- $this->stopwatch->stop($this->currentEvent);`
	`75`	`+ try {`
	`76`	`+ $this->stopwatch->stop($this->currentEvent);`
	`77`	`+ } catch (\LogicException $th) {`
	`78`	`+ // Maybe the stopwatch has been reset, noop`
	`79`	`+ }`
`76`	`80`	`}`
`77`	`81`
`78`	`82`	`if ($this->stack === $nextMiddleware = $this->stack->next()) {`