Merge branch 'feature/phpdoc-mismatch' of https://github.com/micheh/zf2…

… into hotfix/phpdoc

src/Message.php

@@ -149,6 +149,7 @@ public function getPartHeadersArray($partnum)
      * Get the headers of a given part as a string
      *
      * @param int $partnum
+     * @param string $EOL
      * @return string
      */
     public function getPartHeaders($partnum, $EOL = Mime::LINEEND)
@@ -160,6 +161,7 @@ public function getPartHeaders($partnum, $EOL = Mime::LINEEND)
      * Get the (encoded) content of a given part as a string
      *
      * @param int $partnum
+     * @param string $EOL
      * @return string
      */
     public function getPartContent($partnum, $EOL = Mime::LINEEND)
@@ -174,6 +176,7 @@ public function getPartContent($partnum, $EOL = Mime::LINEEND)
      *
      * @param string $body
      * @param string $boundary
+     * @throws Exception\RuntimeException
      * @return array
      */
     protected static function _disassembleMime($body, $boundary)
@@ -215,6 +218,7 @@ protected static function _disassembleMime($body, $boundary)
      * @param string $message
      * @param string $boundary
      * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+     * @throws Exception\RuntimeException
      * @return \Zend\Mime\Message
      */
     public static function createFromMessage($message, $boundary, $EOL = Mime::LINEEND)

src/Mime.php

@@ -107,7 +107,7 @@ public static function isPrintable($str)
      *
      * @param string $str
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeQuotedPrintable($str,
@@ -168,7 +168,7 @@ private static function _encodeQuotedPrintable($str)
      * @param string $str
      * @param string $charset
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeQuotedPrintableHeader($str, $charset,
@@ -241,7 +241,7 @@ private static function getNextQuotedPrintableToken($str)
      * @param string $str
      * @param string $charset
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeBase64Header($str,
@@ -265,7 +265,7 @@ public static function encodeBase64Header($str,
      *
      * @param string $str
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeBase64($str,
@@ -330,7 +330,7 @@ public function boundary()
     /**
      * Return a MIME boundary line
      *
-     * @param mixed $EOL Defaults to {@link LINEEND}
+     * @param string $EOL Defaults to {@link LINEEND}
      * @access public
      * @return string
      */
@@ -342,6 +342,7 @@ public function boundaryLine($EOL = self::LINEEND)
     /**
      * Return MIME ending
      *
+     * @param string $EOL Defaults to {@link LINEEND}
      * @access public
      * @return string
      */

src/Part.php

@@ -117,7 +117,8 @@ public function getEncodedStream()
     /**
      * Get the Content of the current Mime Part in the given encoding.
      *
-     * @return String
+     * @param string $EOL
+     * @return string
      */
     public function getContent($EOL = Mime::LINEEND)
     {
@@ -145,6 +146,7 @@ public function getRawContent()
      * Create and return the array of headers for this MIME part
      *
      * @access public
+     * @param string $EOL
      * @return array
      */
     public function getHeadersArray($EOL = Mime::LINEEND)
@@ -197,6 +199,7 @@ public function getHeadersArray($EOL = Mime::LINEEND)
     /**
      * Return the headers for this part as a string
      *
+     * @param string $EOL
      * @return String
      */
     public function getHeaders($EOL = Mime::LINEEND)