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

* Add possibility to change mail transport through DI

* Fix test.

1 files changed, 2 insertions, 28 deletions

diff --git a/core/Mail.php b/core/Mail.php
index 55119ca93b..42f7312832 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -100,37 +100,11 @@ class Mail extends Zend_Mail
      */
     private function initSmtpTransport()
     {
-        $mailConfig = Config::getInstance()->mail;
-
-        if (empty($mailConfig['host'])
-            || $mailConfig['transport'] != 'smtp'
-        ) {
+        $tr = StaticContainer::get('Zend_Mail_Transport_Abstract');
+        if (empty($tr)) {
             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']);
-        $tr = new \Zend_Mail_Transport_Smtp($host, $smtpConfig);
         Mail::setDefaultTransport($tr);
     }