rrichards Sat Aug 5 12:32:54 2006 UTC
Modified files:
/php-src/ext/xmlreader/tests 001.phpt 005.phpt 006.phpt 007.phpt
008.phpt 009.phpt 010.phpt 011.phpt
012.phpt 013.phpt
Log:
update tests
use binary strings for XML() method
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlreader/tests/001.phpt
diff -u php-src/ext/xmlreader/tests/001.phpt:1.1
php-src/ext/xmlreader/tests/001.phpt:1.2
--- php-src/ext/xmlreader/tests/001.phpt:1.1 Wed Dec 21 03:46:02 2005
+++ php-src/ext/xmlreader/tests/001.phpt Sat Aug 5 12:32:54 2006
@@ -4,9 +4,9 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 001.phpt,v 1.1 2005/12/21 03:46:02 pajoye Exp $ */
+/* $Id: 001.phpt,v 1.2 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
<books></books>';
$reader = new XMLReader();
@@ -16,7 +16,7 @@
while ($reader->read()) {
echo $reader->name."\n";
}
-$xmlstring = '';
+$xmlstring = b'';
$reader = new XMLReader();
$reader->XML($xmlstring);
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlreader/tests/005.phpt
diff -u php-src/ext/xmlreader/tests/005.phpt:1.1
php-src/ext/xmlreader/tests/005.phpt:1.2
--- php-src/ext/xmlreader/tests/005.phpt:1.1 Wed Dec 21 03:46:02 2005
+++ php-src/ext/xmlreader/tests/005.phpt Sat Aug 5 12:32:54 2006
@@ -4,9 +4,9 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 005.phpt,v 1.1 2005/12/21 03:46:02 pajoye Exp $ */
+/* $Id: 005.phpt,v 1.2 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
<books></books>';
$reader = new XMLReader();
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlreader/tests/006.phpt
diff -u php-src/ext/xmlreader/tests/006.phpt:1.1
php-src/ext/xmlreader/tests/006.phpt:1.2
--- php-src/ext/xmlreader/tests/006.phpt:1.1 Wed Dec 21 03:46:02 2005
+++ php-src/ext/xmlreader/tests/006.phpt Sat Aug 5 12:32:54 2006
@@ -4,9 +4,9 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 006.phpt,v 1.1 2005/12/21 03:46:02 pajoye Exp $ */
+/* $Id: 006.phpt,v 1.2 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
<books><book num="1"></book><test /></books>';
$reader = new XMLReader();
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/007.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlreader/tests/007.phpt
diff -u php-src/ext/xmlreader/tests/007.phpt:1.2
php-src/ext/xmlreader/tests/007.phpt:1.3
--- php-src/ext/xmlreader/tests/007.phpt:1.2 Wed Dec 21 13:34:44 2005
+++ php-src/ext/xmlreader/tests/007.phpt Sat Aug 5 12:32:54 2006
@@ -7,9 +7,9 @@
?>
--FILE--
<?php
-/* $Id: 007.phpt,v 1.2 2005/12/21 13:34:44 pajoye Exp $ */
+/* $Id: 007.phpt,v 1.3 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring = '<TEI.2>hello</TEI.2>';
+$xmlstring = b'<TEI.2>hello</TEI.2>';
$relaxngfile = dirname(__FILE__) . '/relaxNG.rng';
$file = dirname(__FILE__) . '/__007.xml';
file_put_contents($file, $xmlstring);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/008.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlreader/tests/008.phpt
diff -u php-src/ext/xmlreader/tests/008.phpt:1.2
php-src/ext/xmlreader/tests/008.phpt:1.3
--- php-src/ext/xmlreader/tests/008.phpt:1.2 Wed Jan 4 19:43:36 2006
+++ php-src/ext/xmlreader/tests/008.phpt Sat Aug 5 12:32:54 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 008.phpt,v 1.2 2006/01/04 19:43:36 rrichards Exp $ */
+/* $Id: 008.phpt,v 1.3 2006/08/05 12:32:54 rrichards Exp $ */
$xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE LIST SYSTEM "dtdexample.dtd">
@@ -22,7 +22,7 @@
</MOVIE>
</LIST>';
-$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd';
+$dtdfile = rawurlencode(dirname(__FILE__)) . b'/dtdexample.dtd';
$file = dirname(__FILE__) . '/__008.xml';
file_put_contents($file, $xmlstring);
@@ -38,8 +38,8 @@
$reader->close();
unlink($file);
-$xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE LIST SYSTEM "file:///' . $dtdfile. '">
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LIST SYSTEM "file:///' . $dtdfile. b'">
<LIST>
<MOVIE ID="x200338360">
<TITLE>Move Title 1</TITLE>
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/009.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlreader/tests/009.phpt
diff -u php-src/ext/xmlreader/tests/009.phpt:1.1
php-src/ext/xmlreader/tests/009.phpt:1.2
--- php-src/ext/xmlreader/tests/009.phpt:1.1 Wed Dec 21 03:46:02 2005
+++ php-src/ext/xmlreader/tests/009.phpt Sat Aug 5 12:32:54 2006
@@ -4,9 +4,9 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 009.phpt,v 1.1 2005/12/21 03:46:02 pajoye Exp $ */
+/* $Id: 009.phpt,v 1.2 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
<books><book num="1"><test /></book><book num="2" /></books>';
$reader = new XMLReader();
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/010.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlreader/tests/010.phpt
diff -u php-src/ext/xmlreader/tests/010.phpt:1.1
php-src/ext/xmlreader/tests/010.phpt:1.2
--- php-src/ext/xmlreader/tests/010.phpt:1.1 Wed Dec 21 03:46:02 2005
+++ php-src/ext/xmlreader/tests/010.phpt Sat Aug 5 12:32:54 2006
@@ -4,8 +4,8 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 010.phpt,v 1.1 2005/12/21 03:46:02 pajoye Exp $ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+/* $Id: 010.phpt,v 1.2 2006/08/05 12:32:54 rrichards Exp $ */
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
<prefix:books xmlns:prefix="uri" isbn=""
prefix:isbn="12isbn">book1</prefix:books>';
$reader = new XMLReader();
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/011.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlreader/tests/011.phpt
diff -u php-src/ext/xmlreader/tests/011.phpt:1.2
php-src/ext/xmlreader/tests/011.phpt:1.3
--- php-src/ext/xmlreader/tests/011.phpt:1.2 Wed Dec 21 13:34:44 2005
+++ php-src/ext/xmlreader/tests/011.phpt Sat Aug 5 12:32:54 2006
@@ -7,9 +7,9 @@
?>
--FILE--
<?php
-/* $Id: 011.phpt,v 1.2 2005/12/21 13:34:44 pajoye Exp $ */
+/* $Id: 011.phpt,v 1.3 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
<books><book>test</book></books>';
$reader = new XMLReader();
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/012.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlreader/tests/012.phpt
diff -u php-src/ext/xmlreader/tests/012.phpt:1.2
php-src/ext/xmlreader/tests/012.phpt:1.3
--- php-src/ext/xmlreader/tests/012.phpt:1.2 Wed Jul 19 18:32:19 2006
+++ php-src/ext/xmlreader/tests/012.phpt Sat Aug 5 12:32:54 2006
@@ -4,9 +4,9 @@
<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
-/* $Id: 012.phpt,v 1.2 2006/07/19 18:32:19 rrichards Exp $ */
+/* $Id: 012.phpt,v 1.3 2006/08/05 12:32:54 rrichards Exp $ */
-$xmlstring =<<<EOF
+$xmlstring =b<<<EOF
<?xml version="1.0" encoding="UTF-8"?>
<foo bar=""/>
EOF;
@@ -18,13 +18,13 @@
var_dump($reader->getAttribute('baz'));
$reader->close();
-$xmlstring =<<<EOF
+$xmlstring =b<<<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE foo SYSTEM "012.dtd">
<foo bar=""/>
EOF;
-$xmlstring = str_replace('012.dtd', dirname(__FILE__).'/012.dtd', $xmlstring);
+$xmlstring = str_replace('012.dtd', dirname(__FILE__).b'/012.dtd', $xmlstring);
$reader = new XMLReader();
$reader->XML($xmlstring);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/013.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlreader/tests/013.phpt
diff -u php-src/ext/xmlreader/tests/013.phpt:1.2
php-src/ext/xmlreader/tests/013.phpt:1.3
--- php-src/ext/xmlreader/tests/013.phpt:1.2 Wed Jul 19 18:32:19 2006
+++ php-src/ext/xmlreader/tests/013.phpt Sat Aug 5 12:32:54 2006
@@ -5,9 +5,9 @@
<?php if (!method_exists('XMLReader','setSchema')) die('skip
XMLReader::setSchema() not supported');?>
--FILE--
<?php
-/* $Id: 013.phpt,v 1.2 2006/07/19 18:32:19 rrichards Exp $ */
+/* $Id: 013.phpt,v 1.3 2006/08/05 12:32:54 rrichards Exp $ */
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="UTF-8" ?>
<items>
<item>123</item>
@@ -17,7 +17,7 @@
$reader = new XMLReader();
$reader->XML($xml);
-$reader->setSchema(dirname(__FILE__) . '/013.xsd');
+$reader->setSchema(dirname(__FILE__) . b'/013.xsd');
while($reader->read()) {
if ($reader->nodeType == XMLReader::ELEMENT && $reader->name == 'item')
{
$reader->read();
@@ -30,14 +30,14 @@
===FAIL===
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="UTF-8" ?>
<foo/>
EOF;
$reader = new XMLReader();
$reader->XML($xml);
-$reader->setSchema(dirname(__FILE__) . '/013.xsd');
+$reader->setSchema(dirname(__FILE__) . b'/013.xsd');
while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
$reader->close();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
