Use ??= more

Author: nicolas-grekas

Firewall/AccessListener.php

@@ -79,10 +79,7 @@ public function authenticate(RequestEvent $event)
             return;
         }
 
-        $token = $this->tokenStorage->getToken();
-        if (null === $token) {
-            $token = new NullToken();
-        }
+        $token = $this->tokenStorage->getToken() ?? new NullToken();
 
         if (!$this->accessDecisionManager->decide($token, $attributes, $request, true)) {
             throw $this->createAccessDeniedException($request, $attributes);

HttpUtils.php

@@ -74,9 +74,7 @@ public function createRequest(Request $request, string $path): Request
 
         static $setSession;
 
-        if (null === $setSession) {
-            $setSession = \Closure::bind(static function ($newRequest, $request) { $newRequest->session = $request->session; }, null, Request::class);
-        }
+        $setSession ??= \Closure::bind(static function ($newRequest, $request) { $newRequest->session = $request->session; }, null, Request::class);
         $setSession($newRequest, $request);
 
         if ($request->attributes->has(SecurityRequestAttributes::AUTHENTICATION_ERROR)) {

Impersonate/ImpersonateUrlGenerator.php

@@ -65,9 +65,7 @@ private function buildExitPath(string $targetUri = null): string
             throw new \LogicException('Unable to generate the impersonate exit URL without a firewall configured for the user switch.');
         }
 
-        if (null === $targetUri) {
-            $targetUri = $request->getRequestUri();
-        }
+        $targetUri ??= $request->getRequestUri();
 
         $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE], '', '&');
 

Tests/EventListener/RememberMeListenerTest.php

@@ -66,9 +66,7 @@ public function testCredentialsInvalid()
 
     private function createLoginSuccessfulEvent(Passport $passport = null)
     {
-        if (null === $passport) {
-            $passport = $this->createPassport();
-        }
+        $passport ??= $this->createPassport();
 
         return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), $passport, $this->createMock(TokenInterface::class), $this->request, $this->response, 'main_firewall');
     }

Tests/EventListener/UserCheckerListenerTest.php

@@ -59,9 +59,7 @@ public function testPostAuthValidCredentials()
 
     private function createCheckPassportEvent($passport = null)
     {
-        if (null === $passport) {
-            $passport = new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }));
-        }
+        $passport ??= new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }));
 
         return new CheckPassportEvent($this->createMock(AuthenticatorInterface::class), $passport);
     }

Tests/Firewall/ExceptionListenerTest.php

@@ -221,9 +221,7 @@ private function createTrustResolver($fullFledged)
 
     private function createEvent(\Exception $exception, $kernel = null)
     {
-        if (null === $kernel) {
-            $kernel = $this->createMock(HttpKernelInterface::class);
-        }
+        $kernel ??= $this->createMock(HttpKernelInterface::class);
 
         return new ExceptionEvent($kernel, Request::create('/'), HttpKernelInterface::MAIN_REQUEST, $exception);
     }