fix 504 by adding document type 'dom'

croensch · croensch · commit 865d8e107dc8 · 2015-08-17T10:28:34.000+02:00
which is an already loaded instance
diff --git a/library/Zend/Dom/Query.php b/library/Zend/Dom/Query.php
@@ -154,6 +154,9 @@ public function setDocumentDom(DOMDocument $document)
     {
         $this->_document = $document;
         $this->_docType  = self::DOC_DOM;
+        if (null !== $document->encoding) {
+            $this->setEncoding($document->encoding);
+        }
         return $this;
     }
 
@@ -211,7 +214,7 @@ public function setDocumentXml($document, $encoding = null)
     /**
      * Retrieve current document
      *
-     * @return string
+     * @return string|DOMDocument
      */
     public function getDocument()
     {
@@ -276,6 +279,7 @@ public function queryXpath($xpathQuery, $query = null)
         switch ($type) {
             case self::DOC_DOM:
                 $domDoc = $this->_document;
+                $success = true;
                 break;
             case self::DOC_XML:
                 try {
diff --git a/tests/Zend/Dom/QueryTest.php b/tests/Zend/Dom/QueryTest.php
@@ -143,6 +143,8 @@ public function testDocumentTypeShouldBeAutomaticallyDiscovered()
         $this->assertEquals(Zend_Dom_Query::DOC_XML, $this->query->getDocumentType());
         $this->query->setDocument('<html><body></body></html>');
         $this->assertEquals(Zend_Dom_Query::DOC_HTML, $this->query->getDocumentType());
+        $this->query->setDocument(new DOMDocument());
+        $this->assertEquals(Zend_Dom_Query::DOC_DOM, $this->query->getDocumentType());
     }
 
     public function testQueryingWithoutRegisteringDocumentShouldThrowException()
@@ -229,6 +231,18 @@ public function testQueryXpathShouldAllowQueryingArbitraryUsingXpath()
         $this->assertEquals(2, count($result), $result->getXpathQuery());
     }
 
+    public function testQueryOnDomDocument()
+    {
+        $document = new DOMDocument('1.0', 'utf-8');
+        $document->loadHTML($this->getHtml(), LIBXML_PARSEHUGE);
+        $this->query->setDocument($document);
+        $test = $this->query->query('.foo');
+        $this->assertTrue($test instanceof Zend_Dom_Query_Result);
+        $testDocument = $test->getDocument();
+        $this->assertTrue($testDocument instanceof DOMDocument);
+        $this->assertEquals('utf-8', $testDocument->encoding);
+    }
+
     /**
      * @group ZF-9243
      */
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -4,10 +4,10 @@
     </testsuite>
 
     <!-- Enable this for proper unit testing code coverage reports
+    -->
     <filter>
         <whitelist>
             <directory suffix=".php">../library/Zend</directory>
         </whitelist>
     </filter>
-    -->
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,9 @@ public function setDocumentDom(DOMDocument $document)`
`154`	`154`	`{`
`155`	`155`	`$this->_document = $document;`
`156`	`156`	`$this->_docType = self::DOC_DOM;`
	`157`	`+ if (null !== $document->encoding) {`
	`158`	`+ $this->setEncoding($document->encoding);`
	`159`	`+ }`
`157`	`160`	`return $this;`
`158`	`161`	`}`
`159`	`162`
`@@ -211,7 +214,7 @@ public function setDocumentXml($document, $encoding = null)`
`211`	`214`	`/**`
`212`	`215`	`* Retrieve current document`
`213`	`216`	`*`
`214`		`- * @return string`
	`217`	`+ * @return string\|DOMDocument`
`215`	`218`	`*/`
`216`	`219`	`public function getDocument()`
`217`	`220`	`{`
`@@ -276,6 +279,7 @@ public function queryXpath($xpathQuery, $query = null)`
`276`	`279`	`switch ($type) {`
`277`	`280`	`case self::DOC_DOM:`
`278`	`281`	`$domDoc = $this->_document;`
	`282`	`+ $success = true;`
`279`	`283`	`break;`
`280`	`284`	`case self::DOC_XML:`
`281`	`285`	`try {`