Fix RequestContext not updated

jderusse · jderusse · commit 9f020dcc4832 · 2021-06-15T16:21:48.000+02:00
diff --git a/src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php b/src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\ConsumedByWorkerStamp;
 use Symfony\Component\Messenger\Stamp\RouterContextStamp;
-use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RequestContextAwareInterface;
 
 /**
@@ -49,10 +48,20 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
             return $stack->next()->handle($envelope, $stack);
         }
 
-        $currentContext = $this->router->getContext();
+        $context = $this->router->getContext();
+        $currentContext = [
+            $context->getBaseUrl(),
+            $context->getMethod(),
+            $context->getHost(),
+            $context->getScheme(),
+            $context->getHttpPort(),
+            $context->getHttpsPort(),
+            $context->getPathInfo(),
+            $context->getQueryString(),
+        ];
 
         /* @var RouterContextStamp $contextStamp */
-        $this->router->setContext(new RequestContext(
+        $context->__construct(
             $contextStamp->getBaseUrl(),
             $contextStamp->getMethod(),
             $contextStamp->getHost(),
@@ -61,12 +70,12 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
             $contextStamp->getHttpsPort(),
             $contextStamp->getPathInfo(),
             $contextStamp->getQueryString()
-        ));
+        );
 
         try {
             return $stack->next()->handle($envelope, $stack);
         } finally {
-            $this->router->setContext($currentContext);
+            $context->__construct(...$currentContext);
         }
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/RouterContextMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/RouterContextMiddlewareTest.php
@@ -3,7 +3,10 @@
 namespace Symfony\Component\Messenger\Tests\Middleware;
 
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+use Symfony\Component\Messenger\Middleware\StackMiddleware;
 use Symfony\Component\Messenger\Stamp\ConsumedByWorkerStamp;
 use Symfony\Component\Messenger\Stamp\RouterContextStamp;
 use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
@@ -34,30 +37,32 @@ public function testMiddlewareStoreContext()
     public function testMiddlewareRestoreContext()
     {
         $router = $this->createMock(RequestContextAwareInterface::class);
-        $originalContext = new RequestContext();
+        $context = new RequestContext('', 'POST', 'github.com');
 
         $router
             ->expects($this->once())
             ->method('getContext')
-            ->willReturn($originalContext);
-
-        $router
-            ->expects($this->exactly(2))
-            ->method('setContext')
-            ->withConsecutive(
-                [$this->callback(function ($context) {
-                    $this->assertSame('symfony.com', $context->getHost());
-
-                    return true;
-                })],
-                [$originalContext]
-            );
+            ->willReturn($context);
 
         $middleware = new RouterContextMiddleware($router);
         $envelope = new Envelope(new \stdClass(), [
             new ConsumedByWorkerStamp(),
             new RouterContextStamp('', 'GET', 'symfony.com', 'https', 80, 443, '/', ''),
         ]);
-        $middleware->handle($envelope, $this->getStackMock());
+
+        $nextMiddleware = $this->createMock(MiddlewareInterface::class);
+        $nextMiddleware
+            ->expects($this->once())
+            ->method('handle')
+            ->willReturnCallback(function (Envelope $envelope, StackInterface $stack) use ($context): Envelope {
+                $this->assertSame('symfony.com', $context->getHost());
+
+                return $envelope;
+            })
+        ;
+
+        $middleware->handle($envelope, new StackMiddleware($nextMiddleware));
+
+        $this->assertSame('github.com', $context->getHost());
     }
 }
