bug #41985 Fix: Mailjet bridge tests (OskarStark)

derrabus · derrabus · commit b19200c88cb0 · 2021-07-05T20:23:11.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- Fix: Mailjet bridge tests | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Follows #41705 | License | MIT | Doc PR | - Fix the build Commits ------- 690e4ed Fix: Mailjet bridge tests
diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php
@@ -39,9 +39,9 @@ public function supportsProvider(): iterable
         yield [false, 'somethingElse://Mailjet:authtoken@default'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
+    public function incompleteDsnProvider(): iterable
     {
-        yield 'missing option: from' => ['mailjet://authtoken@default'];
+        yield 'missing from' => ['mailjet://authtoken@default', 'Invalid "mailjet://authtoken@default" notifier DSN: Password is not set.'];
     }
 
     public function unsupportedSchemeProvider(): iterable
diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php
@@ -24,14 +24,14 @@ final class MailjetTransportTest extends TransportTestCase
     /**
      * @return MailjetTransport
      */
-    public function createTransport(?HttpClientInterface $client = null): TransportInterface
+    public function createTransport(HttpClientInterface $client = null): TransportInterface
     {
         return (new MailjetTransport('authtoken', 'Mailjet', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
     }
 
     public function toStringProvider(): iterable
     {
-        yield ['mailjet://Mailjet:authtoken@host.test', $this->createTransport()];
+        yield ['mailjet://Mailjet@host.test', $this->createTransport()];
     }
 
     public function supportedMessagesProvider(): iterable
diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/composer.json b/src/Symfony/Component/Notifier/Bridge/Mailjet/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": ">=7.2.5",
         "symfony/http-client": "^4.3|^5.0",
-        "symfony/notifier": "^5.3"
+        "symfony/notifier": "^5.3.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Mailjet\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ public function supportsProvider(): iterable`
`39`	`39`	`yield [false, 'somethingElse://Mailjet:authtoken@default'];`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function missingRequiredOptionProvider(): iterable`
	`42`	`+ public function incompleteDsnProvider(): iterable`
`43`	`43`	`{`
`44`		`- yield 'missing option: from' => ['mailjet://authtoken@default'];`
	`44`	`+ yield 'missing from' => ['mailjet://authtoken@default', 'Invalid "mailjet://authtoken@default" notifier DSN: Password is not set.'];`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function unsupportedSchemeProvider(): iterable`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ final class MailjetTransportTest extends TransportTestCase`
`24`	`24`	`/**`
`25`	`25`	`* @return MailjetTransport`
`26`	`26`	`*/`
`27`		`- public function createTransport(?HttpClientInterface $client = null): TransportInterface`
	`27`	`+ public function createTransport(HttpClientInterface $client = null): TransportInterface`
`28`	`28`	`{`
`29`	`29`	`return (new MailjetTransport('authtoken', 'Mailjet', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function toStringProvider(): iterable`
`33`	`33`	`{`
`34`		`- yield ['mailjet://Mailjet:authtoken@host.test', $this->createTransport()];`
	`34`	`+ yield ['mailjet://Mailjet@host.test', $this->createTransport()];`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function supportedMessagesProvider(): iterable`