Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 6530589fc40c · 2021-11-29T16:50:32.000+01:00
* 5.4:
  [Security] fix merge
diff --git a/Tests/Authenticator/RemoteUserAuthenticatorTest.php b/Tests/Authenticator/RemoteUserAuthenticatorTest.php
@@ -41,7 +41,7 @@ public function testSupportNoUser()
     public function testSupportTokenStorageWithToken()
     {
         $tokenStorage = new TokenStorage();
-        $tokenStorage->setToken(new PreAuthenticatedToken('username', 'credentials', 'main'));
+        $tokenStorage->setToken(new PreAuthenticatedToken(new InMemoryUser('username', null), 'main'));
 
         $authenticator = new RemoteUserAuthenticator(new InMemoryUserProvider(), $tokenStorage, 'main');
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testSupportNoUser()`
`41`	`41`	`public function testSupportTokenStorageWithToken()`
`42`	`42`	`{`
`43`	`43`	`$tokenStorage = new TokenStorage();`
`44`		`- $tokenStorage->setToken(new PreAuthenticatedToken('username', 'credentials', 'main'));`
	`44`	`+ $tokenStorage->setToken(new PreAuthenticatedToken(new InMemoryUser('username', null), 'main'));`
`45`	`45`
`46`	`46`	`$authenticator = new RemoteUserAuthenticator(new InMemoryUserProvider(), $tokenStorage, 'main');`
`47`	`47`