Skip to content

Commit 4c23af3

Browse files
committed
feature #35167 [Notifier] Remove superfluous parameters in *Message::fromNotification() (fancyweb)
This PR was merged into the 5.1-dev branch. Discussion ---------- [Notifier] Remove superfluous parameters in *Message::fromNotification() | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Those classes are final so I think we don't need those extra arguments. Commits ------- d0dacf51e1 [Notifier] Remove superfluous parameters in *Message::fromNotification()
2 parents efbfa92 + 6f4e602 commit 4c23af3

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
CHANGELOG
22
=========
33

4+
5.1.0
5+
-----
6+
7+
* [BC BREAK] The `ChatMessage::fromNotification()` method's `$recipient` and `$transport`
8+
arguments were removed.
9+
* [BC BREAK] The `EmailMessage::fromNotification()` and `SmsMessage::fromNotification()`
10+
methods' `$transport` argument was removed.
11+
412
5.0.0
513
-----
614

Channel/ChatChannel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function notify(Notification $notification, Recipient $recipient, string
3636
}
3737

3838
if (null === $message) {
39-
$message = ChatMessage::fromNotification($notification, $recipient, $transportName);
39+
$message = ChatMessage::fromNotification($notification);
4040
}
4141

4242
$message->transport($transportName);

Channel/SmsChannel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function notify(Notification $notification, Recipient $recipient, string
3232
}
3333

3434
if (null === $message) {
35-
$message = SmsMessage::fromNotification($notification, $recipient, $transportName);
35+
$message = SmsMessage::fromNotification($notification, $recipient);
3636
}
3737

3838
if (null !== $transportName) {

Message/ChatMessage.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Notifier\Message;
1313

1414
use Symfony\Component\Notifier\Notification\Notification;
15-
use Symfony\Component\Notifier\Recipient\Recipient;
1615

1716
/**
1817
* @author Fabien Potencier <fabien@symfony.com>
@@ -32,7 +31,7 @@ public function __construct(string $subject, MessageOptionsInterface $options =
3231
$this->options = $options;
3332
}
3433

35-
public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
34+
public static function fromNotification(Notification $notification): self
3635
{
3736
$message = new self($notification->getSubject());
3837
$message->notification = $notification;

Message/EmailMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct(RawMessage $message, Envelope $envelope = null)
3535
$this->envelope = $envelope;
3636
}
3737

38-
public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
38+
public static function fromNotification(Notification $notification, Recipient $recipient): self
3939
{
4040
if (!class_exists(NotificationEmail::class)) {
4141
$email = (new Email())

Message/SmsMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(string $phone, string $subject)
3434
$this->phone = $phone;
3535
}
3636

37-
public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
37+
public static function fromNotification(Notification $notification, Recipient $recipient): self
3838
{
3939
if (!$recipient instanceof SmsRecipientInterface) {
4040
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));

0 commit comments

Comments
 (0)