From: Hannes Magnusson <bjori@php.net>
Date: Sun, 5 Jun 2011 11:31:18 +0000 (+0000)
Subject: No need to fetch external files and endless amount of DTDs for this test
X-Git-Tag: php-5.5.0alpha1~1994
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf3cd0675d0960a0568cad0b59e1d35c325eae0c;p=php

No need to fetch external files and endless amount of DTDs for this test
---

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