8000 Merge branch '4.4' into 5.4 · tobias-93/symfony@87d314e · GitHub
[go: up one dir, main page]
Skip to content

Commit 87d314e

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.4
* 4.4: [DoctrineBridge] Treat firstResult === 0 like null [HttpKernel] Fix SessionListener without session in request symfony#46268
2 parents 37b8077 + a780f57 commit 87d314e

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function getEntities()
5353
*/
5454
public function getEntitiesByIds(string $identifier, array $values)
5555
{
56-
if (null !== $this->queryBuilder->getMaxResults() || null !== $this->queryBuilder->getFirstResult()) {
56+
if (null !== $this->queryBuilder->getMaxResults() || 0 < (int) $this->queryBuilder->getFirstResult()) {
5757
// an offset or a limit would apply on results including the where clause with submitted id values
5858
// that could make invalid choices valid
5959
$choices = [];

‎src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function onKernelResponse(ResponseEvent $event)
104104
// Always remove the internal header if present
105105
$response->headers->remove(self::NO_AUTO_CACHE_CONTROL_HEADER);
106106

107-
if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : $event->getRequest()->getSession()) {
107+
if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : ($event->getRequest()->hasSession() ? $event->getRequest()->getSession() : null)) {
108108
return;
109109
}
110110

‎src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function testSetContentLanguageHeaderWhenEmptyAndAtLeast2EnabledLocalesAr
102102
$request = Request::create('/');
103103
$request->setLocale('fr');
104104

105-
$event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
105+
$event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
106106
$this->dispatcher->dispatch($event, KernelEvents::RESPONSE);
107107

108108
$this->assertEquals('fr', $response->headers->get('Content-Language'));
@@ -118,7 +118,7 @@ public function testNotOverrideContentLanguageHeaderWhenNotEmpty()
118118
$request = Request::create('/');
119119
$request->setLocale('de');
120120

121-
$event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
121+
$event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
122122
$this->dispatcher->dispatch($event, KernelEvents::RESPONSE);
123123

124124
$this->assertEquals('mi, en', $response->headers->get('Content-Language'));
@@ -133,7 +133,7 @@ public function testNotSetContentLanguageHeaderWhenDisabled()
133133
$request = Request::create('/');
134134
$request->setLocale('fr');
135135

136-
$event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
136+
$event = new ResponseEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
137137
$this->dispatcher->dispatch($event, KernelEvents::RESPONSE);
138138

139139
$this->assertNull($response->headers->get('Content-Language'));

‎src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ public function testUninitializedSessionWithoutInitializedSession()
523523
$container = new ServiceLocator([]);
524524

525525
$listener = new SessionListener($container);
526-
$listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
526+
$listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MAIN_REQUEST, $response));
527527
$this->assertFalse($response->headers->has('Expires'));
528528
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
529529
$this->assertFalse($response->headers->hasCacheControlDirective('private'));

‎src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ protected function setUp(): void
324324
$this->guardAuthenticatorHandler = $this->createMock(GuardAuthenticatorHandler::class);
325325
$this->request = new Request([], [], [], [], [], []);
326326

327-
$this->event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->request, HttpKernelInterface::MASTER_REQUEST);
327+
$this->event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->request, HttpKernelInterface::MAIN_REQUEST);
328328

329329
$this->logger = $this->createMock(LoggerInterface::class);
330330
$this->rememberMeServices = $this->createMock(RememberMeServicesInterface::class);

‎src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ public function testOnKernelResponseRemoveListener()
398398
$listener = new ContextListener($tokenStorage, [], 'session', null, $dispatcher, null, \Closure::fromCallable([$tokenStorage, 'getToken']));
399399
$this->assertEmpty($dispatcher->getListeners());
400400

401-
$listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
401+
$listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
402402
$this->assertNotEmpty($dispatcher->getListeners());
403403

404-
$listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST, new Response()));
404+
$listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST, new Response()));
405405
$this->assertEmpty($dispatcher->getListeners());
406406
}
407407

‎src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
4848
->method('setToken')
4949
;
5050

51-
$this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST)));
51+
$this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST)));
5252
}
5353

5454
public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
@@ -67,7 +67,7 @@ public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
6767
->willReturn(null)
6868
;
6969

70-
$this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST)));
70+
$this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST)));
7171
}
7272

7373
public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation()
@@ -100,7 +100,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
100100
->willThrowException($exception)
101101
;
102102

103-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
103+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
104104
}
105105

106106
public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()
@@ -133,7 +133,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti
133133
->willThrowException($exception)
134134
;
135135

136-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
136+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
137137
}
138138

139139
public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggersLoginFail()
@@ -163,7 +163,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers
163163
->method('authenticate')
164164
;
165165

166-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
166+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
167167
}
168168

169169
public function testOnCoreSecurity()
@@ -195,7 +195,7 @@ public function testOnCoreSecurity()
195195
->willReturn($token)
196196
;
197197

198-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
198+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
199199
}
200200

201201
public function testSessionStrategy()
@@ -243,7 +243,7 @@ public function testSessionStrategy()
243243
->willReturn(null)
244244
;
245245

246-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
246+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
247247
}
248248

249249
public function testSessionIsMigratedByDefault()
@@ -289,7 +289,7 @@ public function testSessionIsMigratedByDefault()
289289
$request = new Request();
290290
$request->setSession($session);
291291

292-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
292+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
293293
}
294294

295295
public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent()

‎src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public function testInvalidCsrfToken($invalidToken)
264264
$csrfTokenManager
265265
);
266266

267-
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
267+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
268268
}
269269

270270
public function postOnlyDataProvider(): array

0 commit comments

Comments
 (0)
0