Merge branch 'feature/di' of github.com:ralphschindler/zf2 into featu…

…re/rackspace
zendframework · May 31, 2011 · c0932a7 · c0932a7
12 parents 221c254 + d4f9d25 + 3b0e0d4 + d488887 + 3c450c0 + 964d943 + 679904a + d7eb727 + ea05ef8 + 431fead + 1f5cb72 + fd64604
commit c0932a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/Decode.php b/src/Decode.php
@@ -24,7 +24,7 @@
 namespace Zend\Mime;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Zend\Mime\Exception\RuntimeException
  * @uses       \Zend\Mime\Mime
  * @category   Zend
  * @package    Zend_Mime
@@ -41,7 +41,7 @@ class Decode
      * @param  string $body     raw body of message
      * @param  string $boundary boundary as found in content-type
      * @return array parts with content of each part, empty if no parts found
-     * @throws \Zend\Exception
+     * @throws Exception\RuntimeException
      */
     public static function splitMime($body, $boundary)
     {
@@ -86,7 +86,7 @@ public static function splitMime($body, $boundary)
      * @param  string $boundary boundary as found in content-type
      * @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
      * @return array|null parts as array('header' => array(name => value), 'body' => content), null if no parts found
-     * @throws \Zend\Exception
+     * @throws Exception\RuntimeException
      */
     public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINEEND)
     {
@@ -188,7 +188,7 @@ public static function splitContentType($type, $wantedPart = null)
      * @param  string $wantedPart the wanted part, else an array with all parts is returned
      * @param  string $firstName  key name for the first part
      * @return string|array wanted part or all parts as array($firstName => firstPart, partname => value)
-     * @throws \Zend\Exception
+     * @throws Exception\RuntimeException
      */
     public static function splitHeaderField($field, $wantedPart = null, $firstName = 0)
     {

diff --git a/src/Exception.php b/src/Exception.php
@@ -24,7 +24,6 @@
 namespace Zend\Mime;
 
 /**
- * @uses       \Zend\Exception
  * @category   Zend
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Message.php b/src/Message.php
@@ -24,7 +24,7 @@
 namespace Zend\Mime;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Zend\Mime\Exception\RuntimeException
  * @uses       \Zend\Mime\Mime
  * @uses       \Zend\Mime\Decode
  * @uses       \Zend\Mime\Part