diff options
| author | Antonio Diaz Ruiz <dejalatele@gmail.com> | 2013-06-24 22:39:27 +0200 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-10 18:02:00 -0700 |
| commit | 5f5ff92bc0c96ecc1d6b9e3bd7ec5fbc0aef7a8d (patch) | |
| tree | 5f2807461614841662dfd29b97dcafcdaece7850 /ext/dom | |
| parent | 24f36934ad4b9d00a4c96da252497a4091bb28e6 (diff) | |
| download | php-git-5f5ff92bc0c96ecc1d6b9e3bd7ec5fbc0aef7a8d.tar.gz | |
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code.
It fixs the fail on the load of the dtd in the tests modified by this commit.
Diffstat (limited to 'ext/dom')
| -rw-r--r-- | ext/dom/tests/DOMDocument_loadXML_variation1.phpt | 2 | ||||
| -rw-r--r-- | ext/dom/tests/DOMDocument_loadXML_variation2.phpt | 2 | ||||
| -rw-r--r-- | ext/dom/tests/DOMDocument_loadXML_variation4.phpt | 4 | ||||
| -rw-r--r-- | ext/dom/tests/book_with_dtd2.xml | 16 | ||||
| -rw-r--r-- | ext/dom/tests/wrong_book_with_dtd2.xml | 13 |
5 files changed, 33 insertions, 4 deletions
diff --git a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt index eb5c693e42..558137526f 100644 --- 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 a1e6e80220..71f638efc1 100644 --- 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 6adefa8414..5960daac86 100644 --- 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 index 0000000000..1b1478d02e --- /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 index 0000000000..aad520f9b6 --- /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> |