Merge branch 'hotfix/5408' into develop

Close zendframework/zendframework#5408

src/Document.php

@@ -10,10 +10,6 @@
 namespace Zend\Dom;
 
 use DOMDocument;
-use DOMXPath;
-use Zend\Dom\Document;
-use Zend\Dom\Exception;
-use Zend\Stdlib\ErrorHandler;
 
 /**
  * Class used to initialize DomDocument from string, with proper verifications
@@ -147,8 +143,8 @@ protected function setType($type)
     /**
      * Get DOMDocument generated from set raw document
      *
-     * @return string|null
-     * @throws Exception\RuntimeException
+     * @return DOMDocument
+     * @throws Exception\RuntimeException If cannot get DOMDocument; no document registered
      */
     public function getDomDocument()
     {

src/Document/Query.php

@@ -28,7 +28,9 @@ class Query
     /**
      * Perform the query on Document
      *
-     * @param  Document  $document
+     * @param  string    $expression CSS selector or XPath query
+     * @param  Document  $document   Document to query
+     * @param  string    $type       The type of $expression
      * @return NodeList
      */
     public static function execute($expression, Document $document, $type = self::TYPE_XPATH)

src/Query.php

@@ -11,6 +11,7 @@
 
 use DOMDocument;
 use DOMXPath;
+use ErrorException;
 use Zend\Stdlib\ErrorHandler;
 
 /**
@@ -212,7 +213,7 @@ public function getDocumentErrors()
      */
     public function execute($query)
     {
-        $xpathQuery = Css2Xpath::transform($query);
+        $xpathQuery = Document\Query::cssToXpath($query);
         return $this->queryXpath($xpathQuery, $query);
     }
 
@@ -300,6 +301,7 @@ public function registerXpathPhpFunctions($xpathPhpFunctions = true)
      * @param  DOMDocument $document
      * @param  string|array $xpathQuery
      * @return array
+     * @throws ErrorException If query cannot be executed
      */
     protected function getNodeList($document, $xpathQuery)
     {
@@ -317,10 +319,8 @@ protected function getNodeList($document, $xpathQuery)
 
         ErrorHandler::start();
         $nodeList = $xpath->query($xpathQuery);
-        $error = ErrorHandler::stop();
-        if ($error) {
-            throw $error;
-        }
+        ErrorHandler::stop(true);
+
         return $nodeList;
     }
 }

test/Css2XpathTest.php → test/Document/QueryTest.php

@@ -7,16 +7,16 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Dom;
+namespace ZendTest\Dom\Document;
 
 use Zend\Dom\Document\Query;
 
 /**
- * Test class for Css2Xpath.
+ * Test class for Zend\Dom\Document\Query.
  *
  * @group      Zend_Dom
  */
-class Css2XpathTest extends \PHPUnit_Framework_TestCase
+class QueryTest extends \PHPUnit_Framework_TestCase
 {
     public function testTransformShouldBeCalledStatically()
     {