minor #47549 Add a few more ??= (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit e8826b780f7e · 2022-09-12T11:06:20.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- Add a few more ??= | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 0a514a9 Add a few more ??=
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1026,7 +1026,7 @@ private function addInlineService(string $id, Definition $definition, Definition
             }
         }
 
-        if (isset($this->definitionVariables[$inlineDef = $inlineDef ?: $definition])) {
+        if (isset($this->definitionVariables[$inlineDef ??= $definition])) {
             return $code;
         }
 
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -539,7 +539,7 @@ public function handleException(\Throwable $exception)
             if (null !== $exceptionHandler) {
                 return $exceptionHandler($exception);
             }
-            $handlerException = $handlerException ?: $exception;
+            $handlerException ??= $exception;
         } catch (\Throwable $handlerException) {
         }
         if ($exception === $handlerException && null === $this->exceptionHandler) {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
@@ -34,7 +34,7 @@ abstract protected function getBuilder($name = 'name');
 
     protected function getForm($name = 'name', $propertyPath = null)
     {
-        $propertyPath = $propertyPath ?: $name;
+        $propertyPath ??= $name;
 
         return $this->getBuilder($name)->setAttribute('property_path', $propertyPath)->getForm();
     }
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -105,7 +105,7 @@ public function terminate(Request $request, Response $response)
      */
     public function terminateWithException(\Throwable $exception, Request $request = null)
     {
-        if (!$request = $request ?: $this->requestStack->getMainRequest()) {
+        if (!$request ??= $this->requestStack->getMainRequest()) {
             throw $exception;
         }
 
diff --git a/src/Symfony/Component/Notifier/Channel/EmailChannel.php b/src/Symfony/Component/Notifier/Channel/EmailChannel.php
@@ -53,7 +53,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
             $message = $notification->asEmailMessage($recipient, $transportName);
         }
 
-        $message = $message ?: EmailMessage::fromNotification($notification, $recipient, $transportName);
+        $message ??= EmailMessage::fromNotification($notification, $recipient, $transportName);
         $email = $message->getMessage();
         if ($email instanceof Email) {
             if (!$email->getFrom()) {

Original file line number	Diff line number	Diff line change
`@@ -1026,7 +1026,7 @@ private function addInlineService(string $id, Definition $definition, Definition`
`1026`	`1026`	`}`
`1027`	`1027`	`}`
`1028`	`1028`
`1029`		`- if (isset($this->definitionVariables[$inlineDef = $inlineDef ?: $definition])) {`
	`1029`	`+ if (isset($this->definitionVariables[$inlineDef ??= $definition])) {`
`1030`	`1030`	`return $code;`
`1031`	`1031`	`}`
`1032`	`1032`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ public function handleException(\Throwable $exception)`
`539`	`539`	`if (null !== $exceptionHandler) {`
`540`	`540`	`return $exceptionHandler($exception);`
`541`	`541`	`}`
`542`		`- $handlerException = $handlerException ?: $exception;`
	`542`	`+ $handlerException ??= $exception;`
`543`	`543`	`} catch (\Throwable $handlerException) {`
`544`	`544`	`}`
`545`	`545`	`if ($exception === $handlerException && null === $this->exceptionHandler) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ abstract protected function getBuilder($name = 'name');`
`34`	`34`
`35`	`35`	`protected function getForm($name = 'name', $propertyPath = null)`
`36`	`36`	`{`
`37`		`- $propertyPath = $propertyPath ?: $name;`
	`37`	`+ $propertyPath ??= $name;`
`38`	`38`
`39`	`39`	`return $this->getBuilder($name)->setAttribute('property_path', $propertyPath)->getForm();`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function terminate(Request $request, Response $response)`
`105`	`105`	`*/`
`106`	`106`	`public function terminateWithException(\Throwable $exception, Request $request = null)`
`107`	`107`	`{`
`108`		`- if (!$request = $request ?: $this->requestStack->getMainRequest()) {`
	`108`	`+ if (!$request ??= $this->requestStack->getMainRequest()) {`
`109`	`109`	`throw $exception;`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function notify(Notification $notification, RecipientInterface $recipient`
`53`	`53`	`$message = $notification->asEmailMessage($recipient, $transportName);`
`54`	`54`	`}`
`55`	`55`
`56`		`- $message = $message ?: EmailMessage::fromNotification($notification, $recipient, $transportName);`
	`56`	`+ $message ??= EmailMessage::fromNotification($notification, $recipient, $transportName);`
`57`	`57`	`$email = $message->getMessage();`
`58`	`58`	`if ($email instanceof Email) {`
`59`	`59`	`if (!$email->getFrom()) {`