Merge branch '5.0'
* 5.0: [FrameworkBundle] Skip notifiers tags in UnusedTagsPass [Notifier] Remove not needed argument $bus in BrowserChannel::notify()
This commit is contained in:
commit
f4332cb109
|
@ -24,6 +24,7 @@ class UnusedTagsPass implements CompilerPassInterface
|
||||||
private $whitelist = [
|
private $whitelist = [
|
||||||
'annotations.cached_reader',
|
'annotations.cached_reader',
|
||||||
'cache.pool.clearer',
|
'cache.pool.clearer',
|
||||||
|
'chatter.transport_factory',
|
||||||
'console.command',
|
'console.command',
|
||||||
'container.hot_path',
|
'container.hot_path',
|
||||||
'container.reversible',
|
'container.reversible',
|
||||||
|
@ -56,6 +57,7 @@ class UnusedTagsPass implements CompilerPassInterface
|
||||||
'security.voter',
|
'security.voter',
|
||||||
'serializer.encoder',
|
'serializer.encoder',
|
||||||
'serializer.normalizer',
|
'serializer.normalizer',
|
||||||
|
'texter.transport_factory',
|
||||||
'translation.dumper',
|
'translation.dumper',
|
||||||
'translation.extractor',
|
'translation.extractor',
|
||||||
'translation.loader',
|
'translation.loader',
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
namespace Symfony\Component\Notifier\Channel;
|
namespace Symfony\Component\Notifier\Channel;
|
||||||
|
|
||||||
use Symfony\Component\HttpFoundation\RequestStack;
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
|
||||||
use Symfony\Component\Notifier\Notification\Notification;
|
use Symfony\Component\Notifier\Notification\Notification;
|
||||||
use Symfony\Component\Notifier\Recipient\Recipient;
|
use Symfony\Component\Notifier\Recipient\Recipient;
|
||||||
|
|
||||||
|
@ -30,7 +29,7 @@ final class BrowserChannel implements ChannelInterface
|
||||||
$this->stack = $stack;
|
$this->stack = $stack;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function notify(Notification $notification, Recipient $recipient, string $transportName = null, MessageBusInterface $bus = null): void
|
public function notify(Notification $notification, Recipient $recipient, string $transportName = null): void
|
||||||
{
|
{
|
||||||
if (null === $request = $this->stack->getCurrentRequest()) {
|
if (null === $request = $this->stack->getCurrentRequest()) {
|
||||||
return;
|
return;
|
||||||
|
|
Reference in New Issue