minor #53399 [Mailer][Notifier] add more #[\SensitiveParameter] attributes (xabbuh)

xabbuh · xabbuh · commit b92bdc09667f · 2024-01-05T09:07:46.000+01:00
This PR was merged into the 7.1 branch. Discussion ---------- [Mailer][Notifier] add more `#[\SensitiveParameter]` attributes | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- acd7353 add more SensitiveParameter attributes
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipSmtpTransport.php
@@ -17,7 +17,7 @@
 
 final class InfobipSmtpTransport extends EsmtpTransport
 {
-    public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(#[\SensitiveParameter] string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
         parent::__construct('smtp-api.infobip.com', 587, false, $dispatcher, $logger);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/MailPace/Transport/MailPaceSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/MailPace/Transport/MailPaceSmtpTransport.php
@@ -25,7 +25,7 @@
  */
 final class MailPaceSmtpTransport extends EsmtpTransport
 {
-    public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(#[\SensitiveParameter] string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
         parent::__construct('smtp.mailpace.com', 587, false, $dispatcher, $logger);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php
@@ -29,7 +29,7 @@ class PostmarkSmtpTransport extends EsmtpTransport
 {
     private ?string $messageStream = null;
 
-    public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(#[\SensitiveParameter] string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
         parent::__construct('smtp.postmarkapp.com', 587, false, $dispatcher, $logger);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Scaleway/Transport/ScalewaySmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Scaleway/Transport/ScalewaySmtpTransport.php
@@ -17,7 +17,7 @@
 
 final class ScalewaySmtpTransport extends EsmtpTransport
 {
-    public function __construct(string $projetId, string $token, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(string $projetId, #[\SensitiveParameter] string $token, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
         parent::__construct('smtp.tem.scw.cloud', 465, true, $dispatcher, $logger);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php
@@ -20,7 +20,7 @@
  */
 class SendgridSmtpTransport extends EsmtpTransport
 {
-    public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(#[\SensitiveParameter] string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
         parent::__construct('smtp.sendgrid.net', 465, true, $dispatcher, $logger);
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -96,7 +96,7 @@ class Connection
     private \AMQPExchange $amqpDelayExchange;
     private int $lastActivityTime = 0;
 
-    public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null)
+    public function __construct(#[\SensitiveParameter] array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null)
     {
         if (!\extension_loaded('amqp')) {
             throw new LogicException(sprintf('You cannot use the "%s" as the "amqp" extension is not installed.', __CLASS__));
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php
@@ -41,7 +41,7 @@ final class GoogleChatTransport extends AbstractTransport
      */
     public function __construct(
         private string $space,
-        private string $accessKey,
+        #[\SensitiveParameter] private string $accessKey,
         #[\SensitiveParameter] private string $accessToken,
         private ?string $threadKey = null,
         HttpClientInterface $client = null,
diff --git a/src/Symfony/Component/Notifier/Bridge/MessageMedia/MessageMediaTransport.php b/src/Symfony/Component/Notifier/Bridge/MessageMedia/MessageMediaTransport.php
@@ -30,13 +30,12 @@ final class MessageMediaTransport extends AbstractTransport
     protected const HOST = 'api.messagemedia.com';
 
     public function __construct(
-        private string $apiKey,
+        #[\SensitiveParameter] private string $apiKey,
         #[\SensitiveParameter] private string $apiSecret,
         private ?string $from = null,
         HttpClientInterface $client = null,
         EventDispatcherInterface $dispatcher = null,
-)
-    {
+    ) {
         parent::__construct($client, $dispatcher);
     }
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransport.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransport.php
@@ -36,8 +36,7 @@ public function __construct(
         private bool $secureHttp = true,
         HttpClientInterface $client = null,
         EventDispatcherInterface $dispatcher = null,
-)
-    {
+    ) {
         parent::__construct($client, $dispatcher);
     }
 
@@ -46,7 +45,7 @@ public function getTopic(): string
         return $this->topic;
     }
 
-    public function setPassword(?string $password): self
+    public function setPassword(#[\SensitiveParameter] ?string $password): self
     {
         $this->password = $password;
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`final class InfobipSmtpTransport extends EsmtpTransport`
`19`	`19`	`{`
`20`		`- public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
	`20`	`+ public function __construct(#[\SensitiveParameter] string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`21`	`21`	`{`
`22`	`22`	`parent::__construct('smtp-api.infobip.com', 587, false, $dispatcher, $logger);`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`final class MailPaceSmtpTransport extends EsmtpTransport`
`27`	`27`	`{`
`28`		`- public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
	`28`	`+ public function __construct(#[\SensitiveParameter] string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`29`	`29`	`{`
`30`	`30`	`parent::__construct('smtp.mailpace.com', 587, false, $dispatcher, $logger);`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class PostmarkSmtpTransport extends EsmtpTransport`
`29`	`29`	`{`
`30`	`30`	`private ?string $messageStream = null;`
`31`	`31`
`32`		`- public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
	`32`	`+ public function __construct(#[\SensitiveParameter] string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`33`	`33`	`{`
`34`	`34`	`parent::__construct('smtp.postmarkapp.com', 587, false, $dispatcher, $logger);`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class SendgridSmtpTransport extends EsmtpTransport`
`22`	`22`	`{`
`23`		`- public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
	`23`	`+ public function __construct(#[\SensitiveParameter] string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`24`	`24`	`{`
`25`	`25`	`parent::__construct('smtp.sendgrid.net', 465, true, $dispatcher, $logger);`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class Connection`
`96`	`96`	`private \AMQPExchange $amqpDelayExchange;`
`97`	`97`	`private int $lastActivityTime = 0;`
`98`	`98`
`99`		`- public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null)`
	`99`	`+ public function __construct(#[\SensitiveParameter] array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null)`
`100`	`100`	`{`
`101`	`101`	`if (!\extension_loaded('amqp')) {`
`102`	`102`	`throw new LogicException(sprintf('You cannot use the "%s" as the "amqp" extension is not installed.', __CLASS__));`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ public function __construct(`
`36`	`36`	`private bool $secureHttp = true,`
`37`	`37`	`HttpClientInterface $client = null,`
`38`	`38`	`EventDispatcherInterface $dispatcher = null,`
`39`		`-)`
`40`		`- {`
	`39`	`+ ) {`
`41`	`40`	`parent::__construct($client, $dispatcher);`
`42`	`41`	`}`
`43`	`42`
`@@ -46,7 +45,7 @@ public function getTopic(): string`
`46`	`45`	`return $this->topic;`
`47`	`46`	`}`
`48`	`47`
`49`		`- public function setPassword(?string $password): self`
	`48`	`+ public function setPassword(#[\SensitiveParameter] ?string $password): self`
`50`	`49`	`{`
`51`	`50`	`$this->password = $password;`
`52`	`51`