Merge af3170e into be6598c

zendframework · Jun 17, 2015 · 06e2794 · 06e2794
2 parents be6598c + af3170e
commit 06e2794
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/Writer/Mail.php b/src/Writer/Mail.php
@@ -90,6 +90,9 @@ public function __construct($mail, Transport\TransportInterface $transport = nul
             if (is_array($mail)) {
                 $mail = MailMessageFactory::getInstance($mail);
             }
+            if (is_array($transport)) {
+                $transport = Transport\Factory::create($transport);
+            }
         }
 
         // Ensure we have a valid mail message

diff --git a/test/Writer/MailTest.php b/test/Writer/MailTest.php
@@ -128,4 +128,35 @@ public function testConstructWithMailAsArrayOptions()
 
         $this->assertAttributeInstanceOf('Zend\Mail\Message', 'mail', $writer);
     }
+
+    public function testConstructWithMailTransportAsArrayOptions()
+    {
+        $messageOptions = [
+            'encoding'  => 'UTF-8',
+            'from'      => 'matthew@example.com',
+            'to'        => 'zf-devteam@example.com',
+            'subject'   => 'subject',
+            'body'      => 'body',
+        ];
+
+        $transportOptions = [
+            'type' => 'smtp',
+            'options' => [
+                'host' => 'test.dev',
+                'connection_class' => 'login',
+                'connection_config' => [
+                    'username' => 'foo',
+                    'smtp_password' => 'bar',
+                    'ssl' => 'tls'
+                ]
+            ]
+        ];
+
+        $writer = new MailWriter([
+            'mail' => $messageOptions,
+            'transport' => $transportOptions,
+        ]);
+
+        $this->assertAttributeInstanceOf('Zend\Mail\Transport\Smtp', 'transport', $writer);
+    }
 }