首页 发现 帮助
登录
boarspring
/
repo_zf1
镜像自地址 https://github.com/bluescreen/zf1-php7.2.git
2
0
派生 1
文件 工单管理 0 Wiki
浏览代码

ZF-11376: Fix XHTML document detection when beginning with XML declaration

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24794 44c647ce-9c0f-0410-b52a-842ac1e357ba
adamlundrigan 13 年之前
父节点
40a5c7af4e
当前提交
af5cfb482e
共有 2 个文件被更改，包括 20 次插入 和 0 次删除
合并视图 显示文件统计
  1. 4 0
      library/Zend/Dom/Query.php
  2. 16 0
      tests/Zend/Dom/QueryTest.php

+ 4 - 0
library/Zend/Dom/Query.php
查看文件 

@@ -124,6 +124,10 @@ class Zend_Dom_Query
 
         }
 
         }
 
         // breaking XML declaration to make syntax highlighting work
 
         // breaking XML declaration to make syntax highlighting work
 
         if ('<' . '?xml' == substr(trim($document), 0, 5)) {
 
         if ('<' . '?xml' == substr(trim($document), 0, 5)) {
 
+            if (preg_match('/\?'.'>\s+<html[^>]*xmlns="([^"]+)"[^>]*>/i', $document, $matches)) {
 
+                $this->_xpathNamespaces[] = $matches[1];
 
+                return $this->setDocumentXhtml($document, $encoding);
 
+            }
 
             return $this->setDocumentXml($document, $encoding);
 
             return $this->setDocumentXml($document, $encoding);
 
         }
 
         }
 
         if (strstr($document, 'DTD XHTML')) {
 
         if (strstr($document, 'DTD XHTML')) {

+ 16 - 0
tests/Zend/Dom/QueryTest.php
查看文件 

@@ -309,6 +309,22 @@ EOF;
 
         $this->assertType('DOMDocument', $doc);
 
         $this->assertType('DOMDocument', $doc);
 
         $this->assertEquals('utf-8', $doc->encoding);
 
         $this->assertEquals('utf-8', $doc->encoding);
 
     }
 
     }
 
+    
+    /**
 
+     * @group ZF-11376
 
+     */
 
+    public function testXhtmlDocumentWithXmlDeclaration()
 
+    {
 
+        $xhtmlWithXmlDecl = <<<EOB
 
+<?xml version="1.0" encoding="UTF-8" ?>
 
+<html xmlns="http://www.w3.org/1999/xhtml">
 
+    <head><title /></head>
 
+    <body><p>Test paragraph.</p></body>
 
+</html>
 
+EOB;
 
+        $this->query->setDocument($xhtmlWithXmlDecl, 'utf-8');
 
+        $this->assertEquals(1, $this->query->query('//p')->count());
 
+    }
 
 }
 
 }
 
 
 
 // Call Zend_Dom_QueryTest::main() if this source file is executed directly.
 
 // Call Zend_Dom_QueryTest::main() if this source file is executed directly.