Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit b7ee4af3ef71 · 2022-05-06T16:25:18.000+02:00
* 4.4:
  [DoctrineBridge] Treat firstResult === 0 like null
  [HttpKernel] Fix SessionListener without session in request #46268
diff --git a/Tests/Firewall/ContextListenerTest.php b/Tests/Firewall/ContextListenerTest.php
@@ -398,10 +398,10 @@ public function testOnKernelResponseRemoveListener()
         $listener = new ContextListener($tokenStorage, [], 'session', null, $dispatcher, null, \Closure::fromCallable([$tokenStorage, 'getToken']));
         $this->assertEmpty($dispatcher->getListeners());
 
-        $listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
         $this->assertNotEmpty($dispatcher->getListeners());
 
-        $listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST, new Response()));
+        $listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST, new Response()));
         $this->assertEmpty($dispatcher->getListeners());
     }
 
diff --git a/Tests/Firewall/RememberMeListenerTest.php b/Tests/Firewall/RememberMeListenerTest.php
@@ -48,7 +48,7 @@ public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
             ->method('setToken')
         ;
 
-        $this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST)));
+        $this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST)));
     }
 
     public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
@@ -67,7 +67,7 @@ public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
             ->willReturn(null)
         ;
 
-        $this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST)));
+        $this->assertNull($listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST)));
     }
 
     public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation()
@@ -100,7 +100,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
             ->willThrowException($exception)
         ;
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()
@@ -133,7 +133,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti
             ->willThrowException($exception)
         ;
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggersLoginFail()
@@ -163,7 +163,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers
             ->method('authenticate')
         ;
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function testOnCoreSecurity()
@@ -195,7 +195,7 @@ public function testOnCoreSecurity()
             ->willReturn($token)
         ;
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function testSessionStrategy()
@@ -243,7 +243,7 @@ public function testSessionStrategy()
             ->willReturn(null)
         ;
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function testSessionIsMigratedByDefault()
@@ -289,7 +289,7 @@ public function testSessionIsMigratedByDefault()
         $request = new Request();
         $request->setSession($session);
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent()
diff --git a/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php b/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
@@ -264,7 +264,7 @@ public function testInvalidCsrfToken($invalidToken)
             $csrfTokenManager
         );
 
-        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
     }
 
     public function postOnlyDataProvider(): array

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()`
`48`	`48`	`->method('setToken')`
`49`	`49`	`;`
`50`	`50`
`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)));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()`
`@@ -67,7 +67,7 @@ public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()`
`67`	`67`	`->willReturn(null)`
`68`	`68`	`;`
`69`	`69`
`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)));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation()`
`@@ -100,7 +100,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti`
`100`	`100`	`->willThrowException($exception)`
`101`	`101`	`;`
`102`	`102`
`103`		`- $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));`
	`103`	`+ $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()`
`@@ -133,7 +133,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti`
`133`	`133`	`->willThrowException($exception)`
`134`	`134`	`;`
`135`	`135`
`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));`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggersLoginFail()`
`@@ -163,7 +163,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers`
`163`	`163`	`->method('authenticate')`
`164`	`164`	`;`
`165`	`165`
`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));`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`public function testOnCoreSecurity()`
`@@ -195,7 +195,7 @@ public function testOnCoreSecurity()`
`195`	`195`	`->willReturn($token)`
`196`	`196`	`;`
`197`	`197`
`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));`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`public function testSessionStrategy()`
`@@ -243,7 +243,7 @@ public function testSessionStrategy()`
`243`	`243`	`->willReturn(null)`
`244`	`244`	`;`
`245`	`245`
`246`		`- $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));`
	`246`	`+ $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`public function testSessionIsMigratedByDefault()`
`@@ -289,7 +289,7 @@ public function testSessionIsMigratedByDefault()`
`289`	`289`	`$request = new Request();`
`290`	`290`	`$request->setSession($session);`
`291`	`291`
`292`		`- $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));`
	`292`	`+ $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent()`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ public function testInvalidCsrfToken($invalidToken)`
`264`	`264`	`$csrfTokenManager`
`265`	`265`	`);`
`266`	`266`
`267`		`- $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST));`
	`267`	`+ $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`public function postOnlyDataProvider(): array`