Merge branch 'master' into markup

Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
zendframework · Oct 30, 2010 · 431fead · 431fead
3 parents d7eb727 + ea05ef8 + 3b0e0d4
commit 431fead
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 31 deletions.
diff --git a/src/Decode.php b/src/Decode.php
@@ -16,14 +16,12 @@
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\Mime;
-use Zend;
 
 /**
  * @uses       \Zend\Exception
@@ -72,7 +70,7 @@ public static function splitMime($body, $boundary)
         // no more parts, find end boundary
         $p = strpos($body, '--' . $boundary . '--', $start);
         if ($p===false) {
-            throw new Zend\Exception('Not a valid Mime Message: End Missing');
+            throw new Exception\RuntimeException('Not a valid Mime Message: End Missing');
         }
 
         // the remaining part also needs to be parsed:
@@ -205,7 +203,7 @@ public static function splitHeaderField($field, $wantedPart = null, $firstName =
 
         $field = $firstName . '=' . $field;
         if (!preg_match_all('%([^=\s]+)\s*=\s*("[^"]+"|[^;]+)(;\s*|$)%', $field, $matches)) {
-            throw new Zend\Exception('not a valid header field');
+            throw new Exception\RuntimeException('not a valid header field');
         }
 
         if ($wantedPart) {

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,14 +16,12 @@
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\Mime;
-use Zend;
 
 /**
  * @uses       \Zend\Exception
@@ -32,6 +30,6 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends Zend\Exception
+interface Exception
 {}
 
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Mime
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Mime\Exception;
+use Zend\Mime\Exception;
+
+/**
+ * Exception for Zend_Mime component.
+ *
+ * @uses       Zend\Exception
+ * @category   Zend
+ * @package    Zend_Mime
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class RuntimeException
+    extends \RuntimeException
+    implements Exception
+{
+}
diff --git a/src/Message.php b/src/Message.php
@@ -16,14 +16,12 @@
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\Mime;
-use Zend;
 
 /**
  * @uses       \Zend\Exception
@@ -221,7 +219,7 @@ protected static function _disassembleMime($body, $boundary)
         // no more parts, find end boundary
         $p = strpos($body, '--' . $boundary . '--', $start);
         if ($p===false) {
-            throw new Zend\Exception('Not a valid Mime Message: End Missing');
+            throw new Exception\RuntimeException('Not a valid Mime Message: End Missing');
         }
 
         // the remaining part also needs to be parsed:
@@ -273,7 +271,7 @@ public static function createFromMessage($message, $boundary, $EOL = Mime::LINEE
                         $newPart->language = $value;
                         break;
                     default:
-                        throw new Zend\Exception('Unknown header ignored for MimePart:' . $key);
+                        throw new Exception\RuntimeException('Unknown header ignored for MimePart:' . $key);
                 }
             }
             $res->addPart($newPart);

diff --git a/src/Mime.php b/src/Mime.php
@@ -16,7 +16,6 @@
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Part.php b/src/Part.php
@@ -16,7 +16,6 @@
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -94,7 +93,7 @@ public function isStream()
     public function getEncodedStream()
     {
         if (!$this->_isStream) {
-            throw new Exception('Attempt to get a stream from a string part');
+            throw new Exception\RuntimeException('Attempt to get a stream from a string part');
         }
 
         //stream_filter_remove(); // ??? is that right?
@@ -110,7 +109,7 @@ public function getEncodedStream()
                     )
                 );
                 if (!is_resource($filter)) {
-                    throw new Exception('Failed to append quoted-printable filter');
+                    throw new Exception\RuntimeException('Failed to append quoted-printable filter');
                 }
                 break;
             case Mime::ENCODING_BASE64:
@@ -124,7 +123,7 @@ public function getEncodedStream()
                     )
                 );
                 if (!is_resource($filter)) {
-                    throw new Exception('Failed to append base64 filter');
+                    throw new Exception\RuntimeException('Failed to append base64 filter');
                 }
                 break;
             default:

diff --git a/test/MessageTest.php b/test/MessageTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,10 +25,6 @@
 namespace ZendTest\Mime;
 use Zend\Mime;
 
-/**
- * PHPUnit test case
- */
-
 /**
  * @category   Zend
  * @package    Zend_Mime

diff --git a/test/MimeTest.php b/test/MimeTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id $
  */
 
 /**

diff --git a/test/PartTest.php b/test/PartTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,14 +25,6 @@
 namespace ZendTest\Mime;
 use Zend\Mime;
 
-/**
- * Zend_Mime_Part
- */
-
-/**
- * PHPUnit test case
- */
-
 /**
  * @category   Zend
  * @package    Zend_Mime