Leverage arrow function syntax for closure

tigitz · nicolas-grekas · commit 1d084b8bbb9c · 2023-01-13T10:22:59.000+01:00
diff --git a/Authentication/AuthenticatorManager.php b/Authentication/AuthenticatorManager.php
@@ -76,7 +76,7 @@ public function __construct(iterable $authenticators, TokenStorageInterface $tok
     public function authenticateUser(UserInterface $user, AuthenticatorInterface $authenticator, Request $request, array $badges = []): ?Response
     {
         // create an authentication token for the User
-        $passport = new SelfValidatingPassport(new UserBadge($user->getUserIdentifier(), function () use ($user) { return $user; }), $badges);
+        $passport = new SelfValidatingPassport(new UserBadge($user->getUserIdentifier(), fn () => $user), $badges);
         $token = $authenticator->createToken($passport, $this->firewallName);
 
         // announce the authentication token
diff --git a/Authenticator/RememberMeAuthenticator.php b/Authenticator/RememberMeAuthenticator.php
@@ -87,9 +87,7 @@ public function authenticate(Request $request): Passport
 
         $rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);
 
-        $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {
-            return $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie);
-        });
+        $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), fn () => $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie));
 
         return new SelfValidatingPassport($userBadge);
     }
diff --git a/Tests/Authentication/AuthenticatorManagerTest.php b/Tests/Authentication/AuthenticatorManagerTest.php
@@ -101,7 +101,7 @@ public function testAuthenticateRequest($matchingAuthenticatorIndex)
 
         $authenticators[($matchingAuthenticatorIndex + 1) % 2]->expects($this->never())->method('authenticate');
 
-        $matchingAuthenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $matchingAuthenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
 
         $listenerCalled = false;
         $this->eventDispatcher->addListener(CheckPassportEvent::class, function (CheckPassportEvent $event) use (&$listenerCalled, $matchingAuthenticator) {
@@ -129,7 +129,7 @@ public function testNoCredentialsValidated()
         $authenticator = $this->createAuthenticator();
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new Passport(new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('pass')));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new Passport(new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('pass')));
 
         $authenticator->expects($this->once())
             ->method('onAuthenticationFailure')
@@ -146,9 +146,7 @@ public function testRequiredBadgeMissing()
 
         $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter')));
 
-        $authenticator->expects($this->once())->method('onAuthenticationFailure')->with($this->anything(), $this->callback(function ($exception) {
-            return 'Authentication failed; Some badges marked as required by the firewall config are not available on the passport: "'.CsrfTokenBadge::class.'".' === $exception->getMessage();
-        }));
+        $authenticator->expects($this->once())->method('onAuthenticationFailure')->with($this->anything(), $this->callback(fn ($exception) => 'Authentication failed; Some badges marked as required by the firewall config are not available on the passport: "'.CsrfTokenBadge::class.'".' === $exception->getMessage()));
 
         $manager = $this->createManager([$authenticator], 'main', true, [CsrfTokenBadge::class]);
         $manager->authenticateRequest($this->request);
@@ -178,7 +176,7 @@ public function testEraseCredentials($eraseCredentials)
         $authenticator = $this->createAuthenticator();
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
 
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
@@ -199,7 +197,7 @@ public function testAuthenticateRequestCanModifyTokenFromEvent()
         $authenticator = $this->createAuthenticator();
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
 
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
@@ -257,7 +255,7 @@ public function testInteractiveAuthenticator()
         $authenticator->expects($this->any())->method('isInteractive')->willReturn(true);
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
         $this->tokenStorage->expects($this->once())->method('setToken')->with($this->token);
@@ -278,7 +276,7 @@ public function testLegacyInteractiveAuthenticator()
         $authenticator->expects($this->any())->method('isInteractive')->willReturn(true);
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
         $this->tokenStorage->expects($this->once())->method('setToken')->with($this->token);
@@ -303,9 +301,7 @@ public function testAuthenticateRequestHidesInvalidUserExceptions()
 
         $authenticator->expects($this->any())
             ->method('onAuthenticationFailure')
