symfony · fabpot · Sep 27, 2024 · Sep 18, 2024
diff --git a/UPGRADE-7.2.md b/UPGRADE-7.2.md
@@ -52,6 +52,14 @@ Messenger
 
  * Add `getRetryDelay()` method to `RecoverableExceptionInterface`
 
+Notifier
+--------
+
+ * Deprecate `TransportFactoryTestCase`, extend `AbstractTransportFactoryTestCase` instead
+
+   The `testIncompleteDsnException()` and `testMissingRequiredOptionException()` tests are no longer provided by default. If you make use of them (i.e. by implementing the
+   `incompleteDsnProvider()` or `missingRequiredOptionProvider()` data providers), you now need to use the `IncompleteDsnTestTrait` or `MissingRequiredOptionTestTrait` respectively.
+
 Security
 --------
 

@@ -12,10 +12,13 @@
 namespace Symfony\Component\Notifier\Bridge\AllMySms\Tests;
 
 use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
 
-final class AllMySmsTransportFactoryTest extends TransportFactoryTestCase
+final class AllMySmsTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+
     public function createFactory(): AllMySmsTransportFactory
     {
         return new AllMySmsTransportFactory();
@@ -44,4 +47,10 @@ public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://login:apiKey@default'];
     }
+
+    public static function incompleteDsnProvider(): iterable
+    {
+        yield ['allmysms://login@default'];
+        yield ['allmysms://:apiKey@default'];
+    }
 }
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\AllMySms\\": "" },

@@ -12,9 +12,9 @@
 namespace Symfony\Component\Notifier\Bridge\AmazonSns\Tests;
 
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
 
