Bump minimum version of PHP to 8.1

nicolas-grekas · fabpot · commit 64a71d6a9600 · 2022-02-25T12:15:52.000+01:00
diff --git a/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/Authenticator/AbstractPreAuthenticatedAuthenticator.php
@@ -92,7 +92,7 @@ public function supports(Request $request): ?bool
     public function authenticate(Request $request): Passport
     {
         return new SelfValidatingPassport(
-            new UserBadge($request->attributes->get('_pre_authenticated_username'), [$this->userProvider, 'loadUserByIdentifier']),
+            new UserBadge($request->attributes->get('_pre_authenticated_username'), $this->userProvider->loadUserByIdentifier(...)),
             [new PreAuthenticatedUserBadge()]
         );
     }
diff --git a/Authenticator/FormLoginAuthenticator.php b/Authenticator/FormLoginAuthenticator.php
@@ -83,7 +83,7 @@ public function authenticate(Request $request): Passport
         $credentials = $this->getCredentials($request);
 
         $passport = new Passport(
-            new UserBadge($credentials['username'], [$this->userProvider, 'loadUserByIdentifier']),
+            new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...)),
             new PasswordCredentials($credentials['password']),
             [new RememberMeBadge()]
         );
diff --git a/Authenticator/HttpBasicAuthenticator.php b/Authenticator/HttpBasicAuthenticator.php
@@ -64,7 +64,7 @@ public function authenticate(Request $request): Passport
         $password = $request->headers->get('PHP_AUTH_PW', '');
 
         $passport = new Passport(
-            new UserBadge($username, [$this->userProvider, 'loadUserByIdentifier']),
+            new UserBadge($username, $this->userProvider->loadUserByIdentifier(...)),
             new PasswordCredentials($password)
         );
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
diff --git a/Authenticator/JsonLoginAuthenticator.php b/Authenticator/JsonLoginAuthenticator.php
@@ -87,7 +87,7 @@ public function authenticate(Request $request): Passport
         }
 
         $passport = new Passport(
-            new UserBadge($credentials['username'], [$this->userProvider, 'loadUserByIdentifier']),
+            new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...)),
             new PasswordCredentials($credentials['password'])
         );
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
diff --git a/Authenticator/Passport/Credentials/CustomCredentials.php b/Authenticator/Passport/Credentials/CustomCredentials.php
@@ -34,7 +34,7 @@ class CustomCredentials implements CredentialsInterface
      */
     public function __construct(callable $customCredentialsChecker, mixed $credentials)
     {
-        $this->customCredentialsChecker = $customCredentialsChecker instanceof \Closure ? $customCredentialsChecker : \Closure::fromCallable($customCredentialsChecker);
+        $this->customCredentialsChecker = $customCredentialsChecker(...);
         $this->credentials = $credentials;
     }
 
diff --git a/EventListener/UserProviderListener.php b/EventListener/UserProviderListener.php
@@ -45,6 +45,6 @@ public function checkPassport(CheckPassportEvent $event): void
             return;
         }
 
-        $badge->setUserLoader([$this->userProvider, 'loadUserByIdentifier']);
+        $badge->setUserLoader($this->userProvider->loadUserByIdentifier(...));
     }
 }
diff --git a/Firewall/ContextListener.php b/Firewall/ContextListener.php
@@ -68,7 +68,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
         $this->dispatcher = $dispatcher;
 
         $this->trustResolver = $trustResolver ?? new AuthenticationTrustResolver();
