Skip to content

Commit a238f02

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: (24 commits) Fix Twig tests [Scheduler] Fix tests [TwigBridge] Add FormLayoutTestCase class Fix CS Allow sending scheduled messages through the slack API [TwigBridge] Add `AppVariable::getEnabledLocales()` to retrieve the enabled locales [RateLimiter] Add missing dependency [RateLimiter] Add SlidingWindowLimiter::reserve() [Messenger] Add WrappedExceptionsInterface for nested exceptions [Mime] Add `TemplatedEmail::locale()` to set the locale for the email rendering Fix CS [Messenger][Scheduler] Add AsCronTask & AsPeriodicTask attributes [Scheduler] Make debug:scheduler output more useful [Notifier] Tweak some phpdocs [FrameworkBundle] Change BrowserKitAssertionsTrait::getClient() to be protected Fix CS [FrameworkBundle] Allow BrowserKit relative URL redirect assert [Messenger] RejectRedeliveredMessageException should not be retried [Serializer] Make `ProblemNormalizer` give details about Messenger’s `ValidationFailedException` [WebProfilerBundle] Support `!` negation operator in url filter ...
2 parents 126dd5e + c988179 commit a238f02

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Channel/EmailChannel.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public function __construct(TransportInterface $transport = null, MessageBusInte
4646
$this->envelope = $envelope;
4747
}
4848

49+
/**
50+
* @param EmailRecipientInterface $recipient
51+
*/
4952
public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
5053
{
5154
$message = null;

Channel/SmsChannel.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
*/
2323
class SmsChannel extends AbstractChannel
2424
{
25+
/**
26+
* @param SmsRecipientInterface $recipient
27+
*/
2528
public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
2629
{
2730
$message = null;

EventListener/SendFailedMessageToNotifierListener.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public function onMessageFailed(WorkerMessageFailedEvent $event): void
3939

4040
$throwable = $event->getThrowable();
4141
if ($throwable instanceof HandlerFailedException) {
42-
$throwable = $throwable->getNestedExceptions()[0];
42+
$exceptions = $throwable->getWrappedExceptions();
43+
$throwable = $exceptions[array_key_first($exceptions)];
4344
}
4445
$envelope = $event->getEnvelope();
4546
$notification = Notification::fromThrowable($throwable)->importance(Notification::IMPORTANCE_HIGH);

0 commit comments

Comments
 (0)