Skip to content

Commit 8d784b7

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: Make FormPerformanceTestCase compatible with PHPUnit 10 [Security] Fix resetting traceable listeners [HttpClient] Fix type error with http_version 1.1 [FrameworkBundle] Fix call to invalid method in NotificationAssertionsTrait [Validator] Add missing italian translations Fix order array sum normalizedData and nestedData Fix duplicate component in UPGRADE-6.3.md [Notifier] Tweak an error message Change incorrect message, when the sender in the global envelope or the from header of asEmailMessage() is not defined. [Messenger] Check if PCNTL is installed Bump Symfony version to 6.3.6 Update VERSION for 6.3.5 Update CHANGELOG for 6.3.5 Bump Symfony version to 5.4.30 Update VERSION for 5.4.29 Update CONTRIBUTORS for 5.4.29 Update CHANGELOG for 5.4.29 [Mailer] [Mailgun] Fix outlook sender
2 parents 3a3cbf9 + 2e39d4a commit 8d784b7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Channel/EmailChannel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
6161
if ($email instanceof Email) {
6262
if (!$email->getFrom()) {
6363
if (null === $this->from) {
64-
throw new LogicException(sprintf('To send the "%s" notification by email, you should either configure a global "from" header, set a sender in the global "envelope" of the mailer configuration or set a "from" header in the "asEmailMessage()" method.', get_debug_type($notification)));
64+
throw new LogicException(sprintf('To send the "%s" notification by email, you must configure a "from" header by either setting a sender in the global "envelope" of the mailer configuration or by setting a "from" header in the "asEmailMessage()" method.', get_debug_type($notification)));
6565
}
6666

6767
$email->from($this->from);

0 commit comments

Comments
 (0)