Add more nullsafe operators

Author: nicolas-grekas

Generator/UrlGenerator.php

@@ -128,9 +128,7 @@ public function isStrictRequirements(): ?bool
     public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH): string
     {
         $route = null;
-        $locale = $parameters['_locale']
-            ?? $this->context->getParameter('_locale')
-            ?: $this->defaultLocale;
+        $locale = $parameters['_locale'] ?? $this->context->getParameter('_locale') ?: $this->defaultLocale;
 
         if (null !== $locale) {
             do {
@@ -140,7 +138,7 @@ public function generate(string $name, array $parameters = [], int $referenceTyp
             } while (false !== $locale = strstr($locale, '_', true));
         }
 
-        if (null === $route = $route ?? $this->routes->get($name)) {
+        if (null === $route ??= $this->routes->get($name)) {
             throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
         }
 

Matcher/Dumper/CompiledUrlMatcherDumper.php

@@ -427,7 +427,7 @@ private function compileRoute(Route $route, string $name, string|array|null $var
 
         if ($condition = $route->getCondition()) {
             $condition = $this->getExpressionLanguage()->compile($condition, ['context', 'request']);
-            $condition = $conditions[$condition] ?? $conditions[$condition] = (str_contains($condition, '$request') ? 1 : -1) * \count($conditions);
+            $condition = $conditions[$condition] ??= (str_contains($condition, '$request') ? 1 : -1) * \count($conditions);
         } else {
             $condition = null;
         }

Matcher/Dumper/CompiledUrlMatcherTrait.php

@@ -92,7 +92,7 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche
         $supportsRedirections = 'GET' === $canonicalMethod && $this instanceof RedirectableUrlMatcherInterface;
 
         foreach ($this->staticRoutes[$trimmedPathinfo] ?? [] as [$ret, $requiredHost, $requiredMethods, $requiredSchemes, $hasTrailingSlash, , $condition]) {
-            if ($condition && !($this->checkCondition)($condition, $context, 0 < $condition ? $request ?? $request = $this->request ?: $this->createRequest($pathinfo) : null)) {
+            if ($condition && !($this->checkCondition)($condition, $context, 0 < $condition ? $request ??= $this->request ?: $this->createRequest($pathinfo) : null)) {
                 continue;
             }
 
@@ -136,7 +136,7 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche
                         if (0 === $condition) { // marks the last route in the regexp
                             continue 3;
                         }
-                        if (!($this->checkCondition)($condition, $context, 0 < $condition ? $request ?? $request = $this->request ?: $this->createRequest($pathinfo) : null)) {
+                        if (!($this->checkCondition)($condition, $context, 0 < $condition ? $request ??= $this->request ?: $this->createRequest($pathinfo) : null)) {
                             continue;
                         }
                     }

Matcher/Dumper/StaticPrefixCollection.php

@@ -152,7 +152,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
         try {
             for ($i = $baseLength; $i < $end && $prefix[$i] === $anotherPrefix[$i]; ++$i) {
                 if ('(' === $prefix[$i]) {
-                    $staticLength = $staticLength ?? $i;
+                    $staticLength ??= $i;
                     for ($j = 1 + $i, $n = 1; $j < $end && 0 < $n; ++$j) {
                         if ($prefix[$j] !== $anotherPrefix[$j]) {
                             break 2;