-            ->with($this->equalTo($this->request), $this->callback(function ($e) use ($invalidUserException) {
-                return $e instanceof BadCredentialsException && $invalidUserException === $e->getPrevious();
-            }))
+            ->with($this->equalTo($this->request), $this->callback(fn ($e) => $e instanceof BadCredentialsException && $invalidUserException === $e->getPrevious()))
             ->willReturn($this->response);
 
         $manager = $this->createManager([$authenticator]);
@@ -319,7 +315,7 @@ public function testLogsUseTheDecoratedAuthenticatorWhenItIsTraceable()
         $authenticator->expects($this->any())->method('isInteractive')->willReturn(true);
         $this->request->attributes->set('_security_authenticators', [new TraceableAuthenticator($authenticator)]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
         $this->tokenStorage->expects($this->once())->method('setToken')->with($this->token);
diff --git a/Tests/Authenticator/AbstractAuthenticatorTest.php b/Tests/Authenticator/AbstractAuthenticatorTest.php
@@ -30,7 +30,7 @@ public function testCreateToken()
         $authenticator = new ConcreteAuthenticator();
         $this->assertInstanceOf(
             PostAuthenticationToken::class,
-            $authenticator->createToken(new SelfValidatingPassport(new UserBadge('dummy', function () { return new InMemoryUser('robin', 'hood'); })), 'dummy')
+            $authenticator->createToken(new SelfValidatingPassport(new UserBadge('dummy', fn () => new InMemoryUser('robin', 'hood'))), 'dummy')
         );
     }
 }
diff --git a/Tests/Authenticator/Passport/Badge/UserBadgeTest.php b/Tests/Authenticator/Passport/Badge/UserBadgeTest.php
@@ -19,7 +19,7 @@ class UserBadgeTest extends TestCase
 {
     public function testUserNotFound()
     {
-        $badge = new UserBadge('dummy', function () { return null; });
+        $badge = new UserBadge('dummy', fn () => null);
         $this->expectException(UserNotFoundException::class);
         $badge->getUser();
     }
diff --git a/Tests/Authenticator/RememberMeAuthenticatorTest.php b/Tests/Authenticator/RememberMeAuthenticatorTest.php
@@ -69,9 +69,7 @@ public function testAuthenticate()
         $request = Request::create('/', 'GET', [], ['_remember_me_cookie' => $rememberMeDetails->toString()]);
         $passport = $this->authenticator->authenticate($request);
 
-        $this->rememberMeHandler->expects($this->once())->method('consumeRememberMeCookie')->with($this->callback(function ($arg) use ($rememberMeDetails) {
-            return $rememberMeDetails == $arg;
-        }));
+        $this->rememberMeHandler->expects($this->once())->method('consumeRememberMeCookie')->with($this->callback(fn ($arg) => $rememberMeDetails == $arg));
         $passport->getUser(); // trigger the user loader
     }
 
diff --git a/Tests/EventListener/CheckCredentialsListenerTest.php b/Tests/EventListener/CheckCredentialsListenerTest.php
@@ -55,7 +55,7 @@ public function testPasswordAuthenticated($password, $passwordValid, $result)
         }
 
         $credentials = new PasswordCredentials($password);
-        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', function () { return $this->user; }), $credentials)));
+        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', fn () => $this->user), $credentials)));
 
         if (true === $result) {
             $this->assertTrue($credentials->isResolved());
@@ -75,7 +75,7 @@ public function testEmptyPassword()
 
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
-        $event = $this->createEvent(new Passport(new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('')));
+        $event = $this->createEvent(new Passport(new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('')));
         $this->listener->checkPassport($event);
     }
 
@@ -90,10 +90,8 @@ public function testCustomAuthenticated($result)
             $this->expectException(BadCredentialsException::class);
         }
 
