Merge branch '4.4'

* 4.4:
  [Mailer] fixed previous merge

Author: fabpot

Exception/UnsupportedHostException.php

@@ -48,14 +48,17 @@ class UnsupportedHostException extends LogicException
 
     public function __construct(Dsn $dsn)
     {
-        $host = $dsn->getHost();
-        $package = self::HOST_TO_PACKAGE_MAP[$host] ?? null;
+        $provider = $dsn->getScheme();
+        if (false !== $pos = strpos($provider, '+')) {
+            $provider = substr($provider, 0, $pos);
+        }
+        $package = self::HOST_TO_PACKAGE_MAP[$provider] ?? null;
         if ($package && !class_exists($package['class'])) {
             parent::__construct(sprintf('Unable to send emails via "%s" as the bridge is not installed. Try running "composer require %s".', $host, $package['package']));
 
             return;
         }
 
-        parent::__construct(sprintf('The "%s" mailer is not supported.', $host));
+        parent::__construct(sprintf('The "%s" scheme is not supported.', $dsn->getScheme()));
     }
 }

Mailgun/Transport/MailgunApiTransport.php

@@ -54,7 +54,7 @@ protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInte
             $headers[] = $header->toString();
         }
 
-        $endpoint = str_replace('%domain%', urlencode($this->domain), $this->getEndpoint()).'/v3/%domain%/messages';
+        $endpoint = sprintf('%s/v3/%s/messages', $this->getEndpoint(), urlencode($this->domain));
         $response = $this->client->request('POST', 'https://'.$endpoint, [
             'auth_basic' => 'api:'.$this->key,
             'headers' => $headers,

Mailgun/Transport/MailgunHttpTransport.php

@@ -57,7 +57,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
             $headers[] = $header->toString();
         }
 
-        $endpoint = str_replace('%domain%', urlencode($this->domain), $this->getEndpoint()).'/v3/%domain%/messages.mime';
+        $endpoint = sprintf('%s/v3/%s/messages.mime', $this->getEndpoint(), urlencode($this->domain));
         $response = $this->client->request('POST', 'https://'.$endpoint, [
             'auth_basic' => 'api:'.$this->key,
             'headers' => $headers,

MailgunApiTransport.php

@@ -54,7 +54,7 @@ protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInte
             $headers[] = $header->toString();
         }
 
-        $endpoint = str_replace('%domain%', urlencode($this->domain), $this->getEndpoint()).'/v3/%domain%/messages';
+        $endpoint = sprintf('%s/v3/%s/messages', $this->getEndpoint(), urlencode($this->domain));
         $response = $this->client->request('POST', 'https://'.$endpoint, [
             'auth_basic' => 'api:'.$this->key,
             'headers' => $headers,

MailgunHttpTransport.php

@@ -57,7 +57,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
             $headers[] = $header->toString();
         }
 
-        $endpoint = str_replace('%domain%', urlencode($this->domain), $this->getEndpoint()).'/v3/%domain%/messages.mime';
+        $endpoint = sprintf('%s/v3/%s/messages.mime', $this->getEndpoint(), urlencode($this->domain));
         $response = $this->client->request('POST', 'https://'.$endpoint, [
             'auth_basic' => 'api:'.$this->key,
             'headers' => $headers,

UnsupportedHostException.php

@@ -48,14 +48,17 @@ class UnsupportedHostException extends LogicException
 
     public function __construct(Dsn $dsn)
     {
-        $host = $dsn->getHost();
-        $package = self::HOST_TO_PACKAGE_MAP[$host] ?? null;
+        $provider = $dsn->getScheme();
+        if (false !== $pos = strpos($provider, '+')) {
+            $provider = substr($provider, 0, $pos);
+        }
+        $package = self::HOST_TO_PACKAGE_MAP[$provider] ?? null;
         if ($package && !class_exists($package['class'])) {
             parent::__construct(sprintf('Unable to send emails via "%s" as the bridge is not installed. Try running "composer require %s".', $host, $package['package']));
 
             return;
         }
 
-        parent::__construct(sprintf('The "%s" mailer is not supported.', $host));
+        parent::__construct(sprintf('The "%s" scheme is not supported.', $dsn->getScheme()));
     }
 }