Merge branch 'master' into rfc/escaper

src/Css2Xpath.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Dom;
 
 /**

src/Exception.php → src/Exception/ExceptionInterface.php

@@ -18,10 +18,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
-namespace Zend\Dom;
+namespace Zend\Dom\Exception;
 
 /**
  * Zend_Dom Exceptions
@@ -31,6 +28,6 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception
+interface ExceptionInterface
 {
-}
+}

src/Exception/RuntimeException.php

@@ -18,20 +18,18 @@
  * @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-2012 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
+class RuntimeException
+    extends \RuntimeException
+    implements ExceptionInterface
 {
 }

src/NodeList.php

@@ -18,22 +18,24 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Dom;
 
+use Iterator,
+    Countable,
+    DOMDocument,
+    DOMNodeList,
+    DOMXPath,
+    DOMElement;
+
 /**
  * Nodelist for DOM XPath query
  *
- * @uses       Iterator
- * @uses       Countable
  * @package    Zend_Dom
  * @subpackage Query
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class NodeList implements \Iterator,\Countable
+class NodeList implements Iterator, Countable
 {
     /**
      * Number of results
@@ -83,7 +85,7 @@ class NodeList implements \Iterator,\Countable
      * @param  DOMNodeList $nodeList
      * @return void
      */
-    public function  __construct($cssQuery, $xpathQuery, \DOMDocument $document, \DOMNodeList $nodeList)
+    public function  __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMNodeList $nodeList)
     {
         $this->_cssQuery   = $cssQuery;
         $this->_xpathQuery = $xpathQuery;

src/Query.php

@@ -18,17 +18,15 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Dom;
 
+use DOMDocument,
+    DOMNodeList,
+    DOMXPath;
+
 /**
  * Query DOM structures based on CSS selectors and/or XPath
  *
- * @uses       Zend\Dom\Exception
- * @uses       Zend\Dom\Css2Xpath
- * @uses       Zend\Dom\NodeList
  * @package    Zend_Dom
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
@@ -213,7 +211,7 @@ public function getDocumentErrors()
      * Perform a CSS selector query
      *
      * @param  string $query
-     * @return \Zend\Dom\NodeList
+     * @return NodeList
      */
     public function execute($query)
     {
@@ -226,7 +224,8 @@ public function execute($query)
      *
      * @param  string|array $xpathQuery
      * @param  string|null  $query      CSS selector query
-     * @return \Zend\Dom\NodeList
+     * @throws Exception\RuntimeException
+     * @return NodeList
      */
     public function queryXpath($xpathQuery, $query = null)
     {
@@ -237,9 +236,9 @@ public function queryXpath($xpathQuery, $query = null)
         $encoding = $this->getEncoding();
         libxml_use_internal_errors(true);
         if (null === $encoding) {
-            $domDoc = new \DOMDocument('1.0');
+            $domDoc = new DOMDocument('1.0');
         } else {
-            $domDoc = new \DOMDocument('1.0', $encoding);
+            $domDoc = new DOMDocument('1.0', $encoding);
         }
 
         $type   = $this->getDocumentType();
@@ -288,7 +287,7 @@ public function registerXpathNamespaces($xpathNamespaces)
      */
     protected function _getNodeList($document, $xpathQuery)
     {
-        $xpath      = new \DOMXPath($document);
+        $xpath      = new DOMXPath($document);
         foreach ($this->_xpathNamespaces as $prefix => $namespaceUri) {
             $xpath->registerNamespace($prefix, $namespaceUri);
         }

test/Css2XpathTest.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Dom;
 
 use Zend\Dom\Css2Xpath;

test/NodeListTest.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Dom;
 
 use Zend\Dom\NodeList;

test/QueryTest.php

@@ -19,13 +19,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Dom;
 use Zend\Dom\Query,
     Zend\Dom\NodeList,
-    Zend\Dom\Exception as DOMException;
+    Zend\Dom\Exception\ExceptionInterface as DOMException;
 
 /**
  * Test class for Zend_Dom_Query.