Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d0dacf5

Browse filesBrowse files
fancywebfancyweb
committed
[Notifier] Remove superfluous parameters in *Message::fromNotification()
1 parent 0c6d64b commit d0dacf5
Copy full SHA for d0dacf5

File tree

9 files changed

+24
-10
lines changed
Filter options

9 files changed

+24
-10
lines changed

‎UPGRADE-5.1.md

Copy file name to clipboardExpand all lines: UPGRADE-5.1.md
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ HttpFoundation
1818
`RedirectResponse::create()`, and `StreamedResponse::create()` methods (use
1919
`__construct()` instead)
2020

21+
Notifier
22+
--------
23+
24+
* [BC BREAK] The `ChatMessage::fromNotification()` method's `$recipient` and `$transport`
25+
arguments were removed.
26+
* [BC BREAK] The `EmailMessage::fromNotification()` and `SmsMessage::fromNotification()`
27+
methods' `$transport` argument was removed.
28+
2129
Routing
2230
-------
2331

‎src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
use Symfony\Component\Notifier\Message\MessageInterface;
2222
use Symfony\Component\Notifier\Message\MessageOptionsInterface;
2323
use Symfony\Component\Notifier\Notification\Notification;
24-
use Symfony\Component\Notifier\Recipient\Recipient;
2524
use Symfony\Contracts\HttpClient\HttpClientInterface;
2625
use Symfony\Contracts\HttpClient\ResponseInterface;
2726

@@ -145,7 +144,7 @@ public function testSendWithNotification(): void
145144
->willReturn(json_encode(['ok' => true]));
146145

147146
$notification = new Notification($message);
148-
$chatMessage = ChatMessage::fromNotification($notification, new Recipient('test-email@example.com'));
147+
$chatMessage = ChatMessage::fromNotification($notification);
149148
$options = SlackOptions::fromNotification($notification);
150149

151150
$expectedBody = http_build_query([

‎src/Symfony/Component/Notifier/Bridge/Slack/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Slack/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.2.5",
2020
"symfony/http-client": "^4.3|^5.0",
21-
"symfony/notifier": "^5.0"
21+
"symfony/notifier": "^5.1"
2222
},
2323
"require-dev": {
2424
"symfony/event-dispatcher": "^4.3|^5.0"

‎src/Symfony/Component/Notifier/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/CHANGELOG.md
+8Lines 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

‎src/Symfony/Component/Notifier/Channel/ChatChannel.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Channel/ChatChannel.php
+1-1Lines 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);

‎src/Symfony/Component/Notifier/Channel/SmsChannel.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Channel/SmsChannel.php
+1-1Lines 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) {

‎src/Symfony/Component/Notifier/Message/ChatMessage.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/ChatMessage.php
+1-2Lines 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;

‎src/Symfony/Component/Notifier/Message/EmailMessage.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/EmailMessage.php
+1-1Lines 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())

‎src/Symfony/Component/Notifier/Message/SmsMessage.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/SmsMessage.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ 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) {
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));
4141
}
4242

4343
return new self($recipient->getPhone(), $notification->getSubject());

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.