Use ??= more

Author: nicolas-grekas

JsonResponse.php

@@ -44,9 +44,7 @@ public function __construct(mixed $data = null, int $status = 200, array $header
             throw new \TypeError(sprintf('"%s": If $json is set to true, argument $data must be a string or object implementing __toString(), "%s" given.', __METHOD__, get_debug_type($data)));
         }
 
-        if (null === $data) {
-            $data = new \ArrayObject();
-        }
+        $data ??= new \ArrayObject();
 
         $json ? $this->setJson($data) : $this->setData($data);
     }

Request.php

@@ -819,11 +819,7 @@ public function getScriptName(): string
      */
     public function getPathInfo(): string
     {
-        if (null === $this->pathInfo) {
-            $this->pathInfo = $this->preparePathInfo();
-        }
-
-        return $this->pathInfo;
+        return $this->pathInfo ??= $this->preparePathInfo();
     }
 
     /**
@@ -840,11 +836,7 @@ public function getPathInfo(): string
      */
     public function getBasePath(): string
     {
-        if (null === $this->basePath) {
-            $this->basePath = $this->prepareBasePath();
-        }
-
-        return $this->basePath;
+        return $this->basePath ??= $this->prepareBasePath();
     }
 
     /**
@@ -877,11 +869,7 @@ public function getBaseUrl(): string
      */
     private function getBaseUrlReal(): string
     {
-        if (null === $this->baseUrl) {
-            $this->baseUrl = $this->prepareBaseUrl();
-        }
-
-        return $this->baseUrl;
+        return $this->baseUrl ??= $this->prepareBaseUrl();
     }
 
     /**
@@ -982,11 +970,7 @@ public function getHttpHost(): string
      */
     public function getRequestUri(): string
     {
-        if (null === $this->requestUri) {
-            $this->requestUri = $this->prepareRequestUri();
-        }
-
-        return $this->requestUri;
+        return $this->requestUri ??= $this->prepareRequestUri();
     }
 
     /**
@@ -1315,9 +1299,7 @@ public function setFormat(?string $format, string|array $mimeTypes)
      */
     public function getRequestFormat(?string $default = 'html'): ?string
     {
-        if (null === $this->format) {
-            $this->format = $this->attributes->get('_format');
-        }
+        $this->format ??= $this->attributes->get('_format');
 
         return $this->format ?? $default;
     }
@@ -2037,9 +2019,7 @@ private function normalizeAndFilterClientIps(array $clientIps, string $ip): arra
                 unset($clientIps[$key]);
 
                 // Fallback to this when the client IP falls into the range of trusted proxies
-                if (null === $firstTrustedIp) {
-                    $firstTrustedIp = $clientIp;
-                }
+                $firstTrustedIp ??= $clientIp;
             }
         }
 

ResponseHeaderBag.php

@@ -168,9 +168,7 @@ public function setCookie(Cookie $cookie)
      */
     public function removeCookie(string $name, ?string $path = '/', string $domain = null)
     {
-        if (null === $path) {
-            $path = '/';
-        }
+        $path ??= '/';
 
         unset($this->cookies[$domain][$path][$name]);
 

Session/Storage/Handler/NativeFileSessionHandler.php

@@ -30,11 +30,7 @@ class NativeFileSessionHandler extends \SessionHandler
      */
     public function __construct(string $savePath = null)
     {
-        if (null === $savePath) {
-            $savePath = \ini_get('session.save_path');
-        }
-
-        $baseDir = $savePath;
+        $baseDir = $savePath ??= \ini_get('session.save_path');
 
         if ($count = substr_count($savePath, ';')) {
             if ($count > 2) {

Session/Storage/MockArraySessionStorage.php

@@ -176,11 +176,7 @@ public function setMetadataBag(MetadataBag $bag = null)
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/http-foundation', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
         }
-        if (null === $bag) {
-            $bag = new MetadataBag();
-        }
-
-        $this->metadataBag = $bag;
+        $this->metadataBag = $bag ?? new MetadataBag();
     }
 
     /**

Session/Storage/MockFileSessionStorage.php

@@ -32,9 +32,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
      */
     public function __construct(string $savePath = null, string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
     {
-        if (null === $savePath) {
-            $savePath = sys_get_temp_dir();
-        }
+        $savePath ??= sys_get_temp_dir();
 
         if (!is_dir($savePath) && !@mkdir($savePath, 0777, true) && !is_dir($savePath)) {
             throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $savePath));

Session/Storage/NativeSessionStorage.php

@@ -304,11 +304,8 @@ public function setMetadataBag(MetadataBag $metaBag = null)
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/http-foundation', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
         }
-        if (null === $metaBag) {
-            $metaBag = new MetadataBag();
-        }
+        $this->metadataBag = $metaBag ?? new MetadataBag();
 
-        $this->metadataBag = $metaBag;
     }
 
     /**

Tests/RequestTest.php

@@ -2341,9 +2341,7 @@ public function nonstandardRequestsData()
      */
     public function testNonstandardRequests($requestUri, $queryString, $expectedPathInfo, $expectedUri, $expectedBasePath = '', $expectedBaseUrl = null)
     {
-        if (null === $expectedBaseUrl) {
-            $expectedBaseUrl = $expectedBasePath;
-        }
+        $expectedBaseUrl ??= $expectedBasePath;
 
         $server = [
             'HTTP_HOST' => 'host:8080',