Add more nullsafe operators

Author: nicolas-grekas

Argument/ServiceLocator.php

@@ -45,6 +45,6 @@ public function get(string $id): mixed
      */
     public function getProvidedServices(): array
     {
-        return $this->serviceTypes ?? $this->serviceTypes = array_map(function () { return '?'; }, $this->serviceMap);
+        return $this->serviceTypes ??= array_map(function () { return '?'; }, $this->serviceMap);
     }
 }

Compiler/AnalyzeServiceReferencesPass.php

@@ -98,7 +98,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 $targetId,
                 $targetDefinition,
                 $value,
-                $this->lazy || ($this->hasProxyDumper && $targetDefinition && $targetDefinition->isLazy()),
+                $this->lazy || ($this->hasProxyDumper && $targetDefinition?->isLazy()),
                 ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior(),
                 $this->byConstructor
             );
@@ -110,7 +110,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                     $targetId,
                     $targetDefinition,
                     $value,
-                    $this->lazy || ($targetDefinition && $targetDefinition->isLazy()),
+                    $this->lazy || $targetDefinition?->isLazy(),
                     true
                );
             }

Compiler/CheckTypeDeclarationsPass.php

@@ -160,7 +160,7 @@ private function checkTypeDeclarations(Definition $checkedDefinition, \Reflectio
      */
     private function checkType(Definition $checkedDefinition, mixed $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, \ReflectionType $reflectionType = null): void
     {
-        $reflectionType = $reflectionType ?? $parameter->getType();
+        $reflectionType ??= $parameter->getType();
 
         if ($reflectionType instanceof \ReflectionUnionType) {
             foreach ($reflectionType->getTypes() as $t) {

Compiler/DecoratorServicePass.php

@@ -80,7 +80,7 @@ public function process(ContainerBuilder $container)
                 throw new ServiceNotFoundException($inner, $id);
             }
 
-            if ($decoratedDefinition && $decoratedDefinition->isSynthetic()) {
+            if ($decoratedDefinition?->isSynthetic()) {
                 throw new InvalidArgumentException(sprintf('A synthetic service cannot be decorated: service "%s" cannot decorate "%s".', $id, $inner));
             }
 

Compiler/PriorityTaggedServiceTrait.php

@@ -68,7 +68,7 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
                 } elseif (null === $defaultPriority && $defaultPriorityMethod && $class) {
                     $defaultPriority = PriorityTaggedServiceUtil::getDefault($container, $serviceId, $class, $defaultPriorityMethod, $tagName, 'priority', $checkTaggedItem);
                 }
-                $priority = $priority ?? $defaultPriority ?? $defaultPriority = 0;
+                $priority ??= $defaultPriority ??= 0;
 
                 if (null === $indexAttribute && !$defaultIndexMethod && !$needsIndexes) {
                     $services[] = [$priority, ++$i, null, $serviceId, null];
@@ -80,7 +80,7 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
                 } elseif (null === $defaultIndex && $defaultPriorityMethod && $class) {
                     $defaultIndex = PriorityTaggedServiceUtil::getDefault($container, $serviceId, $class, $defaultIndexMethod ?? 'getDefaultName', $tagName, $indexAttribute, $checkTaggedItem);
                 }
-                $index = $index ?? $defaultIndex ?? $defaultIndex = $serviceId;
+                $index ??= $defaultIndex ??= $serviceId;
 
                 $services[] = [$priority, ++$i, $index, $serviceId, $class];
             }

Compiler/ResolveInstanceofConditionalsPass.php

@@ -73,7 +73,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
         $parent = $definition instanceof ChildDefinition ? $definition->getParent() : null;
 
         foreach ($conditionals as $interface => $instanceofDefs) {
-            if ($interface !== $class && !($reflectionClass ?? $reflectionClass = $container->getReflectionClass($class, false) ?: false)) {
+            if ($interface !== $class && !($reflectionClass ??= $container->getReflectionClass($class, false) ?: false)) {
                 continue;
             }
 

Container.php

@@ -380,7 +380,7 @@ final protected function getService(string|false $registry, string $id, ?string
             return false !== $registry ? $this->{$registry}[$id] ?? null : null;
         }
         if (false !== $registry) {
-            return $this->{$registry}[$id] ?? $this->{$registry}[$id] = $load ? $this->load($method) : $this->{$method}();
+            return $this->{$registry}[$id] ??= $load ? $this->load($method) : $this->{$method}();
         }
         if (!$load) {
             return $this->{$method}();

Dumper/PhpDumper.php

@@ -221,7 +221,7 @@ public function dump(array $options = []): string|array
             $this->addDefaultParametersMethod()
         ;
 
-        $proxyClasses = $proxyClasses ?? $this->generateProxyClasses();
+        $proxyClasses ??= $this->generateProxyClasses();
 
         if ($this->addGetService) {
             $code = preg_replace(
@@ -1802,7 +1802,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
             if ($value->hasErrors() && $e = $value->getErrors()) {
                 return sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
             }
-            if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {
+            if ($this->definitionVariables?->contains($value)) {
                 return $this->dumpValue($this->definitionVariables[$value], $interpolate);
             }
             if ($value->getMethodCalls()) {