-        $this->sessionTrackerEnabler = null === $sessionTrackerEnabler || $sessionTrackerEnabler instanceof \Closure ? $sessionTrackerEnabler : \Closure::fromCallable($sessionTrackerEnabler);
+        $this->sessionTrackerEnabler = null === $sessionTrackerEnabler ? null : $sessionTrackerEnabler(...);
     }
 
     /**
@@ -85,7 +85,7 @@ public function supports(Request $request): ?bool
     public function authenticate(RequestEvent $event)
     {
         if (!$this->registered && null !== $this->dispatcher && $event->isMainRequest()) {
-            $this->dispatcher->addListener(KernelEvents::RESPONSE, [$this, 'onKernelResponse']);
+            $this->dispatcher->addListener(KernelEvents::RESPONSE, $this->onKernelResponse(...));
             $this->registered = true;
         }
 
@@ -162,7 +162,7 @@ public function onKernelResponse(ResponseEvent $event)
             return;
         }
 
-        $this->dispatcher?->removeListener(KernelEvents::RESPONSE, [$this, 'onKernelResponse']);
+        $this->dispatcher?->removeListener(KernelEvents::RESPONSE, $this->onKernelResponse(...));
         $this->registered = false;
         $session = $request->getSession();
         $sessionId = $session->getId();
diff --git a/Firewall/ExceptionListener.php b/Firewall/ExceptionListener.php
@@ -75,15 +75,15 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationT
      */
     public function register(EventDispatcherInterface $dispatcher)
     {
-        $dispatcher->addListener(KernelEvents::EXCEPTION, [$this, 'onKernelException'], 1);
+        $dispatcher->addListener(KernelEvents::EXCEPTION, $this->onKernelException(...), 1);
     }
 
     /**
      * Unregisters the dispatcher.
      */
     public function unregister(EventDispatcherInterface $dispatcher)
     {
-        $dispatcher->removeListener(KernelEvents::EXCEPTION, [$this, 'onKernelException']);
+        $dispatcher->removeListener(KernelEvents::EXCEPTION, $this->onKernelException(...));
     }
 
     /**
diff --git a/Tests/EventListener/PasswordMigratingListenerTest.php b/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -91,7 +91,7 @@ public function testUpgradeWithoutUpgrader()
         $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', [$userLoader, 'loadUserByIdentifier']), [new PasswordUpgradeBadge('pa$$word')]));
         $this->listener->onLoginSuccess($event);
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', \Closure::fromCallable([$userLoader, 'loadUserByIdentifier'])), [new PasswordUpgradeBadge('pa$$word')]));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', $userLoader->loadUserByIdentifier(...)), [new PasswordUpgradeBadge('pa$$word')]));
         $this->listener->onLoginSuccess($event);
     }
 
diff --git a/Tests/EventListener/UserProviderListenerTest.php b/Tests/EventListener/UserProviderListenerTest.php
@@ -37,9 +37,6 @@ public function testSetUserProvider()
 
         $this->listener->checkPassport(new CheckPassportEvent($this->createMock(AuthenticatorInterface::class), $passport));
 
-        $badge = $passport->getBadge(UserBadge::class);
-        $this->assertEquals([$this->userProvider, 'loadUserByIdentifier'], $badge->getUserLoader());
-
         $user = new InMemoryUser('wouter', null);
         $this->userProvider->createUser($user);
         $this->assertTrue($user->isEqualTo($passport->getUser()));
diff --git a/Tests/Firewall/ContextListenerTest.php b/Tests/Firewall/ContextListenerTest.php
@@ -175,7 +175,7 @@ public function testHandleAddsKernelResponseListener()
 
         $dispatcher->expects($this->once())
             ->method('addListener')
-            ->with(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+            ->with(KernelEvents::RESPONSE, $listener->onKernelResponse(...));
 
         $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
     }
@@ -197,7 +197,7 @@ public function testOnKernelResponseListenerRemovesItself()
 
         $dispatcher->expects($this->once())
             ->method('removeListener')
-            ->with(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+            ->with(KernelEvents::RESPONSE, $listener->onKernelResponse(...));
 
         $listener->onKernelResponse($event);
     }
@@ -299,7 +299,7 @@ public function testWithPreviousNotStartedSession()
         $usageIndex = $session->getUsageIndex();
 
         $tokenStorage = new TokenStorage();
-        $listener = new ContextListener($tokenStorage, [], 'context_key', null, null, null, [$tokenStorage, 'getToken']);
+        $listener = new ContextListener($tokenStorage, [], 'context_key', null, null, null, $tokenStorage->getToken(...));
         $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
 
         $this->assertSame($usageIndex, $session->getUsageIndex());
@@ -318,7 +318,7 @@ public function testSessionIsNotReported()
 
         $tokenStorage = new TokenStorage();
 
-        $listener = new ContextListener($tokenStorage, [], 'context_key', null, null, null, [$tokenStorage, 'getToken']);
+        $listener = new ContextListener($tokenStorage, [], 'context_key', null, null, null, $tokenStorage->getToken(...));
         $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
     }
 
@@ -354,7 +354,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
             new Response()
         );
 
-        $listener = new ContextListener($tokenStorage, [], 'session', null, new EventDispatcher(), null, [$tokenStorage, 'enableUsageTracking']);
+        $listener = new ContextListener($tokenStorage, [], 'session', null, new EventDispatcher(), null, $tokenStorage->enableUsageTracking(...));
         $listener->onKernelResponse($event);
 
         if ($session->getId() === $sessionId) {
@@ -385,7 +385,7 @@ private function handleEventWithPreviousSession($userProviders, UserInterface $u
         $tokenStorage = new UsageTrackingTokenStorage($tokenStorage, new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
-        $sessionTrackerEnabler = [$tokenStorage, 'enableUsageTracking'];
+        $sessionTrackerEnabler = $tokenStorage->enableUsageTracking(...);
 
         $listener = new ContextListener($tokenStorage, $userProviders, 'context_key', null, null, null, $sessionTrackerEnabler);
 
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "symfony/security-core": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4|^6.0",

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function supports(Request $request): ?bool`
`92`	`92`	`public function authenticate(Request $request): Passport`
`93`	`93`	`{`
`94`	`94`	`return new SelfValidatingPassport(`
`95`		`- new UserBadge($request->attributes->get('_pre_authenticated_username'), [$this->userProvider, 'loadUserByIdentifier']),`
	`95`	`+ new UserBadge($request->attributes->get('_pre_authenticated_username'), $this->userProvider->loadUserByIdentifier(...)),`
`96`	`96`	`[new PreAuthenticatedUserBadge()]`
`97`	`97`	`);`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function authenticate(Request $request): Passport`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`$passport = new Passport(`
`90`		`- new UserBadge($credentials['username'], [$this->userProvider, 'loadUserByIdentifier']),`
	`90`	`+ new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...)),`
`91`	`91`	`new PasswordCredentials($credentials['password'])`
`92`	`92`	`);`
`93`	`93`	`if ($this->userProvider instanceof PasswordUpgraderInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class CustomCredentials implements CredentialsInterface`
`34`	`34`	`*/`
`35`	`35`	`public function __construct(callable $customCredentialsChecker, mixed $credentials)`
`36`	`36`	`{`
`37`		`- $this->customCredentialsChecker = $customCredentialsChecker instanceof \Closure ? $customCredentialsChecker : \Closure::fromCallable($customCredentialsChecker);`
	`37`	`+ $this->customCredentialsChecker = $customCredentialsChecker(...);`
`38`	`38`	`$this->credentials = $credentials;`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ public function checkPassport(CheckPassportEvent $event): void`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`
`48`		`- $badge->setUserLoader([$this->userProvider, 'loadUserByIdentifier']);`
	`48`	`+ $badge->setUserLoader($this->userProvider->loadUserByIdentifier(...));`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP`
`68`	`68`	`$this->dispatcher = $dispatcher;`
`69`	`69`
`70`	`70`	`$this->trustResolver = $trustResolver ?? new AuthenticationTrustResolver();`
`71`		`- $this->sessionTrackerEnabler = null === $sessionTrackerEnabler \|\| $sessionTrackerEnabler instanceof \Closure ? $sessionTrackerEnabler : \Closure::fromCallable($sessionTrackerEnabler);`
	`71`	`+ $this->sessionTrackerEnabler = null === $sessionTrackerEnabler ? null : $sessionTrackerEnabler(...);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`@@ -85,7 +85,7 @@ public function supports(Request $request): ?bool`
`85`	`85`	`public function authenticate(RequestEvent $event)`
`86`	`86`	`{`
`87`	`87`	`if (!$this->registered && null !== $this->dispatcher && $event->isMainRequest()) {`
`88`		`- $this->dispatcher->addListener(KernelEvents::RESPONSE, [$this, 'onKernelResponse']);`
	`88`	`+ $this->dispatcher->addListener(KernelEvents::RESPONSE, $this->onKernelResponse(...));`
`89`	`89`	`$this->registered = true;`
`90`	`90`	`}`
`91`	`91`
`@@ -162,7 +162,7 @@ public function onKernelResponse(ResponseEvent $event)`
`162`	`162`	`return;`
`163`	`163`	`}`
`164`	`164`
`165`		`- $this->dispatcher?->removeListener(KernelEvents::RESPONSE, [$this, 'onKernelResponse']);`
	`165`	`+ $this->dispatcher?->removeListener(KernelEvents::RESPONSE, $this->onKernelResponse(...));`
`166`	`166`	`$this->registered = false;`
`167`	`167`	`$session = $request->getSession();`
`168`	`168`	`$sessionId = $session->getId();`
Original file line number	Diff line number	Diff line change
`@@ -75,15 +75,15 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationT`
`75`	`75`	`*/`
`76`	`76`	`public function register(EventDispatcherInterface $dispatcher)`
`77`	`77`	`{`
`78`		`- $dispatcher->addListener(KernelEvents::EXCEPTION, [$this, 'onKernelException'], 1);`
	`78`	`+ $dispatcher->addListener(KernelEvents::EXCEPTION, $this->onKernelException(...), 1);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
`82`	`82`	`* Unregisters the dispatcher.`
`83`	`83`	`*/`
`84`	`84`	`public function unregister(EventDispatcherInterface $dispatcher)`
`85`	`85`	`{`
`86`		`- $dispatcher->removeListener(KernelEvents::EXCEPTION, [$this, 'onKernelException']);`
	`86`	`+ $dispatcher->removeListener(KernelEvents::EXCEPTION, $this->onKernelException(...));`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function testUpgradeWithoutUpgrader()`
`91`	`91`	`$event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', [$userLoader, 'loadUserByIdentifier']), [new PasswordUpgradeBadge('pa$$word')]));`
`92`	`92`	`$this->listener->onLoginSuccess($event);`
`93`	`93`
`94`		`- $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', \Closure::fromCallable([$userLoader, 'loadUserByIdentifier'])), [new PasswordUpgradeBadge('pa$$word')]));`
	`94`	`+ $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', $userLoader->loadUserByIdentifier(...)), [new PasswordUpgradeBadge('pa$$word')]));`
`95`	`95`	`$this->listener->onLoginSuccess($event);`
`96`	`96`	`}`
`97`	`97`