Merge branch 'hotfix/4421'

Close zendframework/zendframework#4421

src/Decode.php

@@ -65,7 +65,7 @@ public static function splitMime($body, $boundary)
      *
      * @param  string $message  raw message content
      * @param  string $boundary boundary as found in content-type
-     * @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+     * @param  string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
      * @return array|null parts as array('header' => array(name => value), 'body' => content), null if no parts found
      * @throws Exception\RuntimeException
      */
@@ -95,7 +95,7 @@ public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINE
      * @param  string|Headers  $message raw message with header and optional content
      * @param  Headers         $headers output param, headers container
      * @param  string          $body    output param, content of message
-     * @param  string          $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+     * @param  string          $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
      * @param  bool         $strict  enable strict mode for parsing message
      * @return null
      */

src/Exception/RuntimeException.php

@@ -10,7 +10,7 @@
 namespace Zend\Mime\Exception;
 
 /**
- * Exception for Zend_Mime component.
+ * Exception for Zend\Mime component.
  */
 class RuntimeException
     extends \RuntimeException

src/Message.php

@@ -16,7 +16,7 @@ class Message
     protected $mime = null;
 
     /**
-     * Returns the list of all Zend_Mime_Parts in the message
+     * Returns the list of all Zend\Mime\Part in the message
      *
      * @return array of \Zend\Mime\Part
      */
@@ -26,7 +26,7 @@ public function getParts()
     }
 
     /**
-     * Sets the given array of Zend_Mime_Parts as the array for the message
+     * Sets the given array of Zend\Mime\Part as the array for the message
      *
      * @param array $parts
      */
@@ -36,7 +36,7 @@ public function setParts($parts)
     }
 
     /**
-     * Append a new Zend_Mime_Part to the current message
+     * Append a new Zend\Mime\Part to the current message
      *
      * @param \Zend\Mime\Part $part
      */
@@ -60,10 +60,10 @@ public function isMultiPart()
     }
 
     /**
-     * Set Zend_Mime object for the message
+     * Set Zend\Mime\Mime object for the message
      *
      * This can be used to set the boundary specifically or to use a subclass of
-     * Zend_Mime for generating the boundary.
+     * Zend\Mime for generating the boundary.
      *
      * @param \Zend\Mime\Mime $mime
      */
@@ -73,7 +73,7 @@ public function setMime(Mime $mime)
     }
 
     /**
-     * Returns the Zend_Mime object in use by the message
+     * Returns the Zend\Mime\Mime object in use by the message
      *
      * If the object was not present, it is created and returned. Can be used to
      * determine the boundary used in this message.
@@ -96,12 +96,12 @@ public function getMime()
      * only one part is present, the content of this part is returned. If no
      * part had been added, an empty string is returned.
      *
-     * Parts are separated by the mime boundary as defined in Zend_Mime. If
-     * {@link setMime()} has been called before this method, the Zend_Mime
-     * object set by this call will be used. Otherwise, a new Zend_Mime object
+     * Parts are separated by the mime boundary as defined in Zend\Mime\Mime. If
+     * {@link setMime()} has been called before this method, the Zend\Mime\Mime
+     * object set by this call will be used. Otherwise, a new Zend\Mime\Mime object
      * is generated and used.
      *
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+     * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
      * @return string
      */
     public function generateMessage($EOL = Mime::LINEEND)
@@ -207,12 +207,12 @@ protected static function _disassembleMime($body, $boundary)
     }
 
     /**
-     * Decodes a MIME encoded string and returns a Zend_Mime_Message object with
+     * Decodes a MIME encoded string and returns a Zend\Mime\Message object with
      * all the MIME parts set according to the given string
      *
      * @param string $message
      * @param string $boundary
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+     * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
      * @throws Exception\RuntimeException
      * @return \Zend\Mime\Message
      */

src/Mime.php

@@ -292,7 +292,7 @@ public function __construct($boundary = null)
      *
      * @param string $str
      * @param string $encoding
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+     * @param string $EOL EOL string; defaults to {@link LINEEND}
      * @return string
      */
     public static function encode($str, $encoding, $EOL = self::LINEEND)