[Notifier] Remove superfluous parameters in *Message::fromNotification()

fancyweb · fancyweb · commit e4dec22132cd · 2020-01-06T11:18:46.000+01:00
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -21,7 +21,6 @@
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\MessageOptionsInterface;
 use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\Recipient\Recipient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -145,7 +144,7 @@ public function testSendWithNotification(): void
             ->willReturn(json_encode(['ok' => true]));
 
         $notification = new Notification($message);
-        $chatMessage = ChatMessage::fromNotification($notification, new Recipient('test-email@example.com'));
+        $chatMessage = ChatMessage::fromNotification($notification);
         $options = SlackOptions::fromNotification($notification);
 
         $expectedBody = http_build_query([
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/composer.json b/src/Symfony/Component/Notifier/Bridge/Slack/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.2.5",
         "symfony/http-client": "^4.3|^5.0",
-        "symfony/notifier": "^5.0"
+        "symfony/notifier": "^5.1"
     },
     "require-dev": {
         "symfony/event-dispatcher": "^4.3|^5.0"
diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md
@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+5.1.0
+-----
+
+* [BC BREAK] The `ChatMessage::fromNotification()` method's `$recipient` and `$transport`
+  arguments were removed.
+* [BC BREAK] The `EmailMessage::fromNotification()` and `SmsMessage::fromNotification()`
+  methods' `$transport` argument was removed.
+
 5.0.0
 -----
 
diff --git a/src/Symfony/Component/Notifier/Channel/ChatChannel.php b/src/Symfony/Component/Notifier/Channel/ChatChannel.php
@@ -36,7 +36,7 @@ public function notify(Notification $notification, Recipient $recipient, string
         }
 
         if (null === $message) {
-            $message = ChatMessage::fromNotification($notification, $recipient, $transportName);
+            $message = ChatMessage::fromNotification($notification);
         }
 
         $message->transport($transportName);
diff --git a/src/Symfony/Component/Notifier/Channel/SmsChannel.php b/src/Symfony/Component/Notifier/Channel/SmsChannel.php
@@ -32,7 +32,7 @@ public function notify(Notification $notification, Recipient $recipient, string
         }
 
         if (null === $message) {
-            $message = SmsMessage::fromNotification($notification, $recipient, $transportName);
+            $message = SmsMessage::fromNotification($notification, $recipient);
         }
 
         if (null !== $transportName) {
diff --git a/src/Symfony/Component/Notifier/Message/ChatMessage.php b/src/Symfony/Component/Notifier/Message/ChatMessage.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Notifier\Message;
 
 use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\Recipient\Recipient;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -32,7 +31,7 @@ public function __construct(string $subject, MessageOptionsInterface $options =
         $this->options = $options;
     }
 
-    public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+    public static function fromNotification(Notification $notification): self
     {
         $message = new self($notification->getSubject());
         $message->notification = $notification;
diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php
@@ -35,7 +35,7 @@ public function __construct(RawMessage $message, Envelope $envelope = null)
         $this->envelope = $envelope;
     }
 
-    public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+    public static function fromNotification(Notification $notification, Recipient $recipient): self
     {
         if (!class_exists(NotificationEmail::class)) {
             $email = (new Email())
diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -34,10 +34,10 @@ public function __construct(string $phone, string $subject)
         $this->phone = $phone;
     }
 
-    public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+    public static function fromNotification(Notification $notification, Recipient $recipient): self
     {
         if (!$recipient instanceof SmsRecipientInterface) {
-            throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the recipient should implement "%s".', get_class($notification), SmsNotificationInterface::class, SmsRecipientInterface::class));
+            throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the recipient should implement "%s".', \get_class($notification), SmsNotificationInterface::class, SmsRecipientInterface::class));
         }
 
         return new self($recipient->getPhone(), $notification->getSubject());

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function notify(Notification $notification, Recipient $recipient, string`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if (null === $message) {`
`39`		`- $message = ChatMessage::fromNotification($notification, $recipient, $transportName);`
	`39`	`+ $message = ChatMessage::fromNotification($notification);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`$message->transport($transportName);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function notify(Notification $notification, Recipient $recipient, string`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (null === $message) {`
`35`		`- $message = SmsMessage::fromNotification($notification, $recipient, $transportName);`
	`35`	`+ $message = SmsMessage::fromNotification($notification, $recipient);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if (null !== $transportName) {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Notifier\Message;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Notifier\Notification\Notification;`
`15`		`-use Symfony\Component\Notifier\Recipient\Recipient;`
`16`	`15`
`17`	`16`	`/**`
`18`	`17`	`* @author Fabien Potencier <fabien@symfony.com>`
`@@ -32,7 +31,7 @@ public function __construct(string $subject, MessageOptionsInterface $options =`
`32`	`31`	`$this->options = $options;`
`33`	`32`	`}`
`34`	`33`
`35`		`- public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self`
	`34`	`+ public static function fromNotification(Notification $notification): self`
`36`	`35`	`{`
`37`	`36`	`$message = new self($notification->getSubject());`
`38`	`37`	`$message->notification = $notification;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(RawMessage $message, Envelope $envelope = null)`
`35`	`35`	`$this->envelope = $envelope;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self`
	`38`	`+ public static function fromNotification(Notification $notification, Recipient $recipient): self`
`39`	`39`	`{`
`40`	`40`	`if (!class_exists(NotificationEmail::class)) {`
`41`	`41`	`$email = (new Email())`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ public function __construct(string $phone, string $subject)`
`34`	`34`	`$this->phone = $phone;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self`
	`37`	`+ public static function fromNotification(Notification $notification, Recipient $recipient): self`
`38`	`38`	`{`
`39`	`39`	`if (!$recipient instanceof SmsRecipientInterface) {`
`40`		`- throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the recipient should implement "%s".', get_class($notification), SmsNotificationInterface::class, SmsRecipientInterface::class));`
	`40`	`+ throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the recipient should implement "%s".', \get_class($notification), SmsNotificationInterface::class, SmsRecipientInterface::class));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return new self($recipient->getPhone(), $notification->getSubject());`