Skip to content

Commit e16fd50

Browse files
alexander-schranzalexander-schranz
committed
Update core tests use new requests constructor parameter of RequestStack
1 parent b35f8f5 commit e16fd50

File tree

32 files changed

+91
-139
lines changed

32 files changed

+91
-139
lines changed

‎src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ class NotFoundActivationStrategyTest extends TestCase
2828
*/
2929
public function testIsActivated(string $url, array|LogRecord $record, bool $expected)
3030
{
31-
$requestStack = new RequestStack();
32-
$requestStack->push(Request::create($url));
31+
$requestStack = new RequestStack([Request::create($url)]);
3332

3433
$strategy = new NotFoundActivationStrategy($requestStack, ['^/foo', 'bar'], new ErrorLevelActivationStrategy(Level::Warning));
3534

‎src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ class HttpFoundationExtensionTest extends TestCase
2525
*/
2626
public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
2727
{
28-
$stack = new RequestStack();
29-
$stack->push(Request::create($pathinfo));
28+
$stack = new RequestStack([Request::create($pathinfo)]);
3029
$extension = new HttpFoundationExtension(new UrlHelper($stack));
3130

3231
$this->assertEquals($expected, $extension->generateAbsoluteUrl($path));
@@ -95,8 +94,7 @@ public function testGenerateAbsoluteUrlWithScriptFileName()
9594
$request = Request::create('http://localhost/app/web/app_dev.php');
9695
$request->server->set('SCRIPT_FILENAME', '/var/www/app/web/app_dev.php');
9796

98-
$stack = new RequestStack();
99-
$stack->push($request);
97+
$stack = new RequestStack([$request]);
10098
$extension = new HttpFoundationExtension(new UrlHelper($stack));
10199

102100
$this->assertEquals(
@@ -110,8 +108,7 @@ public function testGenerateAbsoluteUrlWithScriptFileName()
110108
*/
111109
public function testGenerateRelativePath($expected, $path, $pathinfo)
112110
{
113-
$stack = new RequestStack();
114-
$stack->push(Request::create($pathinfo));
111+
$stack = new RequestStack([Request::create($pathinfo)]);
115112
$extension = new HttpFoundationExtension(new UrlHelper($stack));
116113

117114
$this->assertEquals($expected, $extension->generateRelativePath($path));

‎src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public function testUnknownFragmentRenderer()
5858

5959
public function testGenerateFragmentUri()
6060
{
61-
$requestStack = new RequestStack();
62-
$requestStack->push(Request::create('/'));
61+
$requestStack = new RequestStack([Request::create('/')]);
6362

6463
$fragmentHandler = new FragmentHandler($requestStack);
6564
$fragmentUriGenerator = new FragmentUriGenerator('/_fragment', new UriSigner('s3cr3t'), $requestStack);
@@ -95,9 +94,7 @@ protected function getFragmentHandler($returnOrException): FragmentHandler
9594
$mocker->willReturn($returnOrException);
9695
}
9796

98-
$context = new RequestStack();
99-
100-
$context->push(Request::create('/'));
97+
$context = new RequestStack([Request::create('/')]);
10198

10299
return new FragmentHandler($context, [$strategy], false);
103100
}

‎src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ protected function setUp(): void
2929
{
3030
$this->request = new Request();
3131

32-
$requestStack = new RequestStack();
33-
$requestStack->push($this->request);
34-
35-
$this->extension = new WebLinkExtension($requestStack);
32+
$this->extension = new WebLinkExtension(
33+
new RequestStack([$this->request])
34+
);
3635
}
3736

3837
public function testLink()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ public function testForward()
109109
$request->setLocale('fr');
110110
$request->setRequestFormat('xml');
111111

112-
$requestStack = new RequestStack();
113-
$requestStack->push($request);
112+
$requestStack = new RequestStack([$request]);
114113

115114
$kernel = $this->createMock(HttpKernelInterface::class);
116115
$kernel->expects($this->once())->method('handle')->willReturnCallback(fn (Request $request) => new Response($request->getRequestFormat().'--'.$request->getLocale()));
@@ -513,8 +512,7 @@ public function testAddFlash()
513512

514513
$request = new Request();
515514
$request->setSession($session);
516-
$requestStack = new RequestStack();
517-
$requestStack->push($request);
515+
$requestStack = new RequestStack([$request]);
518516

519517
$container = new Container();
520518
$container->set('request_stack', $requestStack);

‎src/Symfony/Bundle/SecurityBundle/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ public function testSuccessfulDecoration()
4343
$locator = $this->createLocator([
4444
'main_firewall' => $loginLinkHandler,
4545
]);
46-
$requestStack = new RequestStack();
47-
$requestStack->push($request);
46+
$requestStack = new RequestStack([$request]);
4847

4948
$linker = new FirewallAwareLoginLinkHandler($firewallMap, $locator, $requestStack);
5049
$actualLinkDetails = $linker->createLoginLink($user, $request);

‎src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ public function testLogin()
128128
{
129129
$request = new Request();
130130
$authenticator = $this->createMock(AuthenticatorInterface::class);
131-
$requestStack = new RequestStack();
132-
$requestStack->push($request);
131+
$requestStack = new RequestStack([$request]);
133132
$firewallMap = $this->createMock(FirewallMap::class);
134133
$firewall = new FirewallConfig('main', 'main');
135134
$userAuthenticator = $this->createMock(UserAuthenticatorInterface::class);
@@ -168,8 +167,7 @@ public function testLoginReturnsAuthenticatorResponse()
168167
{
169168
$request = new Request();
170169
$authenticator = $this->createMock(AuthenticatorInterface::class);
171-
$requestStack = new RequestStack();
172-
$requestStack->push($request);
170+
$requestStack = new RequestStack([$request]);
173171
$firewallMap = $this->createMock(FirewallMap::class);
174172
$firewall = new FirewallConfig('main', 'main');
175173
$user = $this->createMock(UserInterface::class);
@@ -212,8 +210,7 @@ public function testLoginReturnsAuthenticatorResponse()
212210
public function testLoginWithoutAuthenticatorThrows()
213211
{
214212
$request = new Request();
215-
$requestStack = new RequestStack();
216-
$requestStack->push($request);
213+
$requestStack = new RequestStack([$request]);
217214
$firewallMap = $this->createMock(FirewallMap::class);
218215
$firewall = new FirewallConfig('main', 'main');
219216
$user = $this->createMock(UserInterface::class);
@@ -253,8 +250,7 @@ public function testLoginWithoutRequestContext()
253250
public function testLogout()
254251
{
255252
$request = new Request();
256-
$requestStack = new RequestStack();
257-
$requestStack->push($request);
253+
$requestStack = new RequestStack([$request]);
258254

259255
$token = $this->createMock(TokenInterface::class);
260256
$token->method('getUser')->willReturn(new InMemoryUser('foo', 'bar'));
@@ -292,8 +288,7 @@ public function testLogout()
292288
public function testLogoutWithoutFirewall()
293289
{
294290
$request = new Request();
295-
$requestStack = new RequestStack();
296-
$requestStack->push($request);
291+
$requestStack = new RequestStack([$request]);
297292

298293
$token = $this->createMock(TokenInterface::class);
299294
$token->method('getUser')->willReturn(new InMemoryUser('foo', 'bar'));
@@ -324,8 +319,7 @@ public function testLogoutWithoutFirewall()
324319
public function testLogoutWithResponse()
325320
{
326321
$request = new Request();
327-
$requestStack = new RequestStack();
328-
$requestStack->push($request);
322+
$requestStack = new RequestStack([$request]);
329323

330324
$token = $this->createMock(TokenInterface::class);
331325
$token->method('getUser')->willReturn(new InMemoryUser('foo', 'bar'));
@@ -370,8 +364,7 @@ public function testLogoutWithResponse()
370364
public function testLogoutWithValidCsrf()
371365
{
372366
$request = new Request(['_csrf_token' => 'dummytoken']);
373-
$requestStack = new RequestStack();
374-
$requestStack->push($request);
367+
$requestStack = new RequestStack([$request]);
375368

376369
$token = $this->createMock(TokenInterface::class);
377370
$token->method('getUser')->willReturn(new InMemoryUser('foo', 'bar'));

‎src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public function testGetBasePathSet()
3232
$request = $this->createMock(Request::class);
3333
$request->method('getBasePath')
3434
->willReturn($testBasePath);
35-
$requestStack = new RequestStack();
36-
$requestStack->push($request);
35+
$requestStack = new RequestStack([$request]);
3736

3837
$requestStackContext = new RequestStackContext($requestStack);
3938

@@ -52,8 +51,7 @@ public function testIsSecureTrue()
5251
$request = $this->createMock(Request::class);
5352
$request->method('isSecure')
5453
->willReturn(true);
55-
$requestStack = new RequestStack();
56-
$requestStack->push($request);
54+
$requestStack = new RequestStack([$request]);
5755

5856
$requestStackContext = new RequestStackContext($requestStack);
5957

‎src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public function testItAddsPreloadLinks()
192192
]);
193193

194194
$request = Request::create('/foo');
195-
$requestStack = new RequestStack();
196-
$requestStack->push($request);
195+
$requestStack = new RequestStack([$request]);
197196

198197
$renderer = new ImportMapRenderer($importMapGenerator, requestStack: $requestStack);
199198
$renderer->render(['app']);

‎src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/FileLinkFormatterTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ public function testWhenFileLinkFormatAndNoRequest()
5757
public function testWhenNoFileLinkFormatAndRequest()
5858
{
5959
$file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
60-
$requestStack = new RequestStack();
6160
$request = new Request();
62-
$requestStack->push($request);
61+
$requestStack = new RequestStack([$request]);
6362

6463
$request->server->set('SERVER_NAME', 'www.example.org');
6564
$request->server->set('SERVER_PORT', 80);

0 commit comments

Comments
 (0)