Merge branch '4.4' into 5.2

* 4.4: [CS] Replace easy occurences of ?: with ??
symfony · Apr 7, 2021 · 267840a · 267840a
2 parents eb7cf73 + 2b2e821
commit 267840a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Firewall/ContextListener.php b/Firewall/ContextListener.php
@@ -69,7 +69,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
         $this->logger = $logger;
         $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
 
-        $this->trustResolver = $trustResolver ?: new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class);
+        $this->trustResolver = $trustResolver ?? new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class);
         $this->sessionTrackerEnabler = $sessionTrackerEnabler;
     }
 

diff --git a/Tests/Firewall/ContextListenerTest.php b/Tests/Firewall/ContextListenerTest.php
@@ -417,7 +417,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
 
     private function handleEventWithPreviousSession($userProviders, UserInterface $user = null, RememberMeServicesInterface $rememberMeServices = null)
     {
-        $tokenUser = $user ?: new User('foo', 'bar');
+        $tokenUser = $user ?? new User('foo', 'bar');
         $session = new Session(new MockArraySessionStorage());
         $session->set('_security_context_key', serialize(new UsernamePasswordToken($tokenUser, '', 'context_key', ['ROLE_USER'])));
 

diff --git a/Tests/Firewall/ExceptionListenerTest.php b/Tests/Firewall/ExceptionListenerTest.php
@@ -184,7 +184,7 @@ public function getAccessDeniedExceptionProvider()
     private function createEntryPoint(Response $response = null)
     {
         $entryPoint = $this->createMock(AuthenticationEntryPointInterface::class);
-        $entryPoint->expects($this->once())->method('start')->willReturn($response ?: new Response('OK'));
+        $entryPoint->expects($this->once())->method('start')->willReturn($response ?? new Response('OK'));
 
         return $entryPoint;
     }
@@ -209,9 +209,9 @@ private function createEvent(\Exception $exception, $kernel = null)
     private function createExceptionListener(TokenStorageInterface $tokenStorage = null, AuthenticationTrustResolverInterface $trustResolver = null, HttpUtils $httpUtils = null, AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null)
     {
         return new ExceptionListener(
-            $tokenStorage ?: $this->createMock(TokenStorageInterface::class),
-            $trustResolver ?: $this->createMock(AuthenticationTrustResolverInterface::class),
-            $httpUtils ?: $this->createMock(HttpUtils::class),
+            $tokenStorage ?? $this->createMock(TokenStorageInterface::class),
+            $trustResolver ?? $this->createMock(AuthenticationTrustResolverInterface::class),
+            $httpUtils ?? $this->createMock(HttpUtils::class),
             'key',
             $authenticationEntryPoint,
             $errorPage,