Merge branch 'develop' of github.com:zendframework/zf2 into develop

zendframework · Oct 12, 2013 · 98b3922 · 98b3922
commit 98b3922
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -256,7 +256,8 @@ public static function createFromMessage($message, $boundary, $EOL = Mime::LINEE
                         $properties['language'] = $fieldValue;
                         break;
                     default:
-                        throw new Exception\RuntimeException('Unknown header ignored for MimePart:' . $fieldName);
+                        // Ignore unknown header
+                        break;
                 }
             }
 

diff --git a/test/MessageTest.php b/test/MessageTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Mime
  */
 
 namespace ZendTest\Mime;
 
 use Zend\Mime;
 
 /**
- * @category   Zend
- * @package    Zend_Mime
- * @subpackage UnitTests
  * @group      Zend_Mime
  */
 class MessageTest extends \PHPUnit_Framework_TestCase

diff --git a/test/MimeTest.php b/test/MimeTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Mime
  */
 
 namespace ZendTest\Mime;
 
 use Zend\Mime;
 
 /**
- * @category   Zend
- * @package    Zend_Mime
- * @subpackage UnitTests
  * @group      Zend_Mime
  */
 class MimeTest extends \PHPUnit_Framework_TestCase
@@ -135,6 +131,36 @@ public static function dataTestEncodeMailHeaderBase64()
         );
     }
 
+    public function testFromMessageMultiPart()
+    {
+        $message = Mime\Message::createFromMessage(
+            '--089e0141a1902f83ee04e0a07b7a'."\r\n"
+            .'Content-Type: multipart/alternative; boundary=089e0141a1902f83e904e0a07b78'."\r\n"
+            ."\r\n"
+            .'--089e0141a1902f83e904e0a07b78'."\r\n"
+            .'Content-Type: text/plain; charset=UTF-8'."\r\n"
+            ."\r\n"
+            .'Foo'."\r\n"
+            ."\r\n"
+            .'--089e0141a1902f83e904e0a07b78'."\r\n"
+            .'Content-Type: text/html; charset=UTF-8'."\r\n"
+            ."\r\n"
+            .'<p>Foo</p>'."\r\n"
+            ."\r\n"
+            .'--089e0141a1902f83e904e0a07b78--'."\r\n"
+            .'--089e0141a1902f83ee04e0a07b7a'."\r\n"
+            .'Content-Type: image/png; name="1.png"'."\r\n"
+            .'Content-Disposition: attachment; filename="1.png"'."\r\n"
+            .'Content-Transfer-Encoding: base64'."\r\n"
+            .'X-Attachment-Id: barquux'."\r\n"
+            ."\r\n"
+            .'Zm9vCg=='."\r\n"
+            .'--089e0141a1902f83ee04e0a07b7a--',
+            '089e0141a1902f83ee04e0a07b7a'
+        );
+        $this->assertSame(2, count($message->getParts()));
+    }
+
     public static function dataTestFromMessageDecode()
     {
         return array(

diff --git a/test/PartTest.php b/test/PartTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Mime
  */
 
 namespace ZendTest\Mime;
 
 use Zend\Mime;
 
 /**
- * @category   Zend
- * @package    Zend_Mime
- * @subpackage UnitTests
  * @group      Zend_Mime
  */
 class PartTest extends \PHPUnit_Framework_TestCase