Skip to content

Commit ae192b1

Browse files
Merge branch '7.4' into 8.0
* 7.4: (21 commits) [ObjectMapper] lazy loading [Filesystem] Unify logic for isAbsolute() in Path [DependencyInjection] Include return type in AppReference shape [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator [Cache] Remove unset call on undefined variable in PhpArrayAdapter [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string [Routing] Simplify importing routes defined on controller services Fix tests [DependendcyInjection] Improve shape for "from_callable" definitions [PHPDoc] Fix various PHPDoc syntax errors [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector [Notifier] Remove unused $transportName argument in EmailChannel::notify() [Translation] Remove an unused argument passed to parseNode() method [HttpClient] Reject 3xx pushed responses [Serializer] Use Asia/Tokyo instead of Japan in tests [ProxyManagerBridge] Remove comment that reference github discussion [JsonPath] Remove unused "nothing" property from JsonCrawler [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer [Routing] Fix matching the "0" URL [Form] Fix EnumType choice_label logic for grouped choices ...
2 parents 1c84036 + bf2af2c commit ae192b1

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
@@ -54,7 +54,7 @@ public function notify(Notification $notification, RecipientInterface $recipient
5454
$message = $notification->asEmailMessage($recipient, $transportName);
5555
}
5656

57-
$message ??= EmailMessage::fromNotification($notification, $recipient, $transportName);
57+
$message ??= EmailMessage::fromNotification($notification, $recipient);
5858
$email = $message->getMessage();
5959
if ($email instanceof Email) {
6060
if (!$email->getFrom()) {

0 commit comments

Comments
 (0)