Merge 97a406c into cf921ee

zendframework · Jan 31, 2015 · ebad6b9 · ebad6b9
2 parents cf921ee + 97a406c
commit ebad6b9
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 0 deletions.
diff --git a/library/Zend/Log/Writer/Mail.php b/library/Zend/Log/Writer/Mail.php
@@ -86,6 +86,9 @@ public function __construct($mail, Transport\TransportInterface $transport = nul
             }
             $transport = isset($mail['transport']) ? $mail['transport'] : null;
             $mail      = isset($mail['mail']) ? $mail['mail'] : null;
+            if (is_array($mail)) {
+                $mail = new MailMessage($mail);
+            }
         }
 
         // Ensure we have a valid mail message

diff --git a/library/Zend/Mail/Message.php b/library/Zend/Mail/Message.php
@@ -35,6 +35,44 @@ class Message
      */
     protected $encoding = 'ASCII';
 
+    /**
+     * Constructor.
+     *
+     * @param null|array|Traversable $options (Optional) Options to set
+     * @param array|Traversable $options
+     */
+    public function __construct($options = null)
+    {
+        if (null !== $options) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * @param  array|Traversable $options         Options to set
+     * @return self
+     * @throws Exception\InvalidArgumentException
+     */
+    private function setOptions($options)
+    {
+        if (!is_array($options) && !$options instanceof Traversable) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                '"%s" expects an array or Traversable; received "%s"',
+                __METHOD__,
+                (is_object($options) ? get_class($options) : gettype($options))
+            ));
+        }
+
+        foreach ($options as $key => $value) {
+            $setter = 'set' . str_replace(' ', '', ucwords(str_replace('-', ' ', str_replace('_', ' ', $key))));
+            if (method_exists($this, $setter)) {
+                $this->{$setter}($value);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Is the message valid?
      *

diff --git a/tests/ZendTest/Log/Writer/MailTest.php b/tests/ZendTest/Log/Writer/MailTest.php
@@ -111,4 +111,21 @@ public function testConstructWithOptions()
         $this->assertCount(1, $filters);
         $this->assertEquals($filter, $filters[0]);
     }
+
+    public function testConstructWithMailOptions()
+    {
+        $message = array(
+            'from'      => 'matthew@example.com',
+            'to'        => 'zf-devteam@example.com',
+            'cc'        => 'zf-contributors@example.com',
+            'bcc'       => 'zf-devteam@example.com',
+            'subject'   => 'subject',
+        );
+
+        $writer = new MailWriter(array(
+            'mail' => $message,
+        ));
+
+        $this->assertAttributeInstanceOf('Zend\Mail\Message', 'mail', $writer);
+    }
 }
diff --git a/tests/ZendTest/Mail/MessageTest.php b/tests/ZendTest/Mail/MessageTest.php
@@ -695,4 +695,43 @@ public function testPassEmptyArrayIntoSetPartsOfMimeMessageShouldReturnEmptyBody
         $this->message->setBody($mimeMessage);
         $this->assertEquals('', $this->message->getBodyText());
     }
+
+    public function testConstructorWithOptions()
+    {
+        $options = array(
+            'encoding'  => 'UTF-8',
+            'from'      => 'matthew@example.com',
+            'to'        => 'zf-devteam@example.com',
+            'cc'        => 'zf-contributors@example.com',
+            'bcc'       => 'zf-devteam@example.com',
+            'reply-to'  => 'matthew@example.com',
+            'sender'    => 'matthew@example.com',
+            'subject'   => 'subject',
+            'body'      => 'body',
+            'ignore'    => 'ignore options',
+        );
+
+        $message = new Message(new \ArrayObject($options));
+
+        $this->assertEquals('UTF-8',   $message->getEncoding());
+        $this->assertEquals('subject', $message->getSubject());
+        $this->assertEquals('body',    $message->getBody());
+        $this->assertInstanceOf('Zend\Mail\Address', $message->getSender());
+        $this->assertEquals($options['sender'], $message->getSender()->getEmail());
+
+        $getMethods = array(
+            'from'      => 'getFrom',
+            'to'        => 'getTo',
+            'cc'        => 'getCc',
+            'bcc'       => 'getBcc',
+            'reply-to'  => 'getReplyTo',
+        );
+
+        foreach ($getMethods as $key => $method) {
+            $value = $message->{$method}();
+            $this->assertInstanceOf('Zend\Mail\AddressList', $value);
+            $this->assertEquals(1, count($value));
+            $this->assertTrue($value->has($options[$key]));
+        }
+    }
 }