Merge branch 'merges/rettal-exceptions-dom' into local/milestones/exc…

…eptions

src/Exception.php

@@ -33,6 +33,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
 {
-}
+}

src/Exception/RuntimeException.php

@@ -0,0 +1,38 @@
+<?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
+ * @version    $Id$
+ */
+
+/**
+ * @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
+{
+}

src/Query.php

@@ -190,7 +190,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 +214,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 +248,4 @@ protected function _getNodeList($document, $xpathQuery)
         $xpathQuery = (string) $xpathQuery;
         return $xpath->query($xpathQuery);
     }
-}
+}

test/QueryTest.php

@@ -127,7 +127,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');
     }