[Mailer] fix PR tests

PEtanguy · PEtanguy · commit 8cf7fda2addb · 2023-05-11T18:05:14.000+01:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Brevo/Tests/Transport/BrevoApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Brevo/Tests/Transport/BrevoApiTransportTest.php
@@ -31,7 +31,7 @@ class BrevoApiTransportTest extends TestCase
      */
     public function testToString(BrevoApiTransport $transport, string $expected)
     {
-        $this->assertSame($expected, (string)$transport);
+        $this->assertSame($expected, (string) $transport);
     }
 
     public static function getTransportData()
diff --git a/src/Symfony/Component/Mailer/Bridge/Brevo/Transport/BrevoApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Brevo/Transport/BrevoApiTransport.php
@@ -48,8 +48,7 @@ public function __toString(): string
 
     protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $envelope): ResponseInterface
     {
-//        TODO check this
-        $response = $this->client->request('POST', 'https://' . $this->getEndpoint() . '/v3/smtp/email', [
+        $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/v3/smtp/email', [
             'json' => $this->getPayload($email, $envelope),
             'headers' => [
                 'api-key' => $this->key,
@@ -60,13 +59,13 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
             $statusCode = $response->getStatusCode();
             $result = $response->toArray(false);
         } catch (DecodingExceptionInterface) {
-            throw new HttpTransportException('Unable to send an email: ' . $response->getContent(false) . sprintf(' (code %d).', $statusCode), $response);
+            throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $statusCode), $response);
         } catch (TransportExceptionInterface $e) {
             throw new HttpTransportException('Could not reach the remote Brevo server.', $response, 0, $e);
         }
 
         if (201 !== $statusCode) {
-            throw new HttpTransportException('Unable to send an email: ' . $result['message'] . sprintf(' (code %d).', $statusCode), $response);
+            throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $statusCode), $response);
         }
 
         $sentMessage->setMessageId($result['messageId']);
@@ -153,7 +152,7 @@ private function prepareHeadersAndTags(Headers $headers): array
                 continue;
             }
             if ('templateid' === $name) {
-                $headersAndTags[$header->getName()] = (int)$header->getValue();
+                $headersAndTags[$header->getName()] = (int) $header->getValue();
 
                 continue;
             }
@@ -181,7 +180,6 @@ private function stringifyAddress(Address $address): array
 
     private function getEndpoint(): ?string
     {
-//        TODO check this
-        return ($this->host ?: 'api.brevo.com') . ($this->port ? ':' . $this->port : '');
+        return ($this->host ?: 'api.brevo.com').($this->port ? ':'.$this->port : '');
     }
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Brevo/Transport/BrevoTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Brevo/Transport/BrevoTransportFactory.php
@@ -37,7 +37,7 @@ public function create(Dsn $dsn): TransportInterface
                 return (new BrevoApiTransport($this->getUser($dsn), $this->client, $this->dispatcher, $this->logger))
                     ->setHost('default' === $dsn->getHost() ? null : $dsn->getHost())
                     ->setPort($dsn->getPort())
