Merge branch 'patch-1' of https://github.com/glensc/zend-mail into glensc-patch-1

Author: ezimuel

src/Headers.php

@@ -430,10 +430,11 @@ public function toString()
     /**
      * Return the headers container as an array
      *
-     * @todo determine how to produce single line headers, if they are supported
+     * @param  bool $format Return the values in Mime::Encoded or in Raw format
      * @return array
+     * @todo determine how to produce single line headers, if they are supported
      */
-    public function toArray()
+    public function toArray($format = Header\HeaderInterface::FORMAT_RAW)
     {
         $headers = [];
         /* @var $header Header\HeaderInterface */
@@ -443,9 +444,9 @@ public function toArray()
                 if (!isset($headers[$name])) {
                     $headers[$name] = [];
                 }
-                $headers[$name][] = $header->getFieldValue();
+                $headers[$name][] = $header->getFieldValue($format);
             } else {
-                $headers[$header->getFieldName()] = $header->getFieldValue();
+                $headers[$header->getFieldName()] = $header->getFieldValue($format);
             }
         }
         return $headers;

test/HeadersTest.php

@@ -309,6 +309,43 @@ public function testCastingToStringReturnsAllMultiHeaderValues()
         $this->assertEquals($expected, $string);
     }
 
+    /**
+     * @test that toArray can take format parameter
+     * @link https://github.com/zendframework/zend-mail/pull/61
+     */
+    public function testToArrayFormatRaw()
+    {
+        $raw_subject = '=?ISO-8859-2?Q?PD=3A_My=3A_Go=B3?= =?ISO-8859-2?Q?blahblah?=';
+        $headers = new Mail\Headers();
+        $subject = Header\Subject::fromString("Subject: $raw_subject");
+        $headers->addHeader($subject);
+        // default
+        $array = $headers->toArray(Header\HeaderInterface::FORMAT_RAW);
+        $expected = [
+            'Subject' => 'PD: My: Gołblahblah',
+        ];
+        $this->assertEquals($expected, $array);
+    }
+
+    /**
+     * @test that toArray can take format parameter
+     * @link https://github.com/zendframework/zend-mail/pull/61
+     */
+    public function testToArrayFormatEncoded()
+    {
+        $raw_subject = '=?ISO-8859-2?Q?PD=3A_My=3A_Go=B3?= =?ISO-8859-2?Q?blahblah?=';
+        $headers = new Mail\Headers();
+        $subject = Header\Subject::fromString("Subject: $raw_subject");
+        $headers->addHeader($subject);
+
+        // encoded
+        $array = $headers->toArray(Header\HeaderInterface::FORMAT_ENCODED);
+        $expected = [
+            'Subject' => '=?UTF-8?Q?PD:=20My:=20Go=C5=82blahblah?=',
+        ];
+        $this->assertEquals($expected, $array);
+    }
+
     public static function expectedHeaders()
     {
         return [