Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7ad1c44

Browse files
committed
Fix RequestContext not updated
1 parent414c78b commit7ad1c44

File tree

2 files changed

+49
-28
lines changed

2 files changed

+49
-28
lines changed

‎src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
useSymfony\Component\Messenger\Envelope;
1515
useSymfony\Component\Messenger\Stamp\ConsumedByWorkerStamp;
1616
useSymfony\Component\Messenger\Stamp\RouterContextStamp;
17-
useSymfony\Component\Routing\RequestContext;
1817
useSymfony\Component\Routing\RequestContextAwareInterface;
1918

2019
/**
@@ -49,24 +48,41 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
4948
return$stack->next()->handle($envelope,$stack);
5049
}
5150

52-
$currentContext =$this->router->getContext();
51+
$context =$this->router->getContext();
52+
$currentBaseUrl =$context->getBaseUrl();
53+
$currentMethod =$context->getMethod();
54+
$currentHost =$context->getHost();
55+
$currentScheme =$context->getScheme();
56+
$currentHttpPort =$context->getHttpPort();
57+
$currentHttpsPort =$context->getHttpsPort();
58+
$currentPathInfo =$context->getPathInfo();
59+
$currentQueryString =$context->getQueryString();
5360

5461
/* @var RouterContextStamp $contextStamp */
55-
$this->router->setContext(newRequestContext(
56-
$contextStamp->getBaseUrl(),
57-
$contextStamp->getMethod(),
58-
$contextStamp->getHost(),
59-
$contextStamp->getScheme(),
60-
$contextStamp->getHttpPort(),
61-
$contextStamp->getHttpsPort(),
62-
$contextStamp->getPathInfo(),
63-
$contextStamp->getQueryString()
64-
));
62+
$context
63+
->setBaseUrl($contextStamp->getBaseUrl())
64+
->setMethod($contextStamp->getMethod())
65+
->setHost($contextStamp->getHost())
66+
->setScheme($contextStamp->getScheme())
67+
->setHttpPort($contextStamp->getHttpPort())
68+
->setHttpsPort($contextStamp->getHttpsPort())
69+
->setPathInfo($contextStamp->getPathInfo())
70+
->setQueryString($contextStamp->getQueryString())
71+
;
6572

6673
try {
6774
return$stack->next()->handle($envelope,$stack);
6875
}finally {
69-
$this->router->setContext($currentContext);
76+
$context
77+
->setBaseUrl($currentBaseUrl)
78+
->setMethod($currentMethod)
79+
->setHost($currentHost)
80+
->setScheme($currentScheme)
81+
->setHttpPort($currentHttpPort)
82+
->setHttpsPort($currentHttpsPort)
83+
->setPathInfo($currentPathInfo)
84+
->setQueryString($currentQueryString)
85+
;
7086
}
7187
}
7288
}

‎src/Symfony/Component/Messenger/Tests/Middleware/RouterContextMiddlewareTest.php‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
namespaceSymfony\Component\Messenger\Tests\Middleware;
44

55
useSymfony\Component\Messenger\Envelope;
6+
useSymfony\Component\Messenger\Middleware\MiddlewareInterface;
67
useSymfony\Component\Messenger\Middleware\RouterContextMiddleware;
8+
useSymfony\Component\Messenger\Middleware\StackInterface;
9+
useSymfony\Component\Messenger\Middleware\StackMiddleware;
710
useSymfony\Component\Messenger\Stamp\ConsumedByWorkerStamp;
811
useSymfony\Component\Messenger\Stamp\RouterContextStamp;
912
useSymfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
@@ -34,30 +37,32 @@ public function testMiddlewareStoreContext()
3437
publicfunctiontestMiddlewareRestoreContext()
3538
{
3639
$router =$this->createMock(RequestContextAwareInterface::class);
37-
$originalContext =newRequestContext();
40+
$context =newRequestContext('','POST','github.com');
3841

3942
$router
4043
->expects($this->once())
4144
->method('getContext')
42-
->willReturn($originalContext);
43-
44-
$router
45-
->expects($this->exactly(2))
46-
->method('setContext')
47-
->withConsecutive(
48-
[$this->callback(function ($context) {
49-
$this->assertSame('symfony.com',$context->getHost());
50-
51-
returntrue;
52-
})],
53-
[$originalContext]
54-
);
45+
->willReturn($context);
5546

5647
$middleware =newRouterContextMiddleware($router);
5748
$envelope =newEnvelope(new \stdClass(), [
5849
newConsumedByWorkerStamp(),
5950
newRouterContextStamp('','GET','symfony.com','https',80,443,'/',''),
6051
]);
61-
$middleware->handle($envelope,$this->getStackMock());
52+
53+
$nextMiddleware =$this->createMock(MiddlewareInterface::class);
54+
$nextMiddleware
55+
->expects($this->once())
56+
->method('handle')
57+
->willReturnCallback(function (Envelope$envelope,StackInterface$stack)use ($context):Envelope {
58+
$this->assertSame('symfony.com',$context->getHost());
59+
60+
return$envelope;
61+
})
62+
;
63+
64+
$middleware->handle($envelope,newStackMiddleware($nextMiddleware));
65+
66+
$this->assertSame('github.com',$context->getHost());
6267
}
6368
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp