Mark DSNs as #[SensitiveParameter]

Author: nicolas-grekas

Transport.php

@@ -58,14 +58,14 @@ final class Transport
 
     private iterable $factories;
 
-    public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
     {
         $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));
 
         return $factory->fromString($dsn);
     }
 
-    public static function fromDsns(array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
+    public static function fromDsns(#[\SensitiveParameter] array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
     {
         $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));
 
@@ -80,7 +80,7 @@ public function __construct(iterable $factories)
         $this->factories = $factories;
     }
 
-    public function fromStrings(array $dsns): Transports
+    public function fromStrings(#[\SensitiveParameter] array $dsns): Transports
     {
         $transports = [];
         foreach ($dsns as $name => $dsn) {
@@ -90,7 +90,7 @@ public function fromStrings(array $dsns): Transports
         return new Transports($transports);
     }
 
-    public function fromString(string $dsn): TransportInterface
+    public function fromString(#[\SensitiveParameter] string $dsn): TransportInterface
     {
         [$transport, $offset] = $this->parseDsn($dsn);
         if ($offset !== \strlen($dsn)) {
@@ -100,7 +100,7 @@ public function fromString(string $dsn): TransportInterface
         return $transport;
     }
 
-    private function parseDsn(string $dsn, int $offset = 0): array
+    private function parseDsn(#[\SensitiveParameter] string $dsn, int $offset = 0): array
     {
         static $keywords = [
             'failover' => FailoverTransport::class,

Transport/AbstractTransportFactory.php

@@ -41,21 +41,11 @@ abstract protected function getSupportedSchemes(): array;
 
     protected function getUser(Dsn $dsn): string
     {
-        $user = $dsn->getUser();
-        if (null === $user) {
-            throw new IncompleteDsnException('User is not set.');
-        }
-
-        return $user;
+        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.');
     }
 
     protected function getPassword(Dsn $dsn): string
     {
-        $password = $dsn->getPassword();
-        if (null === $password) {
-            throw new IncompleteDsnException('Password is not set.');
-        }
-
-        return $password;
+        return $dsn->getPassword() ?? throw new IncompleteDsnException('Password is not set.');
     }
 }

Transport/Dsn.php

@@ -35,7 +35,7 @@ public function __construct(string $scheme, string $host, string $user = null, #
         $this->options = $options;
     }
 
-    public static function fromString(string $dsn): self
+    public static function fromString(#[\SensitiveParameter] string $dsn): self
     {
         if (false === $parsedDsn = parse_url($dsn)) {
             throw new InvalidArgumentException(sprintf('The "%s" mailer DSN is invalid.', $dsn));