Merge branch 'master' of git://github.com/zendframework/zf2

Fixed files permissions

composer.json

@@ -27,8 +27,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

src/Decode.php

@@ -5,18 +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 Zend\Mime;
 
 use Zend\Mail\Headers;
 use Zend\Stdlib\ErrorHandler;
 
-/**
- * @category   Zend
- * @package    Zend_Mime
- */
 class Decode
 {
     /**

src/Exception/ExceptionInterface.php

@@ -5,14 +5,9 @@
  * @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 Zend\Mime\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Mime
- */
 interface ExceptionInterface
 {}

src/Exception/RuntimeException.php

@@ -5,16 +5,12 @@
  * @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 Zend\Mime\Exception;
 
 /**
  * Exception for Zend_Mime component.
- *
- * @category   Zend
- * @package    Zend_Mime
  */
 class RuntimeException
     extends \RuntimeException

src/Message.php

@@ -5,15 +5,10 @@
  * @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 Zend\Mime;
 
-/**
- * @category   Zend
- * @package    Zend_Mime
- */
 class Message
 {
 
@@ -111,9 +106,9 @@ public function getMime()
      */
     public function generateMessage($EOL = Mime::LINEEND)
     {
-        if (! $this->isMultiPart()) {
-            $body = array_shift($this->parts);
-            $body = $body->getContent($EOL);
+        if (!$this->isMultiPart()) {
+            $part = current($this->parts);
+            $body = $part->getContent($EOL);
         } else {
             $mime = $this->getMime();
 
@@ -181,8 +176,8 @@ public function getPartContent($partnum, $EOL = Mime::LINEEND)
      */
     protected static function _disassembleMime($body, $boundary)
     {
-        $start = 0;
-        $res = array();
+        $start  = 0;
+        $res    = array();
         // find every mime part limiter and cut out the
         // string before it.
         // the part before the first boundary string is discarded:
@@ -265,6 +260,7 @@ public static function createFromMessage($message, $boundary, $EOL = Mime::LINEE
             }
             $res->addPart($newPart);
         }
+
         return $res;
     }
 }

src/Mime.php

@@ -5,16 +5,12 @@
  * @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 Zend\Mime;
 
 /**
  * Support class for MultiPart Mime Messages
- *
- * @category   Zend
- * @package    Zend_Mime
  */
 class Mime
 {

src/Part.php

@@ -5,16 +5,12 @@
  * @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 Zend\Mime;
 
 /**
  * Class representing a MIME part.
- *
- * @category   Zend
- * @package    Zend_Mime
  */
 class Part
 {
@@ -70,6 +66,7 @@ public function isStream()
      * if this was created with a stream, return a filtered stream for
      * reading the content. very useful for large file attachments.
      *
+     * @param string $EOL
      * @return stream
      * @throws Exception\RuntimeException if not a stream or unable to append filter
      */

test/MessageTest.php

@@ -116,4 +116,16 @@ public function testDecodeMimeMessage()
         $this->assertEquals('base64', $part2->encoding);
         $this->assertEquals('12', $part2->id);
     }
+
+    public function testNonMultipartMessageShouldNotRemovePartFromMessage()
+    {
+        $message = new Mime\Message();  // No Parts
+        $part    = new Mime\Part('This is a test');
+        $message->addPart($part);
+        $message->generateMessage();
+
+        $parts = $message->getParts();
+        $test  = current($parts);
+        $this->assertSame($part, $test);
+    }
 }