summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Magnusson <bjori@php.net>2011-06-05 11:31:18 +0000
committerHannes Magnusson <bjori@php.net>2011-06-05 11:31:18 +0000
commitbf3cd0675d0960a0568cad0b59e1d35c325eae0c (patch)
treeaee05946eafe1a064b6dd32b911e8a6fa507177f
parent9f7b09a265633c29ca60f08a8174c18933d5439b (diff)
downloadphp-git-bf3cd0675d0960a0568cad0b59e1d35c325eae0c.tar.gz
No need to fetch external files and endless amount of DTDs for this test
-rw-r--r--ext/dom/examples/note.dtd4
-rw-r--r--ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt11
2 files changed, 6 insertions, 9 deletions
diff --git a/ext/dom/examples/note.dtd b/ext/dom/examples/note.dtd
index 4016eb5811..c2d558eee4 100644
--- a/ext/dom/examples/note.dtd
+++ b/ext/dom/examples/note.dtd
@@ -1,6 +1,6 @@
-<?xml version="1.0" ?>
+<?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)> \ No newline at end of file
+<!ELEMENT body (#PCDATA)>
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
index 2395b01344..403e01aa76 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
@@ -6,17 +6,14 @@ Hans Zaunere
--SKIPIF--
<?php
require_once('skipif.inc');
-
-// need external DTD/XML docs
-if( @file_get_contents('http://www.php.net/docs.php') === FALSE )
- exit('skip network not available');
?>
--FILE--
<?php
require_once('dom_test.inc');
-$XMLStringGood = file_get_contents('http://www.php.net/docs.php');
+chdir(__DIR__ . "/../examples");
+$XMLStringGood = file_get_contents('note.xml');
$dom = new DOMDocument;
$dom->resolveExternals = TRUE;
@@ -27,7 +24,7 @@ $dom->loadXML($XMLStringGood);
echo "No Error Report Above\n";
$BogusElement = $dom->createElement('NYPHP','DOMinatrix');
-$Body = $dom->getElementsByTagName('body')->item(0);
+$Body = $dom->getElementsByTagName('from')->item(0);
$Body->appendChild($BogusElement);
$XMLStringBad = $dom->saveXML();
@@ -44,6 +41,6 @@ validateOnParse set to TRUE:
Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, line: %d in %s on line %d
-Warning: DOMDocument::loadXML(): Element body content does not follow the DTD, expecting (p | h1 | h2 | h3 | h4 | h5 | h6 | div | ul | ol | dl | pre | hr | blockquote | address | fieldset | table | form | noscript | ins | del | script)*, got (div div div div div NYPHP) in Entity, line: %d in %s on line %d
+Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but contains non text nodes in Entity, line: %d in %s on line %d
Error Report Above