-        $credentials = new CustomCredentials(function () use ($result) {
-            return $result;
-        }, ['password' => 'foo']);
-        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', function () { return $this->user; }), $credentials)));
+        $credentials = new CustomCredentials(fn () => $result, ['password' => 'foo']);
+        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', fn () => $this->user), $credentials)));
 
         if (true === $result) {
             $this->assertTrue($credentials->isResolved());
@@ -110,7 +108,7 @@ public function testNoCredentialsBadgeProvided()
     {
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $this->listener->checkPassport($event);
     }
 
@@ -121,7 +119,7 @@ public function testAddsPasswordUpgradeBadge()
 
         $this->hasherFactory->expects($this->any())->method('getPasswordHasher')->with($this->identicalTo($this->user))->willReturn($hasher);
 
-        $passport = new Passport(new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('ThePa$$word'));
+        $passport = new Passport(new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'));
         $this->listener->checkPassport($this->createEvent($passport));
 
         $this->assertTrue($passport->hasBadge(PasswordUpgradeBadge::class));
@@ -137,7 +135,7 @@ public function testAddsNoPasswordUpgradeBadgeIfItAlreadyExists()
 
         $passport = $this->getMockBuilder(Passport::class)
             ->setMethods(['addBadge'])
-            ->setConstructorArgs([new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
+            ->setConstructorArgs([new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
             ->getMock();
 
         $passport->expects($this->never())->method('addBadge')->with($this->isInstanceOf(PasswordUpgradeBadge::class));
@@ -154,7 +152,7 @@ public function testAddsNoPasswordUpgradeBadgeIfPasswordIsInvalid()
 
         $passport = $this->getMockBuilder(Passport::class)
             ->setMethods(['addBadge'])
-            ->setConstructorArgs([new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
+            ->setConstructorArgs([new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
             ->getMock();
 
         $passport->expects($this->never())->method('addBadge')->with($this->isInstanceOf(PasswordUpgradeBadge::class));
diff --git a/Tests/EventListener/CheckRememberMeConditionsListenerTest.php b/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
@@ -96,6 +96,6 @@ private function createLoginSuccessfulEvent(Passport $passport)
 
     private function createPassport(array $badges = null)
     {
-        return new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); }), $badges ?? [new RememberMeBadge()]);
+        return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges ?? [new RememberMeBadge()]);
     }
 }
diff --git a/Tests/EventListener/CsrfProtectionListenerTest.php b/Tests/EventListener/CsrfProtectionListenerTest.php
@@ -76,7 +76,7 @@ private function createEvent($passport)
 
     private function createPassport(?CsrfTokenBadge $badge)
     {
-        $passport = new SelfValidatingPassport(new UserBadge('wouter', function ($username) { return new InMemoryUser($username, 'pass'); }));
+        $passport = new SelfValidatingPassport(new UserBadge('wouter', fn ($username) => new InMemoryUser($username, 'pass')));
         if ($badge) {
             $passport->addBadge($badge);
         }
diff --git a/Tests/EventListener/PasswordMigratingListenerTest.php b/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -60,10 +60,10 @@ public function testUnsupportedEvents($event)
     public function provideUnsupportedEvents()
     {
         // no password upgrade badge
-        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(UserInterface::class); })))];
+        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->createMock(UserInterface::class))))];
 
         // blank password
-        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(TestPasswordAuthenticatedUser::class); }), [new PasswordUpgradeBadge('', $this->createPasswordUpgrader())]))];
+        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->createMock(TestPasswordAuthenticatedUser::class)), [new PasswordUpgradeBadge('', $this->createPasswordUpgrader())]))];
     }
 
     public function testUpgradeWithUpgrader()
@@ -74,7 +74,7 @@ public function testUpgradeWithUpgrader()
             ->with($this->user, 'new-hash')
         ;
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word', $passwordUpgrader)]));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PasswordUpgradeBadge('pa$$word', $passwordUpgrader)]));
         $this->listener->onLoginSuccess($event);
     }
 
@@ -101,7 +101,7 @@ public function testUserWithoutPassword()
 
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word')]));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PasswordUpgradeBadge('pa$$word')]));
         $this->listener->onLoginSuccess($event);
     }
 
diff --git a/Tests/EventListener/RememberMeListenerTest.php b/Tests/EventListener/RememberMeListenerTest.php
@@ -79,6 +79,6 @@ private function createPassport(array $badges = null)
             $badges = [$badge];
         }
 
-        return new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); }), $badges);
+        return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges);
     }
 }
