Adds 2 new xml files which include the dtd path relative to the base directory for...

It fixs the fail on the load of the dtd in the tests modified by this commit.

diff --git a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt
index eb5c693e42f3b6bcd1d77e6f2327ca57c7f22fba..558137526f27ee5aed9bbb8214ce24b7a7d1cb79 100644 (file)
--- a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt
@@ -13,7 +13,7 @@ assert.bail=true
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --ENV--
-XML_FILE=/book_with_dtd.xml
+XML_FILE=/book_with_dtd2.xml
 LOAD_OPTIONS=LIBXML_DTDLOAD
 EXPECTED_RESULT=1
 --FILE_EXTERNAL--

diff --git a/ext/dom/tests/DOMDocument_loadXML_variation2.phpt b/ext/dom/tests/DOMDocument_loadXML_variation2.phpt
index a1e6e80220e3c2405fecfbd87b840796c7d21808..71f638efc142d97866699b8891c39a3db08536b0 100644 (file)
--- a/ext/dom/tests/DOMDocument_loadXML_variation2.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation2.phpt
@@ -13,7 +13,7 @@ assert.bail=true
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --ENV--
-XML_FILE=/wrong_book_with_dtd.xml
+XML_FILE=/wrong_book_with_dtd2.xml
 LOAD_OPTIONS=LIBXML_DTDVALID
 EXPECTED_RESULT=1
 --FILE_EXTERNAL--

diff --git a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt
index 6adefa8414089a3a93c9d604d43a3c486283c2db..5960daac86585bfd8ca8a6bd7cb5fa356e2fcabb 100644 (file)
--- a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt
@@ -14,12 +14,12 @@ assert.bail=true
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --ENV--
-XML_FILE=/book_with_dtd.xml
+XML_FILE=/book_with_dtd2.xml
 LOAD_OPTIONS=LIBXML_DTDATTR|LIBXML_NOCDATA|LIBXML_NOENT|LIBXML_NOBLANKS
 EXPECTED_RESULT=1
 --FILE_EXTERNAL--
 domdocumentloadxml_test_method_savexml.php
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE books SYSTEM "books.dtd">
+<!DOCTYPE books SYSTEM "ext/dom/tests/books.dtd">
 <books><book><title default="default title">The Grapes of Wrath</title><author>John Steinbeck</author></book><book><title default="default title">The Pearl</title><author>John Steinbeck</author></book><book><title default="default title">entity is only for test purposes</title><author>data for test</author></book></books>

diff --git a/ext/dom/tests/book_with_dtd2.xml b/ext/dom/tests/book_with_dtd2.xml
new file mode 100644 (file)
index 0000000..1b1478d
--- /dev/null
+++ b/ext/dom/tests/book_with_dtd2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE books SYSTEM "ext/dom/tests/books.dtd">
+<books>
+    <book>
+    <title>The Grapes of Wrath</title>
+    <author>John Steinbeck</author>
+    </book>
+    <book>
+    <title>The Pearl</title>
+    <author>John Steinbeck</author>
+    </book>
+    <book>
+    <title>&entitest;</title>
+    <author><![CDATA[data for test]]></author>
+    </book>
+</books>

diff --git a/ext/dom/tests/wrong_book_with_dtd2.xml b/ext/dom/tests/wrong_book_with_dtd2.xml
new file mode 100644 (file)
index 0000000..aad520f
--- /dev/null
+++ b/ext/dom/tests/wrong_book_with_dtd2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE books SYSTEM "ext/dom/tests/books.dtd">
+<books>
+    <book>
+    <title>The Grapes of Wrath</title>
+    <author>John Steinbeck</author>
+    <author>John Steinbeck</author>
+    </book>
+    <book>
+    <title>The Pearl</title>
+    <author>John Steinbeck</author>
+    </book>
+</books>