Merge branch '5.0'

fabpot · fabpot · commit f4332cb109b3 · 2020-02-24T14:39:20.000+01:00
* 5.0:
  [FrameworkBundle] Skip notifiers tags in UnusedTagsPass
  [Notifier] Remove not needed argument $bus in BrowserChannel::notify()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -24,6 +24,7 @@ class UnusedTagsPass implements CompilerPassInterface
     private $whitelist = [
         'annotations.cached_reader',
         'cache.pool.clearer',
+        'chatter.transport_factory',
         'console.command',
         'container.hot_path',
         'container.reversible',
@@ -56,6 +57,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'security.voter',
         'serializer.encoder',
         'serializer.normalizer',
+        'texter.transport_factory',
         'translation.dumper',
         'translation.extractor',
         'translation.loader',
diff --git a/src/Symfony/Component/Notifier/Channel/BrowserChannel.php b/src/Symfony/Component/Notifier/Channel/BrowserChannel.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Notifier\Channel;
 
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Notifier\Notification\Notification;
 use Symfony\Component\Notifier\Recipient\Recipient;
 
@@ -30,7 +29,7 @@ public function __construct(RequestStack $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()) {
             return;

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Notifier\Channel;`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpFoundation\RequestStack;`
`15`		`-use Symfony\Component\Messenger\MessageBusInterface;`
`16`	`15`	`use Symfony\Component\Notifier\Notification\Notification;`
`17`	`16`	`use Symfony\Component\Notifier\Recipient\Recipient;`
`18`	`17`
`@@ -30,7 +29,7 @@ public function __construct(RequestStack $stack)`
`30`	`29`	`$this->stack = $stack;`
`31`	`30`	`}`
`32`	`31`
`33`		`- public function notify(Notification $notification, Recipient $recipient, string $transportName = null, MessageBusInterface $bus = null): void`
	`32`	`+ public function notify(Notification $notification, Recipient $recipient, string $transportName = null): void`
`34`	`33`	`{`
`35`	`34`	`if (null === $request = $this->stack->getCurrentRequest()) {`
`36`	`35`	`return;`