-                    ;
+                ;
         }
 
         return new $transport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger);
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueTransportFactory.php
@@ -26,7 +26,7 @@ final class SendinblueTransportFactory extends AbstractTransportFactory
 {
     public function create(Dsn $dsn): TransportInterface
     {
-        trigger_deprecation('symfony/sendinblue-mailer', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransportFactory::class, BrevoTransportFactory::class);
+        trigger_deprecation('symfony/sendinblue-mailer', '6.3', 'The "%s" class is deprecated, use "%s" instead.', self::class, BrevoTransportFactory::class);
 
         if (!\in_array($dsn->getScheme(), $this->getSupportedSchemes(), true)) {
             throw new UnsupportedSchemeException($dsn, 'sendinblue', $this->getSupportedSchemes());

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class BrevoApiTransportTest extends TestCase`
`31`	`31`	`*/`
`32`	`32`	`public function testToString(BrevoApiTransport $transport, string $expected)`
`33`	`33`	`{`
`34`		`- $this->assertSame($expected, (string)$transport);`
	`34`	`+ $this->assertSame($expected, (string) $transport);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public static function getTransportData()`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ public function __toString(): string`
`48`	`48`
`49`	`49`	`protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $envelope): ResponseInterface`
`50`	`50`	`{`
`51`		`-// TODO check this`
`52`		`- $response = $this->client->request('POST', 'https://' . $this->getEndpoint() . '/v3/smtp/email', [`
	`51`	`+ $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/v3/smtp/email', [`
`53`	`52`	`'json' => $this->getPayload($email, $envelope),`
`54`	`53`	`'headers' => [`
`55`	`54`	`'api-key' => $this->key,`
`@@ -60,13 +59,13 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e`
`60`	`59`	`$statusCode = $response->getStatusCode();`
`61`	`60`	`$result = $response->toArray(false);`
`62`	`61`	`} catch (DecodingExceptionInterface) {`
`63`		`- throw new HttpTransportException('Unable to send an email: ' . $response->getContent(false) . sprintf(' (code %d).', $statusCode), $response);`
	`62`	`+ throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $statusCode), $response);`
`64`	`63`	`} catch (TransportExceptionInterface $e) {`
`65`	`64`	`throw new HttpTransportException('Could not reach the remote Brevo server.', $response, 0, $e);`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`if (201 !== $statusCode) {`
`69`		`- throw new HttpTransportException('Unable to send an email: ' . $result['message'] . sprintf(' (code %d).', $statusCode), $response);`
	`68`	`+ throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $statusCode), $response);`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`$sentMessage->setMessageId($result['messageId']);`
`@@ -153,7 +152,7 @@ private function prepareHeadersAndTags(Headers $headers): array`
`153`	`152`	`continue;`
`154`	`153`	`}`
`155`	`154`	`if ('templateid' === $name) {`
`156`		`- $headersAndTags[$header->getName()] = (int)$header->getValue();`
	`155`	`+ $headersAndTags[$header->getName()] = (int) $header->getValue();`
`157`	`156`
`158`	`157`	`continue;`
`159`	`158`	`}`
`@@ -181,7 +180,6 @@ private function stringifyAddress(Address $address): array`
`181`	`180`
`182`	`181`	`private function getEndpoint(): ?string`
`183`	`182`	`{`
`184`		`-// TODO check this`
`185`		`- return ($this->host ?: 'api.brevo.com') . ($this->port ? ':' . $this->port : '');`
	`183`	`+ return ($this->host ?: 'api.brevo.com').($this->port ? ':'.$this->port : '');`
`186`	`184`	`}`
`187`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function create(Dsn $dsn): TransportInterface`
`37`	`37`	`return (new BrevoApiTransport($this->getUser($dsn), $this->client, $this->dispatcher, $this->logger))`
`38`	`38`	`->setHost('default' === $dsn->getHost() ? null : $dsn->getHost())`
`39`	`39`	`->setPort($dsn->getPort())`
`40`		`- ;`
	`40`	`+ ;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return new $transport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class SendinblueTransportFactory extends AbstractTransportFactory`
`26`	`26`	`{`
`27`	`27`	`public function create(Dsn $dsn): TransportInterface`
`28`	`28`	`{`
`29`		`- trigger_deprecation('symfony/sendinblue-mailer', '6.3', 'The "%s" class is deprecated, use "%s" instead.', SendinblueTransportFactory::class, BrevoTransportFactory::class);`
	`29`	`+ trigger_deprecation('symfony/sendinblue-mailer', '6.3', 'The "%s" class is deprecated, use "%s" instead.', self::class, BrevoTransportFactory::class);`
`30`	`30`
`31`	`31`	`if (!\in_array($dsn->getScheme(), $this->getSupportedSchemes(), true)) {`
`32`	`32`	`throw new UnsupportedSchemeException($dsn, 'sendinblue', $this->getSupportedSchemes());`