Add project ID in toString()

symfony · Jul 24, 2023 · 387c3da · 387c3da
1 parent f37fe6b
commit 387c3da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Symfony/Component/Mailer/Bridge/Scaleway/Tests/Transport/ScalewayApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Scaleway/Tests/Transport/ScalewayApiTransportTest.php
@@ -35,19 +35,19 @@ public static function getTransportData()
         return [
             [
                 new ScalewayApiTransport('PROJECT_ID', 'TOKEN'),
-                'scaleway+api://api.scaleway.com',
+                'scaleway+api://api.scaleway.com@PROJECT_ID',
             ],
             [
                 new ScalewayApiTransport('PROJECT_ID', 'TOKEN', 'fr-par'),
-                'scaleway+api://api.scaleway.com@fr-par',
+                'scaleway+api://api.scaleway.com@PROJECT_ID?region=fr-par',
             ],
             [
                 (new ScalewayApiTransport('PROJECT_ID', 'TOKEN'))->setHost('example.com'),
-                'scaleway+api://example.com',
+                'scaleway+api://example.com@PROJECT_ID',
             ],
             [
                 (new ScalewayApiTransport('PROJECT_ID', 'TOKEN'))->setHost('example.com')->setPort(99),
-                'scaleway+api://example.com:99',
+                'scaleway+api://example.com:99@PROJECT_ID',
             ],
         ];
     }

diff --git a/src/Symfony/Component/Mailer/Bridge/Scaleway/Transport/ScalewayApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Scaleway/Transport/ScalewayApiTransport.php
@@ -43,9 +43,9 @@ public function __construct(string $projectId, string $token, string $region = n
 
     public function __toString(): string
     {
-        $region = $this->region ? '@'.$this->region : '';
+        $region = $this->region ? '?region='.$this->region : '';
 
-        return sprintf('scaleway+api://%s%s', $this->getEndpoint(), $region);
+        return sprintf('scaleway+api://%s@%s%s', $this->getEndpoint(), $this->projectId, $region);
     }
 
     protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $envelope): ResponseInterface