diff --git a/Tests/EventListener/SessionStrategyListenerTest.php b/Tests/EventListener/SessionStrategyListenerTest.php
@@ -64,7 +64,7 @@ public function testStatelessFirewalls()
 
     private function createEvent($firewallName)
     {
-        return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); })), $this->token, $this->request, null, $firewallName);
+        return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null))), $this->token, $this->request, null, $firewallName);
     }
 
     private function configurePreviousSession()
diff --git a/Tests/EventListener/UserCheckerListenerTest.php b/Tests/EventListener/UserCheckerListenerTest.php
@@ -47,7 +47,7 @@ public function testPreAuthenticatedBadge()
     {
         $this->userChecker->expects($this->never())->method('checkPreAuth');
 
-        $this->listener->preCheckCredentials($this->createCheckPassportEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PreAuthenticatedUserBadge()])));
+        $this->listener->preCheckCredentials($this->createCheckPassportEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PreAuthenticatedUserBadge()])));
     }
 
     public function testPostAuthValidCredentials()
@@ -59,7 +59,7 @@ public function testPostAuthValidCredentials()
 
     private function createCheckPassportEvent($passport = null)
     {
-        $passport ??= new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }));
+        $passport ??= new SelfValidatingPassport(new UserBadge('test', fn () => $this->user));
 
         return new CheckPassportEvent($this->createMock(AuthenticatorInterface::class), $passport);
     }
diff --git a/Tests/Firewall/ContextListenerTest.php b/Tests/Firewall/ContextListenerTest.php
@@ -359,7 +359,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
             $session->set('_security_session', $original);
         }
 
-        $factories = ['request_stack' => function () use ($requestStack) { return $requestStack; }];
+        $factories = ['request_stack' => fn () => $requestStack];
         $tokenStorage = new UsageTrackingTokenStorage(new TokenStorage(), new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
@@ -405,7 +405,7 @@ private function handleEventWithPreviousSession($userProviders, UserInterface $u
         $tokenStorage = new TokenStorage();
         $usageIndex = $session->getUsageIndex();
 
-        $factories = ['request_stack' => function () use ($requestStack) { return $requestStack; }];
+        $factories = ['request_stack' => fn () => $requestStack];
         $tokenStorage = new UsageTrackingTokenStorage($tokenStorage, new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
diff --git a/Tests/Firewall/SwitchUserListenerTest.php b/Tests/Firewall/SwitchUserListenerTest.php
diff --git a/Tests/LoginLink/LoginLinkHandlerTest.php b/Tests/LoginLink/LoginLinkHandlerTest.php
diff --git a/Tests/RememberMe/PersistentRememberMeHandlerTest.php b/Tests/RememberMe/PersistentRememberMeHandlerTest.php

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function __construct(iterable $authenticators, TokenStorageInterface $tok`
`76`	`76`	`public function authenticateUser(UserInterface $user, AuthenticatorInterface $authenticator, Request $request, array $badges = []): ?Response`
`77`	`77`	`{`
`78`	`78`	`// create an authentication token for the User`
`79`		`- $passport = new SelfValidatingPassport(new UserBadge($user->getUserIdentifier(), function () use ($user) { return $user; }), $badges);`
	`79`	`+ $passport = new SelfValidatingPassport(new UserBadge($user->getUserIdentifier(), fn () => $user), $badges);`
`80`	`80`	`$token = $authenticator->createToken($passport, $this->firewallName);`
`81`	`81`
`82`	`82`	`// announce the authentication token`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,7 @@ public function authenticate(Request $request): Passport`
`87`	`87`
`88`	`88`	`$rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);`
`89`	`89`
`90`		`- $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {`
`91`		`- return $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie);`
`92`		`- });`
	`90`	`+ $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), fn () => $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie));`
`93`	`91`
`94`	`92`	`return new SelfValidatingPassport($userBadge);`
`95`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testCreateToken()`
`30`	`30`	`$authenticator = new ConcreteAuthenticator();`
`31`	`31`	`$this->assertInstanceOf(`
`32`	`32`	`PostAuthenticationToken::class,`
`33`		`- $authenticator->createToken(new SelfValidatingPassport(new UserBadge('dummy', function () { return new InMemoryUser('robin', 'hood'); })), 'dummy')`
	`33`	`+ $authenticator->createToken(new SelfValidatingPassport(new UserBadge('dummy', fn () => new InMemoryUser('robin', 'hood'))), 'dummy')`
