diff --git a/UPGRADE-7.2.md b/UPGRADE-7.2.md index 7c0c8064f4381..092aaea7619f6 100644 --- 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 -------- diff --git a/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportFactoryTest.php index c65b6138fcbc7..4e6f8853e5188 100644 --- a/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportFactoryTest.php @@ -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']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json b/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json index 52ef3a1105a15..a94de27f49f69 100644 --- a/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/AllMySms/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportFactoryTest.php index 489c54a4f0812..05f57e68b6b6f 100644 --- a/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportFactoryTest.php @@ -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 { diff --git a/src/Symfony/Component/Notifier/Bridge/AmazonSns/composer.json b/src/Symfony/Component/Notifier/Bridge/AmazonSns/composer.json index 3d8701cc93dba..7c75c725424f1 100644 --- a/src/Symfony/Component/Notifier/Bridge/AmazonSns/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/AmazonSns/composer.json @@ -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": { diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php index 562b5e3c4824a..ab17a3b9f7329 100644 --- a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json b/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json index 791c16ba65ece..3dae426e42b46 100644 --- a/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/Bluesky/Tests/BlueskyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Bluesky/Tests/BlueskyTransportFactoryTest.php index 5f5b9a37ee47f..c17a2897bbe02 100644 --- a/src/Symfony/Component/Notifier/Bridge/Bluesky/Tests/BlueskyTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Bluesky/Tests/BlueskyTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Brevo/Tests/BrevoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Brevo/Tests/BrevoTransportFactoryTest.php index 07a9185afbd36..0f58c4d981517 100644 --- a/src/Symfony/Component/Notifier/Bridge/Brevo/Tests/BrevoTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Brevo/Tests/BrevoTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Brevo/composer.json b/src/Symfony/Component/Notifier/Bridge/Brevo/composer.json index ed095a3b73be6..0aa845500a3e6 100644 --- a/src/Symfony/Component/Notifier/Bridge/Brevo/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Brevo/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportFactoryTest.php index 88290ad6ade6d..db0e4102e43e7 100644 --- a/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Chatwork/composer.json b/src/Symfony/Component/Notifier/Bridge/Chatwork/composer.json index d61ac6383e1c1..c1cbe7a01adaa 100644 --- a/src/Symfony/Component/Notifier/Bridge/Chatwork/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Chatwork/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/ClickSend/Tests/ClickSendTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/ClickSend/Tests/ClickSendTransportFactoryTest.php index 670447f3390b0..6640d0cb5d4a6 100644 --- a/src/Symfony/Component/Notifier/Bridge/ClickSend/Tests/ClickSendTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/ClickSend/Tests/ClickSendTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/ClickSend/composer.json b/src/Symfony/Component/Notifier/Bridge/ClickSend/composer.json index d925ce65018fc..1676fea9e458f 100644 --- a/src/Symfony/Component/Notifier/Bridge/ClickSend/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/ClickSend/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportFactoryTest.php index 536b333423a33..6e318894e2262 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json b/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json index 472bd7b8b4471..020ce41f9ca12 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportFactoryTest.php index c6724d91bd761..9d2deb93d3561 100644 --- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json index 6c34fde26c6df..6e18ed4424747 100644 --- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportFactoryTest.php index 0918bea28200c..c0bfa31d01f07 100644 --- a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/composer.json b/src/Symfony/Component/Notifier/Bridge/Discord/composer.json index 47211377d2974..4567a41f14f65 100644 --- a/src/Symfony/Component/Notifier/Bridge/Discord/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Discord/composer.json @@ -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": { diff --git a/src/Symfony/Component/Notifier/Bridge/Engagespot/Tests/EngagespotTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Engagespot/Tests/EngagespotTransportFactoryTest.php index f718399fd1387..e1faa8901b53d 100644 --- a/src/Symfony/Component/Notifier/Bridge/Engagespot/Tests/EngagespotTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Engagespot/Tests/EngagespotTransportFactoryTest.php @@ -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 */ -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']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Engagespot/composer.json b/src/Symfony/Component/Notifier/Bridge/Engagespot/composer.json index 105f05b4b9fe5..917b8304e9636 100644 --- a/src/Symfony/Component/Notifier/Bridge/Engagespot/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Engagespot/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportFactoryTest.php index b97d27f9d4383..7d31461bdb1a5 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportFactoryTest.php @@ -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(); diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json index 1f84b5bd4d0ab..a7beb52075fa3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportFactoryTest.php index f6bdb995bd767..2682c50abfd9b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportFactoryTest.php @@ -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 */ -final class ExpoTransportFactoryTest extends TransportFactoryTestCase +final class ExpoTransportFactoryTest extends AbstractTransportFactoryTestCase { public function createFactory(): ExpoTransportFactory { diff --git a/src/Symfony/Component/Notifier/Bridge/Expo/composer.json b/src/Symfony/Component/Notifier/Bridge/Expo/composer.json index f86f245e270b0..002a08c0152a2 100644 --- a/src/Symfony/Component/Notifier/Bridge/Expo/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Expo/composer.json @@ -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\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php index 4d3750cc19160..d7e3d826daef9 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php @@ -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); diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json b/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json index 39e9f231e62d2..24e05807ec32d 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json @@ -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", diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php index a473d3874ff1d..9b5626666b658 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php @@ -15,11 +15,16 @@ use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Notifier\Bridge\FakeSms\FakeSmsTransportFactory; 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 FakeSmsTransportFactoryTest extends TransportFactoryTestCase +final class FakeSmsTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function testMissingRequiredMailerDependency() { $this->expectException(LogicException::class); diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json b/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json index dff68bf49ca14..366ec1b8c48fb 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json @@ -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", diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportFactoryTest.php index ed67b6e39deff..f1a73e1fa6357 100644 --- a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportFactoryTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Notifier\Bridge\Firebase\Tests; use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; /** * @author Oskar Stark */ -final class FirebaseTransportFactoryTest extends TransportFactoryTestCase +final class FirebaseTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): FirebaseTransportFactory { return new FirebaseTransportFactory(); @@ -42,4 +45,10 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://username:password@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['firebase://:password@default']; + yield ['firebase://username@default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json b/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json index 466474bc02e52..fa18127a3f874 100644 --- a/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/composer.json @@ -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\\Firebase\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/FortySixElks/Tests/FortySixElksTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FortySixElks/Tests/FortySixElksTransportFactoryTest.php index 7c634bcebe611..d5041a4b4f801 100644 --- a/src/Symfony/Component/Notifier/Bridge/FortySixElks/Tests/FortySixElksTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FortySixElks/Tests/FortySixElksTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\FortySixElks\Tests; use Symfony\Component\Notifier\Bridge\FortySixElks\FortySixElksTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -class FortySixElksTransportFactoryTest extends TransportFactoryTestCase +class FortySixElksTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): FortySixElksTransportFactory { return new FortySixElksTransportFactory(); @@ -39,4 +42,9 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://api_key@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['forty-six-elks://default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/FortySixElks/composer.json b/src/Symfony/Component/Notifier/Bridge/FortySixElks/composer.json index 1a23dd2dbbbae..05a1311febf52 100644 --- a/src/Symfony/Component/Notifier/Bridge/FortySixElks/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FortySixElks/composer.json @@ -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\\FortySixElks\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php index c1cd740f3fd22..e89fd8f3ac1f3 100644 --- a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\FreeMobile\Tests; use Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransportFactory; -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 FreeMobileTransportFactoryTest extends TransportFactoryTestCase +final class FreeMobileTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): FreeMobileTransportFactory { return new FreeMobileTransportFactory(); @@ -45,4 +50,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://login:pass@default?phone=0611223344']; yield ['somethingElse://login:pass@default']; // missing "phone" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['freemobile://login@default?phone=0611223344']; + yield ['freemobile://:pass@default?phone=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json b/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json index cd9b14ea948dd..8067f44f261f9 100644 --- a/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json @@ -19,7 +19,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\\FreeMobile\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportFactoryTest.php index 9919d55a04569..e2edb2f9eaa7c 100644 --- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportFactoryTest.php @@ -12,14 +12,19 @@ namespace Symfony\Component\Notifier\Bridge\GatewayApi\Tests; use Symfony\Component\Notifier\Bridge\GatewayApi\GatewayApiTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; +use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait; /** * @author Piergiuseppe Longo * @author Oskar Stark */ -final class GatewayApiTransportFactoryTest extends TransportFactoryTestCase +final class GatewayApiTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): GatewayApiTransportFactory { return new GatewayApiTransportFactory(); @@ -48,4 +53,9 @@ public static function missingRequiredOptionProvider(): iterable { yield 'missing option: from' => ['gatewayapi://token@host.test']; } + + public static function unsupportedSchemeProvider(): iterable + { + yield ['somethingElse://login:apiKey@default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json b/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json index 43949def434b7..7abffe9ba4581 100644 --- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/composer.json @@ -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\\GatewayApi\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/GoIp/Tests/GoIpTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/GoIp/Tests/GoIpTransportFactoryTest.php index f9e7283c9b193..c8e7406704699 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoIp/Tests/GoIpTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/GoIp/Tests/GoIpTransportFactoryTest.php @@ -12,13 +12,18 @@ namespace Symfony\Component\Notifier\Bridge\GoIp\Tests; use Symfony\Component\Notifier\Bridge\GoIp\GoIpTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; +use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait; /** * @author Ahmed Ghanem */ -final class GoIpTransportFactoryTest extends TransportFactoryTestCase +final class GoIpTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public static function createProvider(): iterable { yield [ diff --git a/src/Symfony/Component/Notifier/Bridge/GoIp/composer.json b/src/Symfony/Component/Notifier/Bridge/GoIp/composer.json index fd9422485af85..adf9424019077 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoIp/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/GoIp/composer.json @@ -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": { diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportFactoryTest.php index 148366b64fef2..8bb3a287f6872 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\GoogleChat\Tests; use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class GoogleChatTransportFactoryTest extends TransportFactoryTestCase +final class GoogleChatTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): GoogleChatTransportFactory { return new GoogleChatTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json b/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json index 6404ebdafd6c8..37ad9d58e1c39 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/composer.json @@ -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\\GoogleChat\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportFactoryTest.php index d3f83a05f847c..d8ca7b6faab15 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Infobip\Tests; use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory; -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 InfobipTransportFactoryTest extends TransportFactoryTestCase +final class InfobipTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): InfobipTransportFactory { return new InfobipTransportFactory(); @@ -45,4 +50,9 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://authtoken@default?from=FROM']; yield ['somethingElse://authtoken@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['infobip://default?from=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json b/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json index 1f642e5f959de..a76a85aefd36b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json @@ -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\\Infobip\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportFactoryTest.php index e2152b8cb9227..de776bfaaf0e0 100644 --- a/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Iqsms\Tests; use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory; -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 IqsmsTransportFactoryTest extends TransportFactoryTestCase +final class IqsmsTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): IqsmsTransportFactory { return new IqsmsTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json b/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json index ff12fedaa05df..d36db5d2bebf3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Iqsms/composer.json @@ -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\\Iqsms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php index 482e4f411ab0c..def2eaa73b281 100644 --- a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Isendpro\Tests; use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class IsendproTransportFactoryTest extends TransportFactoryTestCase +final class IsendproTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): IsendproTransportFactory { return new IsendproTransportFactory(); @@ -74,12 +77,4 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://account_key_id@default']; } - - /** - * @dataProvider missingRequiredOptionProvider - */ - public function testMissingRequiredOptionException(string $dsn, ?string $message = null) - { - $this->markTestIncomplete('The only required option is account key id, matched by incompleteDsnProvider'); - } } diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json b/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json index c109aa1f1ad69..6f31954ada542 100644 --- a/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json @@ -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" }, "require-dev": { "symfony/event-dispatcher": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/JoliNotif/Tests/JoliNotifTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/JoliNotif/Tests/JoliNotifTransportFactoryTest.php index 7fc16e1efac87..ef2ae2eb06f1d 100644 --- a/src/Symfony/Component/Notifier/Bridge/JoliNotif/Tests/JoliNotifTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/JoliNotif/Tests/JoliNotifTransportFactoryTest.php @@ -12,12 +12,12 @@ namespace Symfony\Component\Notifier\Bridge\JoliNotif\Tests; use Symfony\Component\Notifier\Bridge\JoliNotif\JoliNotifTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; /** * @author Ahmed Ghanem */ -final class JoliNotifTransportFactoryTest extends TransportFactoryTestCase +final class JoliNotifTransportFactoryTest extends AbstractTransportFactoryTestCase { public static function createProvider(): iterable { diff --git a/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/Tests/KazInfoTehTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/Tests/KazInfoTehTransportFactoryTest.php index e156cbbbe0390..071e0163eb29b 100644 --- a/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/Tests/KazInfoTehTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/Tests/KazInfoTehTransportFactoryTest.php @@ -12,13 +12,18 @@ namespace Symfony\Component\Notifier\Bridge\KazInfoTeh\Tests; use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; +use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait; /** * @author Egor Taranov */ -final class KazInfoTehTransportFactoryTest extends TransportFactoryTestCase +final class KazInfoTehTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): KazInfoTehTransportFactory { return new KazInfoTehTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/composer.json b/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/composer.json index 14241829e63e0..aa2a2d126bf4c 100644 --- a/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/KazInfoTeh/composer.json @@ -20,7 +20,7 @@ "php": ">=8.2", "ext-simplexml": "*", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^6.4|^7.0" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\KazInfoTeh\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportFactoryTest.php index 37f594fdfd1ad..5ef5c67a8b637 100644 --- a/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\LightSms\Tests; use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class LightSmsTransportFactoryTest extends TransportFactoryTestCase +final class LightSmsTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): LightSmsTransportFactory { return new LightSmsTransportFactory(); @@ -40,4 +43,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://login:token@default?from=37061234567']; yield ['somethingElse://login:token@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['lightsms://login@default?from=37061234567']; + yield ['lightsms://:token@default?from=37061234567']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json b/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json index 3b7311fd3ff4a..18a3d52027894 100644 --- a/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/LightSms/composer.json @@ -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\\LightSms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php index d6d28254dbb01..024feeffc8a12 100644 --- a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Notifier\Bridge\LineNotify\Tests; use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; /** * @author Akira Kurozumi */ -final class LineNotifyTransportFactoryTest extends TransportFactoryTestCase +final class LineNotifyTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): LineNotifyTransportFactory { return new LineNotifyTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json b/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json index d4693d308990a..c7af719ead66d 100644 --- a/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json @@ -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": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportFactoryTest.php index 3c0ddefcb82cd..39bce0371982c 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\LinkedIn\Tests; use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class LinkedInTransportFactoryTest extends TransportFactoryTestCase +final class LinkedInTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): LinkedInTransportFactory { return new LinkedInTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json b/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json index 39cb828e254e6..eb074f3f8b6d4 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/composer.json @@ -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\\LinkedIn\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Lox24/Tests/Lox24TransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Lox24/Tests/Lox24TransportFactoryTest.php index 815e4fabea6c9..c990d7f3c6636 100644 --- a/src/Symfony/Component/Notifier/Bridge/Lox24/Tests/Lox24TransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Lox24/Tests/Lox24TransportFactoryTest.php @@ -12,14 +12,19 @@ namespace Symfony\Component\Notifier\Bridge\Lox24\Tests; use Symfony\Component\Notifier\Bridge\Lox24\Lox24TransportFactory; -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; /** * @author Andrei Lebedev */ -class Lox24TransportFactoryTest extends TransportFactoryTestCase +class Lox24TransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public static function supportsProvider(): iterable { yield [true, 'lox24://123456:aaaabbbbbbccccccdddddeeee@default?from=0611223344']; diff --git a/src/Symfony/Component/Notifier/Bridge/Lox24/composer.json b/src/Symfony/Component/Notifier/Bridge/Lox24/composer.json index ca580f06d98ef..98f09a409937d 100644 --- a/src/Symfony/Component/Notifier/Bridge/Lox24/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Lox24/composer.json @@ -12,7 +12,7 @@ "require": { "php": ">=8.1", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^7.1" + "symfony/notifier": "^7.2" }, "require-dev": { "symfony/webhook": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php index c9f81e93beebb..1a6d599142421 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Mailjet\Tests; use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class MailjetTransportFactoryTest extends TransportFactoryTestCase +final class MailjetTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): MailjetTransportFactory { return new MailjetTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/composer.json b/src/Symfony/Component/Notifier/Bridge/Mailjet/composer.json index 962dd5a67e78a..9aa215e815fb2 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mailjet/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mailjet/composer.json @@ -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\\Mailjet\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php index a21f6ca6777e8..fdef725fdd344 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Notifier\Bridge\Mastodon\Tests; use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; /** * @author Quentin Dequippe */ -class MastodonTransportFactoryTest extends TransportFactoryTestCase +class MastodonTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): MastodonTransportFactory { return new MastodonTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json index 14c343f251468..d09d403fc7b36 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json @@ -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/mime": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportFactoryTest.php index 3a7c3f1864fd4..e4b2d708bb677 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportFactoryTest.php @@ -12,13 +12,18 @@ namespace Symfony\Component\Notifier\Bridge\Mattermost\Tests; use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; +use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait; /** * @author Oskar Stark */ -final class MattermostTransportFactoryTest extends TransportFactoryTestCase +final class MattermostTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): MattermostTransportFactory { return new MattermostTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json b/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json index 464b57651928e..958d64f42f865 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json @@ -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\\Mattermost\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportFactoryTest.php index 559ffe550b691..697713a933d88 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportFactoryTest.php @@ -15,13 +15,13 @@ use Symfony\Component\Mercure\HubRegistry; use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory; use Symfony\Component\Notifier\Exception\IncompleteDsnException; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; use Symfony\Component\Notifier\Transport\Dsn; /** * @author Mathias Arlaud */ -final class MercureTransportFactoryTest extends TransportFactoryTestCase +final class MercureTransportFactoryTest extends AbstractTransportFactoryTestCase { public function createFactory(): MercureTransportFactory { diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json index 384a85350dd9a..843abb5456982 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.2", "symfony/mercure": "^0.5.2|^0.6", - "symfony/notifier": "^6.4|^7.0", + "symfony/notifier": "^7.2", "symfony/service-contracts": "^2.5|^3" }, "autoload": { diff --git a/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportFactoryTest.php index e050c6e9f8b07..0743eb2e71ee2 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\MessageBird\Tests; use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory; -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 MessageBirdTransportFactoryTest extends TransportFactoryTestCase +final class MessageBirdTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): MessageBirdTransportFactory { return new MessageBirdTransportFactory(); @@ -45,4 +50,9 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://token@default?from=0611223344']; yield ['somethingElse://token@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['messagebird://default?from=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json b/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json index 544be5364638b..c1729e047f3fd 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/MessageBird/composer.json @@ -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\\MessageBird\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportFactoryTest.php index d51d06c2dbe34..fc29180f53bcb 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\MessageMedia\Tests; use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class MessageMediaTransportFactoryTest extends TransportFactoryTestCase +final class MessageMediaTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): MessageMediaTransportFactory { return new MessageMediaTransportFactory(); @@ -44,4 +47,10 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://apiKey:apiSecret@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['messagemedia://apiKey@default']; + yield ['messagemedia://:apiSecret@default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/MessageMedia/composer.json b/src/Symfony/Component/Notifier/Bridge/MessageMedia/composer.json index 68f29dabb249b..187f9ed1fde88 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageMedia/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/MessageMedia/composer.json @@ -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\\MessageMedia\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportFactoryTest.php index c6aa2b93de398..6901877611906 100644 --- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportFactoryTest.php @@ -12,9 +12,9 @@ namespace Symfony\Component\Notifier\Bridge\MicrosoftTeams\Tests; use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; -final class MicrosoftTeamsTransportFactoryTest extends TransportFactoryTestCase +final class MicrosoftTeamsTransportFactoryTest extends AbstractTransportFactoryTestCase { public function createFactory(): MicrosoftTeamsTransportFactory { diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json index d96c125247443..37722b03ec16a 100644 --- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/composer.json @@ -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\\MicrosoftTeams\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportFactoryTest.php index 89d85b8364e2d..0f586c5c7b35d 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportFactoryTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Notifier\Bridge\Mobyt\Tests; use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; /** * @author Oskar Stark */ -final class MobytTransportFactoryTest extends TransportFactoryTestCase +final class MobytTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): MobytTransportFactory { return new MobytTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json index fda5daa3a78ee..1317236985478 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json @@ -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\\Mobyt\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Novu/Tests/NovuTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Novu/Tests/NovuTransportFactoryTest.php index 99044057ce68a..f827d86c290f9 100644 --- a/src/Symfony/Component/Notifier/Bridge/Novu/Tests/NovuTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Novu/Tests/NovuTransportFactoryTest.php @@ -12,11 +12,14 @@ namespace Symfony\Component\Notifier\Bridge\Novu\Tests; use Symfony\Component\Notifier\Bridge\Novu\NovuTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; use Symfony\Component\Notifier\Transport\TransportFactoryInterface; -class NovuTransportFactoryTest extends TransportFactoryTestCase +class NovuTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): TransportFactoryInterface { return new NovuTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Novu/composer.json b/src/Symfony/Component/Notifier/Bridge/Novu/composer.json index 809403ff49a4e..999320b21523b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Novu/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Novu/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.1", "symfony/http-client": "^5.4|^6.0|^7.0", - "symfony/notifier": "^6.4|^7.0" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Novu\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php index 35a77a54b379a..dcd2a7bd08d3f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php @@ -12,13 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Ntfy\Tests; use Symfony\Component\Notifier\Bridge\Ntfy\NtfyTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; use Symfony\Component\Notifier\Transport\TransportFactoryInterface; /** * @author Mickael Perraud */ -final class NtfyTransportFactoryTest extends TransportFactoryTestCase +final class NtfyTransportFactoryTest extends AbstractTransportFactoryTestCase { public function createFactory(): TransportFactoryInterface { diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/composer.json b/src/Symfony/Component/Notifier/Bridge/Ntfy/composer.json index 6964e83d70582..fc0259f0a3fb2 100644 --- a/src/Symfony/Component/Notifier/Bridge/Ntfy/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Ntfy/composer.json @@ -19,7 +19,7 @@ "php": ">=8.2", "symfony/clock": "^6.4|^7.0", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^6.4|^7.0" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Ntfy\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportFactoryTest.php index d41345182f571..af1f09b54eac8 100644 --- a/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Octopush\Tests; use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory; -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 OctopushTransportFactoryTest extends TransportFactoryTestCase +final class OctopushTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): OctopushTransportFactory { return new OctopushTransportFactory(); @@ -46,4 +51,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://userLogin:apiKey@default?from=0611223344']; yield ['somethingElse://userLogin:apiKey@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['octopush://userLogin@default?from=Heyliot&type=FR']; + yield ['octopush://:apiKey@default?from=Heyliot&type=FR']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json b/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json index b579b1f2d9320..d081b539bc179 100644 --- a/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Octopush/composer.json @@ -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\\Octopush\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php index 13762a97f4088..24f9a224cc27e 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Notifier\Bridge\OneSignal\Tests; use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; /** * @author Tomas Norkūnas */ -final class OneSignalTransportFactoryTest extends TransportFactoryTestCase +final class OneSignalTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): OneSignalTransportFactory { return new OneSignalTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/composer.json b/src/Symfony/Component/Notifier/Bridge/OneSignal/composer.json index 30329ead59888..2d3d243cf3884 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/composer.json @@ -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\\OneSignal\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/OrangeSms/Tests/OrangeSmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/OrangeSms/Tests/OrangeSmsTransportFactoryTest.php index bd999b9c366dc..7ce36a1e94216 100644 --- a/src/Symfony/Component/Notifier/Bridge/OrangeSms/Tests/OrangeSmsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OrangeSms/Tests/OrangeSmsTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\OrangeSms\Tests; use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory; -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 OrangeSmsTransportFactoryTest extends TransportFactoryTestCase +final class OrangeSmsTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): OrangeSmsTransportFactory { return new OrangeSmsTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json b/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json index 7255f3cc7277f..24923f1bc0bb9 100644 --- a/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json @@ -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\\OrangeSms\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php index 79ba7c8cc5f00..1675397caa785 100644 --- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\OvhCloud\Tests; use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory; -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 OvhCloudTransportFactoryTest extends TransportFactoryTestCase +final class OvhCloudTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): OvhCloudTransportFactory { return new OvhCloudTransportFactory(); @@ -69,4 +74,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://key:secret@default?consumer_key=consumerKey']; yield ['somethingElse://key:secret@default?sender=sender']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['ovhcloud://key@default?service_name=serviceName&sender=sender']; + yield ['ovhcloud://:secret@default?service_name=serviceName&sender=sender']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json b/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json index 317d87044b20b..661738b91a34d 100644 --- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json @@ -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\\OvhCloud\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php index 37c7cde49598c..8fb0be0a53693 100644 --- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\PagerDuty\Tests; use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class PagerDutyTransportFactoryTest extends TransportFactoryTestCase +final class PagerDutyTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): PagerDutyTransportFactory { return new PagerDutyTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json b/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json index c230357b622f8..b75ee3960c62a 100644 --- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json @@ -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\\PagerDuty\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php index baff73a029284..fc85cab260d63 100644 --- a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Plivo\Tests; use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory; -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 PlivoTransportFactoryTest extends TransportFactoryTestCase +final class PlivoTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): PlivoTransportFactory { return new PlivoTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json b/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json index 98d04826249d7..4a4c3cb13fd21 100644 --- a/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/Primotexto/Tests/PrimotextoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Primotexto/Tests/PrimotextoTransportFactoryTest.php index 7f98451881de9..33857041e9246 100644 --- a/src/Symfony/Component/Notifier/Bridge/Primotexto/Tests/PrimotextoTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Primotexto/Tests/PrimotextoTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Primotexto\Tests; use Symfony\Component\Notifier\Bridge\Primotexto\PrimotextoTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class PrimotextoTransportFactoryTest extends TransportFactoryTestCase +final class PrimotextoTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): PrimotextoTransportFactory { return new PrimotextoTransportFactory(); @@ -44,4 +47,9 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://apiKey@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['primotexto://default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php index a22389dafda0d..fe0dc2b072e96 100644 --- a/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php @@ -12,9 +12,9 @@ namespace Symfony\Component\Notifier\Bridge\Pushover\Tests; use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; -final class PushoverTransportFactoryTest extends TransportFactoryTestCase +final class PushoverTransportFactoryTest extends AbstractTransportFactoryTestCase { public function createFactory(): PushoverTransportFactory { diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json b/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json index bb36556c730a6..926267eee9dc8 100644 --- a/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/Pushy/Tests/PushyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Pushy/Tests/PushyTransportFactoryTest.php index bf3164ac4ddab..72dde50c6343b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Pushy/Tests/PushyTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Pushy/Tests/PushyTransportFactoryTest.php @@ -12,9 +12,9 @@ namespace Symfony\Component\Notifier\Bridge\Pushy\Tests; use Symfony\Component\Notifier\Bridge\Pushy\PushyTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; -final class PushyTransportFactoryTest extends TransportFactoryTestCase +final class PushyTransportFactoryTest extends AbstractTransportFactoryTestCase { public function createFactory(): PushyTransportFactory { diff --git a/src/Symfony/Component/Notifier/Bridge/Pushy/composer.json b/src/Symfony/Component/Notifier/Bridge/Pushy/composer.json index 4739f25084de4..e207e4b3a2811 100644 --- a/src/Symfony/Component/Notifier/Bridge/Pushy/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Pushy/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=8.2", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^7.1" + "symfony/notifier": "^7.2" }, "require-dev": { "symfony/event-dispatcher": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/Redlink/Tests/RedlinkTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Redlink/Tests/RedlinkTransportFactoryTest.php index 6a9c2b76b201f..413bf65cf3cbc 100644 --- a/src/Symfony/Component/Notifier/Bridge/Redlink/Tests/RedlinkTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Redlink/Tests/RedlinkTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Redlink\Tests; use Symfony\Component\Notifier\Bridge\Redlink\RedlinkTransportFactory; -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 RedlinkTransportFactoryTest extends TransportFactoryTestCase +final class RedlinkTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): RedlinkTransportFactory { return new RedlinkTransportFactory(); @@ -47,4 +52,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://apiToken:appToken@default?from=FROM']; yield ['somethingElse://apiToken:appToken@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['redlink://aaaaa@default?from=TEST']; + yield ['redlink://:bbbbbb@default?from=TEST']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Redlink/composer.json b/src/Symfony/Component/Notifier/Bridge/Redlink/composer.json index 773eb65a68d5f..e56215f7b36ba 100644 --- a/src/Symfony/Component/Notifier/Bridge/Redlink/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Redlink/composer.json @@ -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\\Redlink\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php index 24de16eefe0b0..cc32c07706f2e 100644 --- a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\RingCentral\Tests; use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory; -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 RingCentralTransportFactoryTest extends TransportFactoryTestCase +final class RingCentralTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): RingCentralTransportFactory { return new RingCentralTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json b/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json index a6a7d69d8f245..df9f13c56189c 100644 --- a/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportFactoryTest.php index 3145d3a4dff51..8927c72e9506d 100644 --- a/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportFactoryTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Notifier\Bridge\RocketChat\Tests; use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; /** * @author Oskar Stark */ -final class RocketChatTransportFactoryTest extends TransportFactoryTestCase +final class RocketChatTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): RocketChatTransportFactory { return new RocketChatTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json b/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json index b07d3c3f636a5..bc7bd923340a8 100644 --- a/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json @@ -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\\RocketChat\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php index a058572a37407..d17dfd07de3e9 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Sendberry\Tests; use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory; -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 SendberryTransportFactoryTest extends TransportFactoryTestCase +final class SendberryTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): SendberryTransportFactory { return new SendberryTransportFactory(); @@ -46,4 +51,9 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://api_key@default?from=+0611223344']; yield ['somethingElse://api_key@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['sendberry://default?from=%2B0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Sendberry/composer.json b/src/Symfony/Component/Notifier/Bridge/Sendberry/composer.json index 549790a67a62e..56a9e2163023e 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sendberry/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Sendberry/composer.json @@ -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\\Sendberry\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Sevenio/Tests/SevenIoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sevenio/Tests/SevenIoTransportFactoryTest.php index e7130d982b9ac..6ff8dc6475deb 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sevenio/Tests/SevenIoTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sevenio/Tests/SevenIoTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Sevenio\Tests; use Symfony\Component\Notifier\Bridge\Sevenio\SevenIoTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SevenIoTransportFactoryTest extends TransportFactoryTestCase +final class SevenIoTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SevenIoTransportFactory { return new SevenIoTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Sevenio/composer.json b/src/Symfony/Component/Notifier/Bridge/Sevenio/composer.json index 328b88904806d..c2b6d0b5264c7 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sevenio/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Sevenio/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.2", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^7.1" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Sevenio\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php index d69d38bd7e737..e547526f7d392 100644 --- a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\SimpleTextin\Tests; use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SimpleTextinTransportFactoryTest extends TransportFactoryTestCase +final class SimpleTextinTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SimpleTextinTransportFactory { return new SimpleTextinTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json index 1bda7793bf1c2..f27e41c7b090a 100644 --- a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportFactoryTest.php index 9b400ae62a372..3a177d8ee4ae6 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Sinch\Tests; use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory; -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 SinchTransportFactoryTest extends TransportFactoryTestCase +final class SinchTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): SinchTransportFactory { return new SinchTransportFactory(); @@ -45,4 +50,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://accountSid:authToken@default?from=0611223344']; yield ['somethingElse://accountSid:authToken@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['sinch://accountSid@default?from=0611223344']; + yield ['sinch://:authToken@default?from=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json b/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json index 519a5cecc2a02..296393553b02d 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json @@ -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\\Sinch\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Sipgate/Tests/SipgateTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sipgate/Tests/SipgateTransportFactoryTest.php index 5656e6f5d78fe..909bafb33091b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sipgate/Tests/SipgateTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sipgate/Tests/SipgateTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Sipgate\Tests; use Symfony\Component\Notifier\Bridge\Sipgate\SipgateTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -class SipgateTransportFactoryTest extends TransportFactoryTestCase +class SipgateTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SipgateTransportFactory { return new SipgateTransportFactory(); @@ -40,4 +43,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://tokenId:token@host.test?senderId=s1']; yield ['somethingElse://tokenId:token@host.test']; // missing senderId } + + public static function incompleteDsnProvider(): iterable + { + yield ['sipgate://:token@host.test?senderId=s1']; + yield ['sipgate://tokenId@host.test?senderId=s1']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportFactoryTest.php index da9e6abaabb4f..2f296e5a2e069 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Slack\Tests; use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SlackTransportFactoryTest extends TransportFactoryTestCase +final class SlackTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SlackTransportFactory { return new SlackTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/composer.json b/src/Symfony/Component/Notifier/Bridge/Slack/composer.json index ea53ea1b6d627..8507a4d041254 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Slack/composer.json @@ -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\\Slack\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php index 18536b3cf3f61..cb35fd9a82578 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Sms77\Tests; use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class Sms77TransportFactoryTest extends TransportFactoryTestCase +final class Sms77TransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): Sms77TransportFactory { return new Sms77TransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/composer.json b/src/Symfony/Component/Notifier/Bridge/Sms77/composer.json index 82f648af97a84..9113d713843da 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/composer.json @@ -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\\Sms77\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportFactoryTest.php index 7eb66a6779291..abac990aa5653 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\SmsBiuras\Tests; use Symfony\Component\Notifier\Bridge\SmsBiuras\SmsBiurasTransportFactory; -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 SmsBiurasTransportFactoryTest extends TransportFactoryTestCase +final class SmsBiurasTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): SmsBiurasTransportFactory { return new SmsBiurasTransportFactory(); @@ -50,4 +55,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://uid:api_key@default?from=0611223344']; yield ['somethingElse://uid:api_key@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['smsbiuras://uid:@default?from=0611223344']; + yield ['smsbiuras://uid@default?from=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json index 5313155f595b2..dc5c5260ec89f 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/composer.json @@ -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\\SmsBiuras\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/SmsFactor/Tests/SmsFactorTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SmsFactor/Tests/SmsFactorTransportFactoryTest.php index 45cdef028a5a7..f17659e793afe 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsFactor/Tests/SmsFactorTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SmsFactor/Tests/SmsFactorTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\SmsFactor\Tests; use Symfony\Component\Notifier\Bridge\SmsFactor\SmsFactorTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SmsFactorTransportFactoryTest extends TransportFactoryTestCase +final class SmsFactorTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SmsFactorTransportFactory { return new SmsFactorTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json b/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json index 68f95cff2ce70..b530771b49dce 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json @@ -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\\SmsFactor\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/SmsSluzba/Tests/SmsSluzbaTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SmsSluzba/Tests/SmsSluzbaTransportFactoryTest.php index ab7df84b1c5fa..e8b52a190847f 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsSluzba/Tests/SmsSluzbaTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SmsSluzba/Tests/SmsSluzbaTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\SmsSluzba\Tests; use Symfony\Component\Notifier\Bridge\SmsSluzba\SmsSluzbaTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SmsSluzbaTransportFactoryTest extends TransportFactoryTestCase +final class SmsSluzbaTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SmsSluzbaTransportFactory { return new SmsSluzbaTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/SmsSluzba/composer.json b/src/Symfony/Component/Notifier/Bridge/SmsSluzba/composer.json index 0846bf7777567..c4256019769a0 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsSluzba/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SmsSluzba/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.1", "symfony/http-client": "^6.4|^7.1", - "symfony/notifier": "^7.1", + "symfony/notifier": "^7.2", "symfony/serializer": "^6.4|^7.1" }, "autoload": { diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php index 02995eb4bad5a..fd19a6a301276 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Smsapi\Tests; use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SmsapiTransportFactoryTest extends TransportFactoryTestCase +final class SmsapiTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SmsapiTransportFactory { return new SmsapiTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json index 5490e7c87e886..656d455ac3fa8 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json @@ -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\\Smsapi\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Smsbox/Tests/SmsboxTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsbox/Tests/SmsboxTransportFactoryTest.php index 5e2596e0fffe0..f6613996d7057 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsbox/Tests/SmsboxTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsbox/Tests/SmsboxTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Smsbox\Tests; use Symfony\Component\Notifier\Bridge\Smsbox\SmsboxTransportFactory; -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 SmsboxTransportFactoryTest extends TransportFactoryTestCase +final class SmsboxTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): SmsboxTransportFactory { return new SmsboxTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Smsbox/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsbox/composer.json index c6e27462a7518..fc6fd5b6d3250 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsbox/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Smsbox/composer.json @@ -27,7 +27,7 @@ "php": ">=8.2", "symfony/clock": "^6.4|^7.0", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^7.1", + "symfony/notifier": "^7.2", "symfony/polyfill-php83": "^1.28" }, "autoload": { diff --git a/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportFactoryTest.php index 1ff82c7996515..659da96446b2f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Smsc\Tests; use Symfony\Component\Notifier\Bridge\Smsc\SmscTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\MissingRequiredOptionTestTrait; -final class SmscTransportFactoryTest extends TransportFactoryTestCase +final class SmscTransportFactoryTest extends AbstractTransportFactoryTestCase { + use MissingRequiredOptionTestTrait; + public function createFactory(): SmscTransportFactory { return new SmscTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Smsc/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsc/composer.json index c03c1e3ba681e..2a5bded5aea9b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsc/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Smsc/composer.json @@ -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\\Smsc\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Smsense/Tests/SmsenseTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsense/Tests/SmsenseTransportFactoryTest.php index e55eff864cee7..9b0cb8a94d22b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsense/Tests/SmsenseTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsense/Tests/SmsenseTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Smsense\Tests; use Symfony\Component\Notifier\Bridge\Smsense\SmsenseTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -class SmsenseTransportFactoryTest extends TransportFactoryTestCase +class SmsenseTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SmsenseTransportFactory { return new SmsenseTransportFactory(); @@ -39,4 +42,9 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://api_key@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['smsense://default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Smsense/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsense/composer.json index b5194caec8250..4002648bd504b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsense/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Smsense/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.2", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^7.1" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Smsense\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Smsmode/Tests/SmsmodeTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsmode/Tests/SmsmodeTransportFactoryTest.php index 4e8aee66e09fc..787b9e6fc6996 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsmode/Tests/SmsmodeTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsmode/Tests/SmsmodeTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Smsmode\Tests; use Symfony\Component\Notifier\Bridge\Smsmode\SmsmodeTransportFactory; -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 SmsmodeTransportFactoryTest extends TransportFactoryTestCase +final class SmsmodeTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): SmsmodeTransportFactory { return new SmsmodeTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Smsmode/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsmode/composer.json index b3e2dee88b63e..a9131f75ed3ad 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsmode/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Smsmode/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportFactoryTest.php index c39fef4d9600c..9b16d765bbb85 100644 --- a/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\SpotHit\Tests; use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class SpotHitTransportFactoryTest extends TransportFactoryTestCase +final class SpotHitTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): SpotHitTransportFactory { return new SpotHitTransportFactory(); @@ -50,4 +53,9 @@ public static function unsupportedSchemeProvider(): iterable yield ['foobar://api_token@default?from=MyCompany']; yield ['foobar://api_token@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['spothit://default?from=MyCompany']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json b/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json index b5919e8c64436..a9b66ba3636b4 100644 --- a/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SpotHit/composer.json @@ -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\\SpotHit\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportFactoryTest.php index 2daffac7fd344..278a315c65dba 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Telegram\Tests; use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class TelegramTransportFactoryTest extends TransportFactoryTestCase +final class TelegramTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): TelegramTransportFactory { return new TelegramTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json b/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json index 62f95e0ad93de..435641839410a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/composer.json @@ -19,7 +19,7 @@ "php": ">=8.2", "symfony/http-client": "^6.4|^7.0", "symfony/mime": "^6.4|^7.0", - "symfony/notifier": "^6.4|^7.0" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Telegram\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportFactoryTest.php index e1ecaabac855c..007d81677601b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Telnyx\Tests; use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory; -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 TelnyxTransportFactoryTest extends TransportFactoryTestCase +final class TelnyxTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): TelnyxTransportFactory { return new TelnyxTransportFactory(); @@ -50,4 +55,9 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://api_key@default?from=+0611223344']; yield ['somethingElse://api_key@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['telnyx://default?from=%2B0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Telnyx/composer.json b/src/Symfony/Component/Notifier/Bridge/Telnyx/composer.json index 8a1c2e11ce568..3b53e750bd395 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telnyx/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Telnyx/composer.json @@ -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\\Telnyx\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php index 5d255b4a9f16a..4a560018476f3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Termii\Tests; use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory; -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 TermiiTransportFactoryTest extends TransportFactoryTestCase +final class TermiiTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): TermiiTransportFactory { return new TermiiTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/composer.json b/src/Symfony/Component/Notifier/Bridge/Termii/composer.json index d978f05b7db4e..31ed79a368071 100644 --- a/src/Symfony/Component/Notifier/Bridge/Termii/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Termii/composer.json @@ -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" diff --git a/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportFactoryTest.php index fa83507f99d6c..7b384a4c467f4 100644 --- a/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\TurboSms\Tests; use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory; -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 TurboSmsTransportFactoryTest extends TransportFactoryTestCase +final class TurboSmsTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): TurboSmsTransportFactory { return new TurboSmsTransportFactory(); @@ -50,4 +55,9 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://authToken@default?from=acme']; yield ['somethingElse://authToken@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['turbosms://default?from=acme']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json b/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json index fd23b904a6974..36c6def23ae2d 100644 --- a/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json @@ -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": { diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportFactoryTest.php index 37a576fe499c8..a35eb9b0cc41a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Twilio\Tests; use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory; -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 TwilioTransportFactoryTest extends TransportFactoryTestCase +final class TwilioTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): TwilioTransportFactory { return new TwilioTransportFactory(); @@ -45,4 +50,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://accountSid:authToken@default?from=0611223344']; yield ['somethingElse://accountSid:authToken@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['twilio://:authToken@default?from=0611223344']; + yield ['twilio://accountSid:@default?from=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json index ab37b09e560e3..ee1872491bdfb 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json @@ -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/webhook": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php index 3238489dcc4c0..b88eaa15ca43c 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Twitter\Tests; use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -class TwitterTransportFactoryTest extends TransportFactoryTestCase +class TwitterTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): TwitterTransportFactory { return new TwitterTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json index 8319593dea7ff..f50531a1448ed 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json @@ -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/mime": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/Unifonic/Tests/UnifonicTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Unifonic/Tests/UnifonicTransportFactoryTest.php index 081f47a0c71ce..671dfe5d8da71 100644 --- a/src/Symfony/Component/Notifier/Bridge/Unifonic/Tests/UnifonicTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Unifonic/Tests/UnifonicTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Unifonic\Tests; use Symfony\Component\Notifier\Bridge\Unifonic\UnifonicTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class UnifonicTransportFactoryTest extends TransportFactoryTestCase +final class UnifonicTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): UnifonicTransportFactory { return new UnifonicTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Unifonic/composer.json b/src/Symfony/Component/Notifier/Bridge/Unifonic/composer.json index 6d1abb380b7d8..48fbbdf2db84b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Unifonic/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Unifonic/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=8.2", "symfony/http-client": "^6.4|^7.0", - "symfony/notifier": "^7.1" + "symfony/notifier": "^7.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Unifonic\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php index 08ead850f20e4..864de2c9b18c5 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Vonage\Tests; use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory; -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 VonageTransportFactoryTest extends TransportFactoryTestCase +final class VonageTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): VonageTransportFactory { return new VonageTransportFactory(); @@ -45,4 +50,10 @@ public static function unsupportedSchemeProvider(): iterable yield ['somethingElse://apiKey:apiSecret@default?from=0611223344']; yield ['somethingElse://apiKey:apiSecret@default']; // missing "from" option } + + public static function incompleteDsnProvider(): iterable + { + yield ['vonage://:apiSecret@default?from=0611223344']; + yield ['vonage://apiKey:@default?from=0611223344']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/composer.json b/src/Symfony/Component/Notifier/Bridge/Vonage/composer.json index 4f0a832f3c40b..243f0903155fe 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/composer.json @@ -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/webhook": "^6.4|^7.0" diff --git a/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportFactoryTest.php index f5c8a6d0934fc..19b896539ed14 100644 --- a/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Yunpian\Tests; use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class YunpianTransportFactoryTest extends TransportFactoryTestCase +final class YunpianTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): YunpianTransportFactory { return new YunpianTransportFactory(); @@ -39,4 +42,9 @@ public static function unsupportedSchemeProvider(): iterable { yield ['somethingElse://api_key@default']; } + + public static function incompleteDsnProvider(): iterable + { + yield ['yunpian://default']; + } } diff --git a/src/Symfony/Component/Notifier/Bridge/Yunpian/composer.json b/src/Symfony/Component/Notifier/Bridge/Yunpian/composer.json index 340dacd599a20..58366edc8eb74 100644 --- a/src/Symfony/Component/Notifier/Bridge/Yunpian/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Yunpian/composer.json @@ -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\\Yunpian\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Zendesk/Tests/ZendeskTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Zendesk/Tests/ZendeskTransportFactoryTest.php index 1bcc34f282d85..65ff6a8eae3e4 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zendesk/Tests/ZendeskTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Zendesk/Tests/ZendeskTransportFactoryTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Notifier\Bridge\Zendesk\Tests; use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory; -use Symfony\Component\Notifier\Test\TransportFactoryTestCase; +use Symfony\Component\Notifier\Test\AbstractTransportFactoryTestCase; +use Symfony\Component\Notifier\Test\IncompleteDsnTestTrait; -final class ZendeskTransportFactoryTest extends TransportFactoryTestCase +final class ZendeskTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + public function createFactory(): ZendeskTransportFactory { return new ZendeskTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Zendesk/composer.json b/src/Symfony/Component/Notifier/Bridge/Zendesk/composer.json index 746a3fa619400..87044d4d4829e 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zendesk/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Zendesk/composer.json @@ -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\\Zendesk\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportFactoryTest.php index c8c3b2a9c039e..20ae1e63b9c95 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportFactoryTest.php @@ -12,10 +12,15 @@ namespace Symfony\Component\Notifier\Bridge\Zulip\Tests; use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory; -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 ZulipTransportFactoryTest extends TransportFactoryTestCase +final class ZulipTransportFactoryTest extends AbstractTransportFactoryTestCase { + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; + public function createFactory(): ZulipTransportFactory { return new ZulipTransportFactory(); diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json b/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json index 2559281842ed9..f124c18e7e58b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json @@ -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\\Zulip\\": "" }, diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md index 2f8b13648df27..e0679c1af3867 100644 --- a/src/Symfony/Component/Notifier/CHANGELOG.md +++ b/src/Symfony/Component/Notifier/CHANGELOG.md @@ -4,6 +4,11 @@ CHANGELOG 7.2 --- + * 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. + * Make `TransportFactoryTestCase` and `TransportTestCase` compatible with PHPUnit 10+ * Add `Desktop` channel diff --git a/src/Symfony/Component/Notifier/Test/AbstractTransportFactoryTestCase.php b/src/Symfony/Component/Notifier/Test/AbstractTransportFactoryTestCase.php new file mode 100644 index 0000000000000..557cfc2cf3e7f --- /dev/null +++ b/src/Symfony/Component/Notifier/Test/AbstractTransportFactoryTestCase.php @@ -0,0 +1,80 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Notifier\Test; + +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\TestCase; +use Symfony\Component\Notifier\Exception\UnsupportedSchemeException; +use Symfony\Component\Notifier\Transport\Dsn; +use Symfony\Component\Notifier\Transport\TransportFactoryInterface; +use Symfony\Component\Notifier\Transport\TransportInterface; + +abstract class AbstractTransportFactoryTestCase extends TestCase +{ + abstract public function createFactory(): TransportFactoryInterface; + + /** + * @return iterable + */ + abstract public static function supportsProvider(): iterable; + + /** + * @return iterable + */ + abstract public static function createProvider(): iterable; + + /** + * @return iterable + */ + abstract public static function unsupportedSchemeProvider(): iterable; + + /** + * @dataProvider supportsProvider + */ + #[DataProvider('supportsProvider')] + public function testSupports(bool $expected, string $dsn) + { + $factory = $this->createFactory(); + + $this->assertSame($expected, $factory->supports(new Dsn($dsn))); + } + + /** + * @dataProvider createProvider + */ + #[DataProvider('createProvider')] + public function testCreate(string $expected, string $dsn) + { + $factory = $this->createFactory(); + $transport = $factory->create(new Dsn($dsn)); + + $this->assertSame($expected, (string) $transport); + } + + /** + * @dataProvider unsupportedSchemeProvider + */ + #[DataProvider('unsupportedSchemeProvider')] + public function testUnsupportedSchemeException(string $dsn, ?string $message = null) + { + $factory = $this->createFactory(); + + $dsn = new Dsn($dsn); + + $this->expectException(UnsupportedSchemeException::class); + if (null !== $message) { + $this->expectExceptionMessage($message); + } + + $factory->create($dsn); + } +} diff --git a/src/Symfony/Component/Notifier/Test/IncompleteDsnTestTrait.php b/src/Symfony/Component/Notifier/Test/IncompleteDsnTestTrait.php new file mode 100644 index 0000000000000..9077af0ad5d80 --- /dev/null +++ b/src/Symfony/Component/Notifier/Test/IncompleteDsnTestTrait.php @@ -0,0 +1,33 @@ + + */ + abstract public static function incompleteDsnProvider(): iterable; + + /** + * @dataProvider incompleteDsnProvider + */ + #[DataProvider('incompleteDsnProvider')] + public function testIncompleteDsnException(string $dsn, ?string $message = null) + { + $factory = $this->createFactory(); + + $dsn = new Dsn($dsn); + + $this->expectException(IncompleteDsnException::class); + if (null !== $message) { + $this->expectExceptionMessage($message); + } + + $factory->create($dsn); + } +} diff --git a/src/Symfony/Component/Notifier/Test/MissingRequiredOptionTestTrait.php b/src/Symfony/Component/Notifier/Test/MissingRequiredOptionTestTrait.php new file mode 100644 index 0000000000000..ac16f7f65bb84 --- /dev/null +++ b/src/Symfony/Component/Notifier/Test/MissingRequiredOptionTestTrait.php @@ -0,0 +1,42 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Notifier\Test; + +use PHPUnit\Framework\Attributes\DataProvider; +use Symfony\Component\Notifier\Exception\MissingRequiredOptionException; +use Symfony\Component\Notifier\Transport\Dsn; + +trait MissingRequiredOptionTestTrait +{ + /** + * @return iterable + */ + abstract public static function missingRequiredOptionProvider(): iterable; + + /** + * @dataProvider missingRequiredOptionProvider + */ + #[DataProvider('missingRequiredOptionProvider')] + public function testMissingRequiredOptionException(string $dsn, ?string $message = null) + { + $factory = $this->createFactory(); + + $dsn = new Dsn($dsn); + + $this->expectException(MissingRequiredOptionException::class); + if (null !== $message) { + $this->expectExceptionMessage($message); + } + + $factory->create($dsn); + } +} diff --git a/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php index 03c57a244b57a..bbcc07bcc4113 100644 --- a/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php +++ b/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php @@ -11,33 +11,17 @@ namespace Symfony\Component\Notifier\Test; -use PHPUnit\Framework\Attributes\DataProvider; -use PHPUnit\Framework\TestCase; -use Symfony\Component\Notifier\Exception\IncompleteDsnException; -use Symfony\Component\Notifier\Exception\MissingRequiredOptionException; -use Symfony\Component\Notifier\Exception\UnsupportedSchemeException; -use Symfony\Component\Notifier\Transport\Dsn; -use Symfony\Component\Notifier\Transport\TransportFactoryInterface; -use Symfony\Component\Notifier\Transport\TransportInterface; - /** * A test case to ease testing a notifier transport factory. * * @author Oskar Stark + * + * @deprecated since Symfony 7.2, use AbstractTransportFactoryTestCase instead */ -abstract class TransportFactoryTestCase extends TestCase +abstract class TransportFactoryTestCase extends AbstractTransportFactoryTestCase { - abstract public function createFactory(): TransportFactoryInterface; - - /** - * @return iterable - */ - abstract public static function supportsProvider(): iterable; - - /** - * @return iterable - */ - abstract public static function createProvider(): iterable; + use IncompleteDsnTestTrait; + use MissingRequiredOptionTestTrait; /** * @return iterable @@ -62,81 +46,4 @@ public static function missingRequiredOptionProvider(): iterable { return []; } - - /** - * @dataProvider supportsProvider - */ - #[DataProvider('supportsProvider')] - public function testSupports(bool $expected, string $dsn) - { - $factory = $this->createFactory(); - - $this->assertSame($expected, $factory->supports(new Dsn($dsn))); - } - - /** - * @dataProvider createProvider - */ - #[DataProvider('createProvider')] - public function testCreate(string $expected, string $dsn) - { - $factory = $this->createFactory(); - $transport = $factory->create(new Dsn($dsn)); - - $this->assertSame($expected, (string) $transport); - } - - /** - * @dataProvider unsupportedSchemeProvider - */ - #[DataProvider('unsupportedSchemeProvider')] - public function testUnsupportedSchemeException(string $dsn, ?string $message = null) - { - $factory = $this->createFactory(); - - $dsn = new Dsn($dsn); - - $this->expectException(UnsupportedSchemeException::class); - if (null !== $message) { - $this->expectExceptionMessage($message); - } - - $factory->create($dsn); - } - - /** - * @dataProvider incompleteDsnProvider - */ - #[DataProvider('incompleteDsnProvider')] - public function testIncompleteDsnException(string $dsn, ?string $message = null) - { - $factory = $this->createFactory(); - - $dsn = new Dsn($dsn); - - $this->expectException(IncompleteDsnException::class); - if (null !== $message) { - $this->expectExceptionMessage($message); - } - - $factory->create($dsn); - } - - /** - * @dataProvider missingRequiredOptionProvider - */ - #[DataProvider('missingRequiredOptionProvider')] - public function testMissingRequiredOptionException(string $dsn, ?string $message = null) - { - $factory = $this->createFactory(); - - $dsn = new Dsn($dsn); - - $this->expectException(MissingRequiredOptionException::class); - if (null !== $message) { - $this->expectExceptionMessage($message); - } - - $factory->create($dsn); - } }