Merge branch 'hotfix/3252'

Close #3252
zendframework · Dec 19, 2012 · 6a3b2a1 · 6a3b2a1
2 parents 47db7c0 + 8e4298c
commit 6a3b2a1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/library/Zend/Log/Writer/Mail.php b/library/Zend/Log/Writer/Mail.php
@@ -85,6 +85,9 @@ public function __construct($mail, Transport\TransportInterface $transport = nul
         }
 
         if (is_array($mail)) {
+            if (isset($mail['subject_prepend_text'])) {
+                $this->setSubjectPrependText($mail['subject_prepend_text']);
+            }
             $transport = isset($mail['transport']) ? $mail['transport'] : null;
             $mail      = isset($mail['mail']) ? $mail['mail'] : null;
         }

diff --git a/tests/ZendTest/Log/Writer/MailTest.php b/tests/ZendTest/Log/Writer/MailTest.php
@@ -83,4 +83,30 @@ public function testSetSubjectPrependText()
         $this->assertContains('an info message', $contents);
         $this->assertContains('Subject: test', $contents);
     }
+
+    public function testConstructWithOptions()
+    {
+        $message   = new MailMessage();
+        $transport = new Transport\File();
+        $options   = new Transport\FileOptions(array(
+                'path'      => __DIR__,
+                'callback'  => function (Transport\File $transport) {
+                    return MailTest::FILENAME;
+                },
+        ));
+        $transport->setOptions($options);
+
+        $formatter = new \Zend\Log\Formatter\Simple();
+        $writer = new MailWriter(array(
+                'formatter' => $formatter,
+                'mail'      => $message,
+                'transport' => $transport,
+                'subject_prepend_text' => 'subject prepend',
+        ));
+
+        $this->assertAttributeEquals($message, 'mail', $writer);
+        $this->assertAttributeEquals($transport, 'transport', $writer);
+        $this->assertAttributeEquals($formatter, 'formatter', $writer);
+        $this->assertAttributeEquals('subject prepend', 'subjectPrependText', $writer);
+    }
 }