`34`	`34`	`);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class UserBadgeTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`public function testUserNotFound()`
`21`	`21`	`{`
`22`		`- $badge = new UserBadge('dummy', function () { return null; });`
	`22`	`+ $badge = new UserBadge('dummy', fn () => null);`
`23`	`23`	`$this->expectException(UserNotFoundException::class);`
`24`	`24`	`$badge->getUser();`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ public function testAuthenticate()`
`69`	`69`	`$request = Request::create('/', 'GET', [], ['_remember_me_cookie' => $rememberMeDetails->toString()]);`
`70`	`70`	`$passport = $this->authenticator->authenticate($request);`
`71`	`71`
`72`		`- $this->rememberMeHandler->expects($this->once())->method('consumeRememberMeCookie')->with($this->callback(function ($arg) use ($rememberMeDetails) {`
`73`		`- return $rememberMeDetails == $arg;`
`74`		`- }));`
	`72`	`+ $this->rememberMeHandler->expects($this->once())->method('consumeRememberMeCookie')->with($this->callback(fn ($arg) => $rememberMeDetails == $arg));`
`75`	`73`	`$passport->getUser(); // trigger the user loader`
`76`	`74`	`}`
`77`	`75`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@ private function createLoginSuccessfulEvent(Passport $passport)`
`96`	`96`
`97`	`97`	`private function createPassport(array $badges = null)`
`98`	`98`	`{`
`99`		`- return new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); }), $badges ?? [new RememberMeBadge()]);`
	`99`	`+ return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges ?? [new RememberMeBadge()]);`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private function createEvent($passport)`
`76`	`76`
`77`	`77`	`private function createPassport(?CsrfTokenBadge $badge)`
`78`	`78`	`{`
`79`		`- $passport = new SelfValidatingPassport(new UserBadge('wouter', function ($username) { return new InMemoryUser($username, 'pass'); }));`
	`79`	`+ $passport = new SelfValidatingPassport(new UserBadge('wouter', fn ($username) => new InMemoryUser($username, 'pass')));`
`80`	`80`	`if ($badge) {`
`81`	`81`	`$passport->addBadge($badge);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,10 @@ public function testUnsupportedEvents($event)`
`60`	`60`	`public function provideUnsupportedEvents()`
`61`	`61`	`{`
`62`	`62`	`// no password upgrade badge`
`63`		`- yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(UserInterface::class); })))];`
	`63`	`+ yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->createMock(UserInterface::class))))];`
`64`	`64`
`65`	`65`	`// blank password`
`66`		`- yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(TestPasswordAuthenticatedUser::class); }), [new PasswordUpgradeBadge('', $this->createPasswordUpgrader())]))];`
	`66`	`+ yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->createMock(TestPasswordAuthenticatedUser::class)), [new PasswordUpgradeBadge('', $this->createPasswordUpgrader())]))];`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function testUpgradeWithUpgrader()`
`@@ -74,7 +74,7 @@ public function testUpgradeWithUpgrader()`
`74`	`74`	`->with($this->user, 'new-hash')`
`75`	`75`	`;`
`76`	`76`
`77`		`- $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word', $passwordUpgrader)]));`
	`77`	`+ $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PasswordUpgradeBadge('pa$$word', $passwordUpgrader)]));`
`78`	`78`	`$this->listener->onLoginSuccess($event);`
`79`	`79`	`}`
`80`	`80`
`@@ -101,7 +101,7 @@ public function testUserWithoutPassword()`
`101`	`101`
`102`	`102`	`$this->hasherFactory->expects($this->never())->method('getPasswordHasher');`
`103`	`103`
`104`		`- $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word')]));`
	`104`	`+ $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PasswordUpgradeBadge('pa$$word')]));`
`105`	`105`	`$this->listener->onLoginSuccess($event);`
`106`	`106`	`}`
`107`	`107`