bjori Sun, 05 Jun 2011 11:31:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311827
Log:
No need to fetch external files and endless amount of DTDs for this test
Changed paths:
U php/php-src/branches/PHP_5_4/ext/dom/examples/note.dtd
U
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
U php/php-src/trunk/ext/dom/examples/note.dtd
U
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
Modified: php/php-src/branches/PHP_5_4/ext/dom/examples/note.dtd
===================================================================
(Binary files differ)
Modified:
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
===================================================================
---
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
2011-06-05 09:42:10 UTC (rev 311826)
+++
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
2011-06-05 11:31:18 UTC (rev 311827)
@@ -6,17 +6,14 @@
--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 @@
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 @@
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
Modified: php/php-src/trunk/ext/dom/examples/note.dtd
===================================================================
(Binary files differ)
Modified:
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
===================================================================
---
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
2011-06-05 09:42:10 UTC (rev 311826)
+++
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
2011-06-05 11:31:18 UTC (rev 311827)
@@ -6,17 +6,14 @@
--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 @@
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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
