rrichards Sat Aug 5 12:35:35 2006 UTC
Modified files:
/php-src/ext/dom/tests bug34276.phpt bug35342.phpt bug36756.phpt
bug37277.phpt canonicalization.phpt
dom002.phpt dom007.phpt
dom_set_attr_node.phpt dom_test.inc
Log:
update tests
use binary strings for loadXML() method
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug34276.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/bug34276.phpt
diff -u php-src/ext/dom/tests/bug34276.phpt:1.3
php-src/ext/dom/tests/bug34276.phpt:1.4
--- php-src/ext/dom/tests/bug34276.phpt:1.3 Fri Aug 4 18:11:27 2006
+++ php-src/ext/dom/tests/bug34276.phpt Sat Aug 5 12:35:35 2006
@@ -4,7 +4,7 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
-$xml = <<<HERE
+$xml = b<<<HERE
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo xmlns="http://www.example.com/ns/foo";
xmlns:fubar="http://www.example.com/ns/fubar"; attra="attra" />
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug35342.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/dom/tests/bug35342.phpt
diff -u php-src/ext/dom/tests/bug35342.phpt:1.2
php-src/ext/dom/tests/bug35342.phpt:1.3
--- php-src/ext/dom/tests/bug35342.phpt:1.2 Tue Jun 27 00:09:23 2006
+++ php-src/ext/dom/tests/bug35342.phpt Sat Aug 5 12:35:35 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
$dom = new DOMDocument();
-$dom->loadXML("<root><foo>foobar</foo><foo>foobar#2</foo></root>");
+$dom->loadXML(b"<root><foo>foobar</foo><foo>foobar#2</foo></root>");
$nodelist = $dom->getElementsByTagName("foo");
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug36756.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/dom/tests/bug36756.phpt
diff -u php-src/ext/dom/tests/bug36756.phpt:1.2
php-src/ext/dom/tests/bug36756.phpt:1.3
--- php-src/ext/dom/tests/bug36756.phpt:1.2 Sat Mar 18 11:46:13 2006
+++ php-src/ext/dom/tests/bug36756.phpt Sat Aug 5 12:35:35 2006
@@ -7,7 +7,7 @@
/* Node is preserved from removeChild */
$dom = new DOMDocument();
-$dom->loadXML('<root><child/></root>');
+$dom->loadXML(b'<root><child/></root>');
$xpath = new DOMXpath($dom);
$node = $xpath->query('/root')->item(0);
echo $node->nodeName . "\n";
@@ -15,7 +15,7 @@
echo "nodeType: " . $node->nodeType . "\n";
/* Node gets destroyed during removeChild */
-$dom->loadXML('<root><child/></root>');
+$dom->loadXML(b'<root><child/></root>');
$xpath = new DOMXpath($dom);
$node = $xpath->query('//child')->item(0);
echo $node->nodeName . "\n";
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug37277.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/bug37277.phpt
diff -u php-src/ext/dom/tests/bug37277.phpt:1.1
php-src/ext/dom/tests/bug37277.phpt:1.2
--- php-src/ext/dom/tests/bug37277.phpt:1.1 Wed May 3 08:41:33 2006
+++ php-src/ext/dom/tests/bug37277.phpt Sat Aug 5 12:35:35 2006
@@ -6,7 +6,7 @@
<?php
$dom1 = new DomDocument('1.0', 'UTF-8');
-$xml = '<foo />';
+$xml = b'<foo />';
$dom1->loadXml($xml);
$node = clone $dom1->documentElement;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/canonicalization.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/canonicalization.phpt
diff -u php-src/ext/dom/tests/canonicalization.phpt:1.1
php-src/ext/dom/tests/canonicalization.phpt:1.2
--- php-src/ext/dom/tests/canonicalization.phpt:1.1 Fri May 26 18:22:06 2006
+++ php-src/ext/dom/tests/canonicalization.phpt Sat Aug 5 12:35:35 2006
@@ -4,7 +4,7 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
-$xml = <<<EOXML
+$xml = b<<<EOXML
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo xmlns="http://www.example.com/ns/foo";
xmlns:fubar="http://www.example.com/ns/fubar";
xmlns:test="urn::test"><contain>
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom002.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/dom002.phpt
diff -u php-src/ext/dom/tests/dom002.phpt:1.3
php-src/ext/dom/tests/dom002.phpt:1.4
--- php-src/ext/dom/tests/dom002.phpt:1.3 Tue Jun 27 00:09:23 2006
+++ php-src/ext/dom/tests/dom002.phpt Sat Aug 5 12:35:35 2006
@@ -4,7 +4,7 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
-$xml = <<<HERE
+$xml = b<<<HERE
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo xmlns="http://www.example.com/ns/foo";
xmlns:fubar="http://www.example.com/ns/fubar";>
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom007.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/dom007.phpt
diff -u php-src/ext/dom/tests/dom007.phpt:1.1
php-src/ext/dom/tests/dom007.phpt:1.2
--- php-src/ext/dom/tests/dom007.phpt:1.1 Fri Mar 3 20:13:12 2006
+++ php-src/ext/dom/tests/dom007.phpt Sat Aug 5 12:35:35 2006
@@ -6,7 +6,7 @@
?>
--FILE--
<?php
-$xml = <<< EOXML
+$xml = b<<< EOXML
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE courses [
<!ELEMENT courses (course+)>
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_set_attr_node.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/dom_set_attr_node.phpt
diff -u php-src/ext/dom/tests/dom_set_attr_node.phpt:1.3
php-src/ext/dom/tests/dom_set_attr_node.phpt:1.4
--- php-src/ext/dom/tests/dom_set_attr_node.phpt:1.3 Tue Jan 17 12:18:52 2006
+++ php-src/ext/dom/tests/dom_set_attr_node.phpt Sat Aug 5 12:35:35 2006
@@ -5,12 +5,12 @@
--FILE--
<?php
-$xml = <<<HERE
+$xml = b<<<HERE
<?xml version="1.0" ?>
<root a="b" />
HERE;
-$xml2 = <<<HERE
+$xml2 = b<<<HERE
<?xml version="1.0" ?>
<doc2 />
HERE;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_test.inc?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/dom_test.inc
diff -u php-src/ext/dom/tests/dom_test.inc:1.3
php-src/ext/dom/tests/dom_test.inc:1.4
--- php-src/ext/dom/tests/dom_test.inc:1.3 Fri Dec 5 14:52:51 2003
+++ php-src/ext/dom/tests/dom_test.inc Sat Aug 5 12:35:35 2006
@@ -1,5 +1,5 @@
<?PHP
-$xmlstr = "<?xml version='1.0' standalone='yes'?>
+$xmlstr = b"<?xml version='1.0' standalone='yes'?>
<!DOCTYPE chapter SYSTEM '/share/sgml/Norman_Walsh/db3xml10/db3xml10.dtd'
[ <!ENTITY sp \"spanish\">
]>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
