Make use of the nullsafe operator

Author: derrabus

Controller/ControllerResolver.php

@@ -36,9 +36,7 @@ public function __construct(LoggerInterface $logger = null)
     public function getController(Request $request): callable|false
     {
         if (!$controller = $request->attributes->get('_controller')) {
-            if (null !== $this->logger) {
-                $this->logger->warning('Unable to look for the controller as the "_controller" parameter is missing.');
-            }
+            $this->logger?->warning('Unable to look for the controller as the "_controller" parameter is missing.');
 
             return false;
         }

DataCollector/DumpDataCollector.php

@@ -69,9 +69,7 @@ public function __clone()
 
     public function dump(Data $data)
     {
-        if ($this->stopwatch) {
-            $this->stopwatch->start('dump');
-        }
+        $this->stopwatch?->start('dump');
 
         ['name' => $name, 'file' => $file, 'line' => $line, 'file_excerpt' => $fileExcerpt] = $this->sourceContextProvider->getContext();
 
@@ -91,9 +89,7 @@ public function dump(Data $data)
         $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');
         ++$this->dataCount;
 
-        if ($this->stopwatch) {
-            $this->stopwatch->stop('dump');
-        }
+        $this->stopwatch?->stop('dump');
     }
 
     public function collect(Request $request, Response $response, \Throwable $exception = null)
@@ -133,9 +129,7 @@ public function collect(Request $request, Response $response, \Throwable $except
 
     public function reset()
     {
-        if ($this->stopwatch) {
-            $this->stopwatch->reset();
-        }
+        $this->stopwatch?->reset();
         $this->data = [];
         $this->dataCount = 0;
         $this->isCollected = true;

DataCollector/TimeDataCollector.php

@@ -59,9 +59,7 @@ public function reset()
     {
         $this->data = [];
 
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->reset();
-        }
+        $this->stopwatch?->reset();
     }
 
     /**

EventListener/LocaleListener.php

@@ -76,9 +76,7 @@ private function setLocale(Request $request)
 
     private function setRouterContext(Request $request)
     {
-        if (null !== $this->router) {
-            $this->router->getContext()->setParameter('_locale', $request->getLocale());
-        }
+        $this->router?->getContext()->setParameter('_locale', $request->getLocale());
     }
 
     public static function getSubscribedEvents(): array

EventListener/RouterListener.php

@@ -108,14 +108,12 @@ public function onKernelRequest(RequestEvent $event)
                 $parameters = $this->matcher->match($request->getPathInfo());
             }
 
-            if (null !== $this->logger) {
-                $this->logger->info('Matched route "{route}".', [
-                    'route' => $parameters['_route'] ?? 'n/a',
-                    'route_parameters' => $parameters,
-                    'request_uri' => $request->getUri(),
-                    'method' => $request->getMethod(),
-                ]);
-            }
+            $this->logger?->info('Matched route "{route}".', [
+                'route' => $parameters['_route'] ?? 'n/a',
+                'route_parameters' => $parameters,
+                'request_uri' => $request->getUri(),
+                'method' => $request->getMethod(),
+            ]);
 
             $request->attributes->add($parameters);
             unset($parameters['_route'], $parameters['_controller']);

HttpCache/HttpCache.php

@@ -449,9 +449,7 @@ protected function fetch(Request $request, bool $catch = false): Response
      */
     protected function forward(Request $request, bool $catch = false, Response $entry = null)
     {
-        if ($this->surrogate) {
-            $this->surrogate->addSurrogateCapability($request);
-        }
+        $this->surrogate?->addSurrogateCapability($request);
 
         // always a "master" request (as the real master request can be in cache)
         $response = SubRequestHandler::handle($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST, $catch);

Profiler/Profile.php

@@ -78,7 +78,7 @@ public function getParent(): ?self
      */
     public function getParentToken(): ?string
     {
-        return $this->parent ? $this->parent->getToken() : null;
+        return $this->parent?->getToken();
     }
 
     /**

Tests/HttpCache/HttpCacheTestCase.php

@@ -55,9 +55,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        if ($this->cache) {
-            $this->cache->getStore()->cleanup();
-        }
+        $this->cache?->getStore()->cleanup();
         $this->kernel = null;
         $this->cache = null;
         $this->caches = null;