Merge branch 'master' of https://github.com/zendframework/zf2 into zf…

…-3371
zendframework · Jan 30, 2013 · 2aa3fc8 · 2aa3fc8
commit 2aa3fc8
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 27 deletions.
diff --git a/src/Decode.php b/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
 {
     /**

diff --git a/src/Exception/ExceptionInterface.php b/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
 {}
diff --git a/src/Exception/RuntimeException.php b/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

diff --git a/src/Message.php b/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
 {
 

diff --git a/src/Mime.php b/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
 {

diff --git a/src/Part.php b/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
      */