Use ??= more

Author: nicolas-grekas

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);

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);

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);

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);