[Mailer] Mailtrap sandbox changes

KiloSierraCharlie · KiloSierraCharlie · commit e767fd6d6765 · 2025-08-05T17:33:23.000+01:00
Suggested changes made as part of PR #61315.
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailtrap/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Mailtrap/CHANGELOG.md
@@ -1,12 +1,12 @@
 CHANGELOG
 =========
 
-7.2
+7.4
 ---
 
- * Add the bridge
+ * Add compatibility for Mailtrap's sandbox
 
-7.4
+7.2
 ---
 
- * Add compatibility for Mailtrap's sandbox
+ * Add the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailtrap/Transport/MailtrapApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailtrap/Transport/MailtrapApiTransport.php
@@ -34,7 +34,7 @@ final class MailtrapApiTransport extends AbstractApiTransport
 {
     private const HOST = 'send.api.mailtrap.io';
     private const HEADERS_TO_BYPASS = ['from', 'to', 'cc', 'bcc', 'subject', 'content-type', 'sender'];
-    protected ?string $inboxId = null;
+    private int $inboxId = 0;
 
     public function __construct(
         #[\SensitiveParameter] private string $token,
@@ -50,9 +50,12 @@ public function __toString(): string
         return \sprintf('mailtrap+api://%s', $this->getEndpoint());
     }
 
-    public function setInboxId(?string $inboxId): static
+    /**
+     * @return $this
+     */
+    public function setInboxId(mixed $inboxId): static
     {
-        $this->inboxId = is_numeric( $inboxId ) ? $inboxId : null;
+        $this->inboxId = (int) $inboxId;
 
         return $this;
     }
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailtrap/Transport/MailtrapTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Mailtrap/Transport/MailtrapTransportFactory.php
@@ -29,7 +29,7 @@ public function create(Dsn $dsn): TransportInterface
         if ('mailtrap+api' === $scheme) {
             $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
             $port = $dsn->getPort();
-            $inboxId = $dsn->getOption("inboxId");
+            $inboxId = $dsn->getOption('inboxId');
 
             return (new MailtrapApiTransport($user, $this->client, $this->dispatcher, $this->logger))->setHost($host)->setPort($port)->setInboxId($inboxId);
         }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class MailtrapApiTransport extends AbstractApiTransport`
`34`	`34`	`{`
`35`	`35`	`private const HOST = 'send.api.mailtrap.io';`
`36`	`36`	`private const HEADERS_TO_BYPASS = ['from', 'to', 'cc', 'bcc', 'subject', 'content-type', 'sender'];`
`37`		`- protected ?string $inboxId = null;`
	`37`	`+ private int $inboxId = 0;`
`38`	`38`
`39`	`39`	`public function __construct(`
`40`	`40`	`#[\SensitiveParameter] private string $token,`
`@@ -50,9 +50,12 @@ public function __toString(): string`
`50`	`50`	`return \sprintf('mailtrap+api://%s', $this->getEndpoint());`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function setInboxId(?string $inboxId): static`
	`53`	`+ /**`
	`54`	`+ * @return $this`
	`55`	`+ */`
	`56`	`+ public function setInboxId(mixed $inboxId): static`
`54`	`57`	`{`
`55`		`- $this->inboxId = is_numeric( $inboxId ) ? $inboxId : null;`
	`58`	`+ $this->inboxId = (int) $inboxId;`
`56`	`59`
`57`	`60`	`return $this;`
`58`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function create(Dsn $dsn): TransportInterface`
`29`	`29`	`if ('mailtrap+api' === $scheme) {`
`30`	`30`	`$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();`
`31`	`31`	`$port = $dsn->getPort();`
`32`		`- $inboxId = $dsn->getOption("inboxId");`
	`32`	`+ $inboxId = $dsn->getOption('inboxId');`
`33`	`33`
`34`	`34`	`return (new MailtrapApiTransport($user, $this->client, $this->dispatcher, $this->logger))->setHost($host)->setPort($port)->setInboxId($inboxId);`
`35`	`35`	`}`