symfony
diff --git a/‎src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportFactoryTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Notifier/Test/TransportTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Test/TransportTestCase.php
+4-4Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Notifier/Test/TransportTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Test/TransportTestCase.php
+4-4Lines changed: 4 additions & 4 deletions
@@ -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
 
@@ -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
 
@@ -96,7 +96,7 @@ public function testCanSetCustomHost()
 
         $transport->setHost($customHost = self::CUSTOM_HOST);
 
-        $this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/(%s|.*(\@%s))/', $customHost, $customHost), (string) $transport);
     }
 
     public function testCanSetCustomPort()
@@ -106,9 +106,9 @@ public function testCanSetCustomPort()
         $transport->setPort($customPort = self::CUSTOM_PORT);
 
         /*
-         * @see https://regex101.com/r/0xQKuY/2
+         * @see https://regex101.com/r/shT9O2/1
          */
-        $this->assertMatchesRegularExpression(sprintf('/^.*\/\/.*\:%s.*$/', $customPort), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/.*(\@.*)?\:%s((\?.*|\/.*))?$/', $customPort), (string) $transport);
     }
 
     public function testCanSetCustomHostAndPort()
@@ -118,6 +118,6 @@ public function testCanSetCustomHostAndPort()
         $transport->setHost($customHost = self::CUSTOM_HOST);
         $transport->setPort($customPort = self::CUSTOM_PORT);
 
-        $this->assertStringContainsString(sprintf('://%s:%s', $customHost, $customPort), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/(%s|.*(\@%s)\:%s)/', $customHost, $customHost, $customPort), (string) $transport);
     }
 }
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`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function testCanSetCustomHost()`
`96`	`96`
`97`	`97`	`$transport->setHost($customHost = self::CUSTOM_HOST);`
`98`	`98`
`99`		`- $this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);`
	`99`	`+ $this->assertMatchesRegularExpression(sprintf('/^.\:\/\/(%s\|.(\@%s))/', $customHost, $customHost), (string) $transport);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public function testCanSetCustomPort()`
`@@ -106,9 +106,9 @@ public function testCanSetCustomPort()`
`106`	`106`	`$transport->setPort($customPort = self::CUSTOM_PORT);`
`107`	`107`
`108`	`108`	`/*`
`109`		`- * @see https://regex101.com/r/0xQKuY/2`
	`109`	`+ * @see https://regex101.com/r/shT9O2/1`
`110`	`110`	`*/`
`111`		`- $this->assertMatchesRegularExpression(sprintf('/^.\/\/.\:%s.*$/', $customPort), (string) $transport);`
	`111`	`+ $this->assertMatchesRegularExpression(sprintf('/^.\:\/\/.(\@.)?\:%s((\?.\|\/.*))?$/', $customPort), (string) $transport);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public function testCanSetCustomHostAndPort()`
`@@ -118,6 +118,6 @@ public function testCanSetCustomHostAndPort()`
`118`	`118`	`$transport->setHost($customHost = self::CUSTOM_HOST);`
`119`	`119`	`$transport->setPort($customPort = self::CUSTOM_PORT);`
`120`	`120`
`121`		`- $this->assertStringContainsString(sprintf('://%s:%s', $customHost, $customPort), (string) $transport);`
	`121`	`+ $this->assertMatchesRegularExpression(sprintf('/^.\:\/\/(%s\|.(\@%s)\:%s)/', $customHost, $customHost, $customPort), (string) $transport);`
`122`	`122`	`}`
`123`	`123`	`}`