-class AmazonSnsTransportFactoryTest extends TransportFactoryTestCase
+class AmazonSnsTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
     public function createFactory(): AmazonSnsTransportFactory
     {

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0",
+        "symfony/notifier": "^7.2",
         "async-aws/sns": "^1.0"
     },
     "autoload": {

@@ -12,10 +12,15 @@
 namespace Symfony\Component\Notifier\Bridge\Bandwidth\Tests;
 
 use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
+use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait;
 
-final class BandwidthTransportFactoryTest extends TransportFactoryTestCase
+final class BandwidthTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+    use MissingRequiredOptionTestTrait;
+
     public function createFactory(): BandwidthTransportFactory
     {
         return new BandwidthTransportFactory();

@@ -21,7 +21,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "require-dev": {
         "symfony/event-dispatcher": "^6.4|^7.0"

@@ -12,10 +12,13 @@
 namespace Symfony\Component\Notifier\Bridge\Bluesky\Tests;
 
 use Symfony\Component\Notifier\Bridge\Bluesky\BlueskyTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
 
-class BlueskyTransportFactoryTest extends TransportFactoryTestCase
+class BlueskyTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+
     public function createFactory(): BlueskyTransportFactory
     {
         return new BlueskyTransportFactory();

@@ -12,10 +12,15 @@
 namespace Symfony\Component\Notifier\Bridge\Brevo\Tests;
 
 use Symfony\Component\Notifier\Bridge\Brevo\BrevoTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
+use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait;
 
-final class BrevoTransportFactoryTest extends TransportFactoryTestCase
+final class BrevoTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+    use MissingRequiredOptionTestTrait;
+
     public function createFactory(): BrevoTransportFactory
     {
         return new BrevoTransportFactory();

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "require-dev": {
         "symfony/event-dispatcher": "^5.4|^6.0|^7.0"

@@ -12,11 +12,16 @@
 namespace Symfony\Component\Notifier\Bridge\Chatwork\Tests;
 
 use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
+use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait;
 use Symfony\Component\Notifier\Transport\TransportFactoryInterface;
 
-class ChatworkTransportFactoryTest extends TransportFactoryTestCase
+class ChatworkTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+    use MissingRequiredOptionTestTrait;
+
     public function createFactory(): TransportFactoryInterface
     {
         return new ChatworkTransportFactory();

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Chatwork\\": "" },

@@ -12,10 +12,13 @@
 namespace Symfony\Component\Notifier\Bridge\ClickSend\Tests;
 
 use Symfony\Component\Notifier\Bridge\ClickSend\ClickSendTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
 
-final class ClickSendTransportFactoryTest extends TransportFactoryTestCase
+final class ClickSendTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+
     public function createFactory(): ClickSendTransportFactory
     {
         return new ClickSendTransportFactory();

@@ -21,7 +21,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "require-dev": {
         "symfony/event-dispatcher": "^6.4|^7.0"

@@ -12,10 +12,13 @@
 namespace Symfony\Component\Notifier\Bridge\Clickatell\Tests;
 
 use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
 
-class ClickatellTransportFactoryTest extends TransportFactoryTestCase
+class ClickatellTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+
     public function createFactory(): ClickatellTransportFactory
     {
         return new ClickatellTransportFactory();

@@ -22,7 +22,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Clickatell\\": "" },

@@ -12,10 +12,13 @@
 namespace Symfony\Component\Notifier\Bridge\ContactEveryone\Tests;
 
 use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
 
-final class ContactEveryoneTransportFactoryTest extends TransportFactoryTestCase
+final class ContactEveryoneTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+
     public function createFactory(): ContactEveryoneTransportFactory
     {
         return new ContactEveryoneTransportFactory();

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\ContactEveryone\\": "" },

@@ -12,10 +12,15 @@
 namespace Symfony\Component\Notifier\Bridge\Discord\Tests;
 
 use Symfony\Component\Notifier\Bridge\Discord\DiscordTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
+use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait;
 
-final class DiscordTransportFactoryTest extends TransportFactoryTestCase
+final class DiscordTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+    use MissingRequiredOptionTestTrait;
+
     public function createFactory(): DiscordTransportFactory
     {
         return new DiscordTransportFactory();

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0",
+        "symfony/notifier": "^7.2",
         "symfony/polyfill-mbstring": "^1.0"
     },
     "autoload": {

@@ -12,13 +12,16 @@
 namespace Symfony\Component\Notifier\Bridge\Engagespot\Tests;
 
 use Symfony\Component\Notifier\Bridge\Engagespot\EngagespotTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
 
 /**
  * @author Daniel GORGAN <https://github.com/danut007ro>
  */
-final class EngagespotTransportFactoryTest extends TransportFactoryTestCase
+final class EngagespotTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+
     public function createFactory(): EngagespotTransportFactory
     {
         return new EngagespotTransportFactory();
@@ -42,4 +45,9 @@ public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://username:password@default'];
     }
+
+    public static function incompleteDsnProvider(): iterable
+    {
+        yield ['engagespot://default'];
+    }
 }
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Engagespot\\": "" },

@@ -12,10 +12,15 @@
 namespace Symfony\Component\Notifier\Bridge\Esendex\Tests;
 
 use Symfony\Component\Notifier\Bridge\Esendex\EsendexTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
+use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait;
 
-final class EsendexTransportFactoryTest extends TransportFactoryTestCase
+final class EsendexTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+    use MissingRequiredOptionTestTrait;
+
     public function createFactory(): EsendexTransportFactory
     {
         return new EsendexTransportFactory();

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Esendex\\": "" },

@@ -12,12 +12,12 @@
 namespace Symfony\Component\Notifier\Bridge\Expo\Tests;
 
 use Symfony\Component\Notifier\Bridge\Expo\ExpoTransportFactory;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
 
 /**
  * @author Imad ZAIRIG <https://github.com/zairigimad>
  */
-final class ExpoTransportFactoryTest extends TransportFactoryTestCase
+final class ExpoTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
     public function createFactory(): ExpoTransportFactory
     {

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Expo\\": "" },

@@ -15,11 +15,16 @@
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Notifier\Bridge\FakeChat\FakeChatTransportFactory;
 use Symfony\Component\Notifier\Exception\LogicException;
-use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase;
+use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait;
+use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait;
 use Symfony\Component\Notifier\Transport\Dsn;
 
-final class FakeChatTransportFactoryTest extends TransportFactoryTestCase
+final class FakeChatTransportFactoryTest extends AbstractTransportFactoryTestCase
 {
+    use IncompleteDsnTestTrait;
+    use MissingRequiredOptionTestTrait;
+
     public function testMissingRequiredMailerDependency()
     {
         $this->expectException(LogicException::class);

@@ -23,7 +23,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/http-client": "^6.4|^7.0",
-        "symfony/notifier": "^6.4|^7.0"
+        "symfony/notifier": "^7.2"
     },
     "require-dev": {
         "psr/log": "^1|^2|^3",