Add possibility to change mail transport through DI (#14041)

* Add possibility to change mail transport through DI

* Fix test.

1 files changed, 34 insertions, 0 deletions

diff --git a/config/global.php b/config/global.php
index 8320959983..8833f4841b 100644
--- a/config/global.php
+++ b/config/global.php
@@ -155,6 +155,40 @@ return array(
 
         return $ipsResolved;
     },
+    'Zend_Mail_Transport_Abstract' => function () {
+        $mailConfig = Config::getInstance()->mail;
+
+        if (empty($mailConfig['host'])
+            || $mailConfig['transport'] != 'smtp'
+        ) {
+            return;
+        }
+
+        $smtpConfig = array();
+        if (!empty($mailConfig['type'])) {
+            $smtpConfig['auth'] = strtolower($mailConfig['type']);
+        }
+
+        if (!empty($mailConfig['username'])) {
+            $smtpConfig['username'] = $mailConfig['username'];
+        }
+
+        if (!empty($mailConfig['password'])) {
+            $smtpConfig['password'] = $mailConfig['password'];
+        }
+
+        if (!empty($mailConfig['encryption'])) {
+            $smtpConfig['ssl'] = $mailConfig['encryption'];
+        }
+
+        if (!empty($mailConfig['port'])) {
+            $smtpConfig['port'] = $mailConfig['port'];
+        }
+
+        $host = trim($mailConfig['host']);
+        $transport = new \Zend_Mail_Transport_Smtp($host, $smtpConfig);
+        return $transport;
+    },
 
     'Zend_Validate_EmailAddress' => function () {
         return new \Zend_Validate_EmailAddress(array(