[Notifier] moved the deprecation to the factory

PEtanguy · PEtanguy · commit 6cb3054c0548 · 2023-06-08T18:15:42.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -283,11 +283,11 @@
         ->set('notifier.transport_factory.simple-textin', Bridge\SimpleTextin\SimpleTextinTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
-    
+
         ->set('notifier.transport_factory.click-send', Bridge\ClickSend\ClickSendTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
-    
+
         ->set('notifier.transport_factory.smsmode', Bridge\Smsmode\SmsmodeTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
diff --git a/src/Symfony/Component/Notifier/Bridge/Brevo/BrevoTransport.php b/src/Symfony/Component/Notifier/Bridge/Brevo/BrevoTransport.php
@@ -28,14 +28,12 @@ final class BrevoTransport extends AbstractTransport
 {
     protected const HOST = 'api.brevo.com';
 
-    private string $apiKey;
-    private string $sender;
-
-    public function __construct(#[\SensitiveParameter] string $apiKey, string $sender, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
-    {
-        $this->apiKey = $apiKey;
-        $this->sender = $sender;
-
+    public function __construct(
+        #[\SensitiveParameter] private readonly string $apiKey,
+        private readonly string $sender,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
         parent::__construct($client, $dispatcher);
     }
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Brevo/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Brevo/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-6.3
+6.4
 ---
 
 * Added the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Brevo/composer.json b/src/Symfony/Component/Notifier/Bridge/Brevo/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "symfony/brevo-notifier",
     "type": "symfony-notifier-bridge",
-    "description": "Symfony Brevo Notifier Bridge",
+    "description": "Symfony Brevo Notifier Bridge - formerly Sendinblue",
     "keywords": ["brevo", "notifier"],
     "homepage": "https://symfony.com",
     "license": "MIT",
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Sendinblue/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+* Deprecated the bridge, replaced it with Brevo in reaction to their rebranding.
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php b/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Notifier\Bridge\Sendinblue;
 
-use Symfony\Component\Notifier\Bridge\Brevo\BrevoTransport;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
 use Symfony\Component\Notifier\Message\MessageInterface;
@@ -22,8 +21,6 @@
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-trigger_deprecation('symfony/sendinblue-notifier', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransport::class, BrevoTransport::class);
-
 /**
  * @author Pierre Tondereau <pierre.tondereau@gmail.com>
  *
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransportFactory.php
@@ -16,8 +16,6 @@
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
 
-trigger_deprecation('symfony/sendinblue-notifier', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransport::class, BrevoTransport::class);
-
 /**
  * @author Pierre Tondereau <pierre.tondereau@protonmail.com>
  *
@@ -27,6 +25,8 @@ final class SendinblueTransportFactory extends AbstractTransportFactory
 {
     public function create(Dsn $dsn): SendinblueTransport
     {
+        trigger_deprecation('symfony/sendinblue-notifier', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransport::class, BrevoTransport::class);
+
         $scheme = $dsn->getScheme();
 
         if ('sendinblue' !== $scheme) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "symfony/brevo-notifier",`
`3`	`3`	`"type": "symfony-notifier-bridge",`
`4`		`- "description": "Symfony Brevo Notifier Bridge",`
	`4`	`+ "description": "Symfony Brevo Notifier Bridge - formerly Sendinblue",`
`5`	`5`	`"keywords": ["brevo", "notifier"],`
`6`	`6`	`"homepage": "https://symfony.com",`
`7`	`7`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`use Symfony\Component\Notifier\Transport\AbstractTransportFactory;`
`17`	`17`	`use Symfony\Component\Notifier\Transport\Dsn;`
`18`	`18`
`19`		`-trigger_deprecation('symfony/sendinblue-notifier', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransport::class, BrevoTransport::class);`
`20`		`-`
`21`	`19`	`/**`
`22`	`20`	`* @author Pierre Tondereau <pierre.tondereau@protonmail.com>`
`23`	`21`	`*`
`@@ -27,6 +25,8 @@ final class SendinblueTransportFactory extends AbstractTransportFactory`
`27`	`25`	`{`
`28`	`26`	`public function create(Dsn $dsn): SendinblueTransport`
`29`	`27`	`{`
	`28`	`+ trigger_deprecation('symfony/sendinblue-notifier', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransport::class, BrevoTransport::class);`
	`29`	`+`
`30`	`30`	`$scheme = $dsn->getScheme();`
`31`	`31`
`32`	`32`	`if ('sendinblue' !== $scheme) {`