Use ??= more

Author: nicolas-grekas

Compiler/AbstractRecursivePass.php

@@ -150,8 +150,8 @@ protected function getConstructor(Definition $definition, bool $required): ?\Ref
                 }
             } elseif ($class instanceof Definition) {
                 $class = $class->getClass();
-            } elseif (null === $class) {
-                $class = $definition->getClass();
+            } else {
+                $class ??= $definition->getClass();
             }
 
             return $this->getReflectionMethod(new Definition($class), $method);

ContainerBuilder.php

@@ -1336,12 +1336,8 @@ public function getAutoconfiguredAttributes(): array
      */
     public function resolveEnvPlaceholders(mixed $value, string|bool $format = null, array &$usedEnvs = null): mixed
     {
-        if (null === $format) {
-            $format = '%%env(%s)%%';
-        }
-
         $bag = $this->getParameterBag();
-        if (true === $format) {
+        if (true === $format ??= '%%env(%s)%%') {
             $value = $bag->resolveValue($value);
         }
 

Dumper/PhpDumper.php

@@ -1700,9 +1700,7 @@ private function getServiceConditionals(mixed $value): string
 
     private function getDefinitionsFromArguments(array $arguments, \SplObjectStorage $definitions = null, array &$calls = [], bool $byConstructor = null): \SplObjectStorage
     {
-        if (null === $definitions) {
-            $definitions = new \SplObjectStorage();
-        }
+        $definitions ??= new \SplObjectStorage();
 
         foreach ($arguments as $argument) {
             if (\is_array($argument)) {

Loader/FileLoader.php

@@ -186,9 +186,7 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
         $excludePatterns = $parameterBag->unescapeValue($parameterBag->resolveValue($excludePatterns));
         foreach ($excludePatterns as $excludePattern) {
             foreach ($this->glob($excludePattern, true, $resource, true, true) as $path => $info) {
-                if (null === $excludePrefix) {
-                    $excludePrefix = $resource->getPrefix();
-                }
+                $excludePrefix ??= $resource->getPrefix();
 
                 // normalize Windows slashes and remove trailing slashes
                 $excludePaths[rtrim(str_replace('\\', '/', $path), '/')] = true;

Loader/YamlFileLoader.php

@@ -348,11 +348,7 @@ private function parseDefinition(string $id, array|string|null $service, string
             $service = ['arguments' => $service];
         }
 
-        if (null === $service) {
-            $service = [];
-        }
-
-        if (!\is_array($service)) {
+        if (!\is_array($service ??= [])) {
             throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but "%s" found for service "%s" in "%s". Check your YAML syntax.', get_debug_type($service), $id, $file));
         }