diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-30 17:25:11 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-30 17:25:11 +0200 |
| commit | 47c8b6039a104d0f064e9ad962016dbd86cf8d8c (patch) | |
| tree | 4a9153e41bd192e1eaf79aa631184a945d22a13a | |
| parent | fc24e74260399bf4a6badeb61f0e0eed4463d1d2 (diff) | |
| parent | d26e006d7f01db6fab3942ebbf073beaabf57e2d (diff) | |
| download | php-git-47c8b6039a104d0f064e9ad962016dbd86cf8d8c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
| -rw-r--r-- | ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt | 2 | ||||
| -rw-r--r-- | ext/dom/tests/note.dtd | 6 | ||||
| -rw-r--r-- | ext/dom/tests/note.xml | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt index 403e01aa76..d0cea29c7c 100644 --- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt +++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt @@ -12,7 +12,7 @@ require_once('skipif.inc'); require_once('dom_test.inc'); -chdir(__DIR__ . "/../examples"); +chdir(__DIR__); $XMLStringGood = file_get_contents('note.xml'); $dom = new DOMDocument; diff --git a/ext/dom/tests/note.dtd b/ext/dom/tests/note.dtd new file mode 100644 index 0000000000..c2d558eee4 --- /dev/null +++ b/ext/dom/tests/note.dtd @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!ELEMENT note (to,from,heading,body)> +<!ELEMENT to (#PCDATA)> +<!ELEMENT from (#PCDATA)> +<!ELEMENT heading (#PCDATA)> +<!ELEMENT body (#PCDATA)> diff --git a/ext/dom/tests/note.xml b/ext/dom/tests/note.xml new file mode 100644 index 0000000000..49614a1b52 --- /dev/null +++ b/ext/dom/tests/note.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE note SYSTEM "note.dtd"> +<note> +<to>PHP User Group</to> +<from>Shane</from> +<heading>Reminder</heading> +<body>Don't forget the meeting tonight!</body> +</note> |