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 · 390535a · 390535a
2 parents d8a7bb7 + 58956c7
commit 390535a
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 13 deletions.
diff --git a/src/Css2Xpath.php b/src/Css2Xpath.php
@@ -30,7 +30,6 @@
  * @subpackage Query
  * @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$
  */
 class Css2Xpath
 {

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Dom
  * @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$
  */
 
 /**
@@ -33,6 +32,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,37 @@
+<?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_Dom
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Dom\Exception;
+
+/**
+ * Zend_Dom Exceptions
+ *
+ * @uses       \Zend\Dom\Exception
+ * @category   Zend
+ * @package    Zend_Dom
+ * @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 \Zend\Dom\Exception
+{
+}
diff --git a/src/NodeList.php b/src/NodeList.php
@@ -32,7 +32,6 @@
  * @subpackage Query
  * @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$
  */
 class NodeList implements \Iterator,\Countable
 {

diff --git a/src/Query.php b/src/Query.php
@@ -16,7 +16,6 @@
  * @package    Zend_Dom
  * @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$
  */
 
 /**
@@ -190,7 +189,7 @@ public function execute($query)
     public function queryXpath($xpathQuery, $query = null)
     {
         if (null === ($document = $this->getDocument())) {
-            throw new Exception('Cannot query; no document registered');
+            throw new Exception\RuntimeException('Cannot query; no document registered');
         }
 
         libxml_use_internal_errors(true);
@@ -214,7 +213,7 @@ public function queryXpath($xpathQuery, $query = null)
         libxml_use_internal_errors(false);
 
         if (!$success) {
-            throw new Exception(sprintf('Error parsing document (type == %s)', $type));
+            throw new Exception\RuntimeException(sprintf('Error parsing document (type == %s)', $type));
         }
 
         $nodeList   = $this->_getNodeList($domDoc, $xpathQuery);
@@ -248,4 +247,4 @@ protected function _getNodeList($document, $xpathQuery)
         $xpathQuery = (string) $xpathQuery;
         return $xpath->query($xpathQuery);
     }
-}
+}
diff --git a/test/Css2XpathTest.php b/test/Css2XpathTest.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/NodeListTest.php b/test/NodeListTest.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/QueryTest.php b/test/QueryTest.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$
  */
 
 /**
@@ -127,7 +126,7 @@ public function testDocumentTypeShouldBeAutomaticallyDiscovered()
 
     public function testQueryingWithoutRegisteringDocumentShouldThrowException()
     {
-        $this->setExpectedException('\\Zend\\Dom\\Exception', 'no document');
+        $this->setExpectedException('\Zend\Dom\Exception\RuntimeException', 'no document');
         $this->query->execute('.foo');
     }