Use ??= more

nicolas-grekas · nicolas-grekas · commit 6c6575898f13 · 2022-11-02T10:08:04.000+01:00
diff --git a/Channel/ChatChannel.php b/Channel/ChatChannel.php
@@ -28,9 +28,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
             $message = $notification->asChatMessage($recipient, $transportName);
         }
 
-        if (null === $message) {
-            $message = ChatMessage::fromNotification($notification);
-        }
+        $message ??= ChatMessage::fromNotification($notification);
 
         if (null !== $transportName) {
             $message->transport($transportName);
diff --git a/Channel/PushChannel.php b/Channel/PushChannel.php
@@ -28,9 +28,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
             $message = $notification->asPushMessage($recipient, $transportName);
         }
 
-        if (null === $message) {
-            $message = PushMessage::fromNotification($notification);
-        }
+        $message ??= PushMessage::fromNotification($notification);
 
         if (null !== $transportName) {
             $message->transport($transportName);
diff --git a/Channel/SmsChannel.php b/Channel/SmsChannel.php
@@ -29,9 +29,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
             $message = $notification->asSmsMessage($recipient, $transportName);
         }
 
-        if (null === $message) {
-            $message = SmsMessage::fromNotification($notification, $recipient);
-        }
+        $message ??= SmsMessage::fromNotification($notification, $recipient);
 
         if (null !== $transportName) {
             $message->transport($transportName);
diff --git a/Test/TransportTestCase.php b/Test/TransportTestCase.php
@@ -57,9 +57,7 @@ public function testToString(string $expected, TransportInterface $transport)
      */
     public function testSupportedMessages(MessageInterface $message, TransportInterface $transport = null)
     {
-        if (null === $transport) {
-            $transport = $this->createTransport();
-        }
+        $transport ??= $this->createTransport();
 
         $this->assertTrue($transport->supports($message));
     }
@@ -69,9 +67,7 @@ public function testSupportedMessages(MessageInterface $message, TransportInterf
      */
     public function testUnsupportedMessages(MessageInterface $message, TransportInterface $transport = null)
     {
-        if (null === $transport) {
-            $transport = $this->createTransport();
-        }
+        $transport ??= $this->createTransport();
 
         $this->assertFalse($transport->supports($message));
     }
@@ -81,9 +77,7 @@ public function testUnsupportedMessages(MessageInterface $message, TransportInte
      */
     public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, TransportInterface $transport = null)
     {
-        if (null === $transport) {
-            $transport = $this->createTransport();
-        }
+        $transport ??= $this->createTransport();
 
         $this->expectException(UnsupportedMessageTypeException::class);
 

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ public function notify(Notification $notification, RecipientInterface $recipient`
`28`	`28`	`$message = $notification->asChatMessage($recipient, $transportName);`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (null === $message) {`
`32`		`- $message = ChatMessage::fromNotification($notification);`
`33`		`- }`
	`31`	`+ $message ??= ChatMessage::fromNotification($notification);`
`34`	`32`
`35`	`33`	`if (null !== $transportName) {`
`36`	`34`	`$message->transport($transportName);`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ public function notify(Notification $notification, RecipientInterface $recipient`
`29`	`29`	`$message = $notification->asSmsMessage($recipient, $transportName);`
`30`	`30`	`}`
`31`	`31`
`32`		`- if (null === $message) {`
`33`		`- $message = SmsMessage::fromNotification($notification, $recipient);`
`34`		`- }`
	`32`	`+ $message ??= SmsMessage::fromNotification($notification, $recipient);`
`35`	`33`
`36`	`34`	`if (null !== $transportName) {`
`37`	`35`	`$message->transport($transportName);`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,7 @@ public function testToString(string $expected, TransportInterface $transport)`
`57`	`57`	`*/`
`58`	`58`	`public function testSupportedMessages(MessageInterface $message, TransportInterface $transport = null)`
`59`	`59`	`{`
`60`		`- if (null === $transport) {`
`61`		`- $transport = $this->createTransport();`
`62`		`- }`
	`60`	`+ $transport ??= $this->createTransport();`
`63`	`61`
`64`	`62`	`$this->assertTrue($transport->supports($message));`
`65`	`63`	`}`
`@@ -69,9 +67,7 @@ public function testSupportedMessages(MessageInterface $message, TransportInterf`
`69`	`67`	`*/`
`70`	`68`	`public function testUnsupportedMessages(MessageInterface $message, TransportInterface $transport = null)`
`71`	`69`	`{`
`72`		`- if (null === $transport) {`
`73`		`- $transport = $this->createTransport();`
`74`		`- }`
	`70`	`+ $transport ??= $this->createTransport();`
`75`	`71`
`76`	`72`	`$this->assertFalse($transport->supports($message));`
`77`	`73`	`}`
`@@ -81,9 +77,7 @@ public function testUnsupportedMessages(MessageInterface $message, TransportInte`
`81`	`77`	`*/`
`82`	`78`	`public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, TransportInterface $transport = null)`
`83`	`79`	`{`
`84`		`- if (null === $transport) {`
`85`		`- $transport = $this->createTransport();`
`86`		`- }`
	`80`	`+ $transport ??= $this->createTransport();`
`87`	`81`
`88`	`82`	`$this->expectException(UnsupportedMessageTypeException::class);`
`89`	`83`