Commit: 1a5c460ea2f74c46f87e5a92631506a35eeb6aa0 Author: Antonio Diaz Ruiz <dejalat...@gmail.com> Tue, 25 Jun 2013 22:09:38 +0200 Committer: Stanislav Malyshev <s...@php.net> Sat, 10 Aug 2013 18:02:08 -0700 Parents: 5f5ff92bc0c96ecc1d6b9e3bd7ec5fbc0aef7a8d Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a5c460ea2f74c46f87e5a92631506a35eeb6aa0 Log: Embeds the content of the DTD in the DOCTYPE declaration of the XML files. Changed paths: M ext/dom/tests/DOMDocument_loadXML_variation4.phpt M ext/dom/tests/book_with_dtd2.xml M ext/dom/tests/wrong_book_with_dtd2.xml Diff: diff --git a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt index 5960daa..4f1ea37 100644 --- a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt @@ -21,5 +21,12 @@ EXPECTED_RESULT=1 domdocumentloadxml_test_method_savexml.php --EXPECT-- <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE books SYSTEM "ext/dom/tests/books.dtd"> +<!DOCTYPE books [ +<!ENTITY entitest "entity is only for test purposes"> +<!ATTLIST title default CDATA "default title"> +<!ELEMENT books (book)*> +<!ELEMENT book (title , author)> +<!ELEMENT title (#PCDATA)> +<!ELEMENT author (#PCDATA)> +]> <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 index 1b1478d..aeb4f0b 100644 --- a/ext/dom/tests/book_with_dtd2.xml +++ b/ext/dom/tests/book_with_dtd2.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE books SYSTEM "ext/dom/tests/books.dtd"> +<!DOCTYPE books [ +<!ENTITY entitest "entity is only for test purposes"> +<!ATTLIST title default CDATA "default title"> +<!ELEMENT books (book*)> +<!ELEMENT book (title, author)> +<!ELEMENT title (#PCDATA)> +<!ELEMENT author (#PCDATA)> +]> <books> <book> <title>The Grapes of Wrath</title> diff --git a/ext/dom/tests/wrong_book_with_dtd2.xml b/ext/dom/tests/wrong_book_with_dtd2.xml index aad520f..6c49deb 100644 --- a/ext/dom/tests/wrong_book_with_dtd2.xml +++ b/ext/dom/tests/wrong_book_with_dtd2.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE books SYSTEM "ext/dom/tests/books.dtd"> +<!DOCTYPE books [ +<!ENTITY entitest "entity is only for test purposes"> +<!ATTLIST title default CDATA "default title"> +<!ELEMENT books (book)*> +<!ELEMENT book (title , author)> +<!ELEMENT title (#PCDATA)> +<!ELEMENT author (#PCDATA)> +]> <books> <book> <title>The Grapes of Wrath</title> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
