update tests

use binary strings for XML() method

diff --git a/ext/xmlreader/tests/001.phpt b/ext/xmlreader/tests/001.phpt
index ce9ade9618993136b0ff016cd83aeb2e1456fcaa..4518df940cebddb1d1403cc83fd26844a2ee6f68 100644 (file)
--- a/ext/xmlreader/tests/001.phpt
+++ b/ext/xmlreader/tests/001.phpt
@@ -6,7 +6,7 @@ XMLReader: libxml2 XML Reader, string data
 <?php 
 /* $Id$ */
 
-$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 @@ $reader->XML($xmlstring);
 while ($reader->read()) {
        echo $reader->name."\n";
 }
-$xmlstring = '';
+$xmlstring = b'';
 $reader = new XMLReader();
 $reader->XML($xmlstring);
 ?>

diff --git a/ext/xmlreader/tests/005.phpt b/ext/xmlreader/tests/005.phpt
index e6fd02c9aaa1c4831d3a0e897086db0724380697..6784a260f023caf9c44b44ce00b5126b788cf71a 100644 (file)
--- a/ext/xmlreader/tests/005.phpt
+++ b/ext/xmlreader/tests/005.phpt
@@ -6,7 +6,7 @@ XMLReader: libxml2 XML Reader, parser property set/get
 <?php 
 /* $Id$ */
 
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
 <books></books>';
 
 $reader = new XMLReader();

diff --git a/ext/xmlreader/tests/006.phpt b/ext/xmlreader/tests/006.phpt
index ce9bb451aff44f766e675a0592e6efc04d48f302..cb15eb38c04cbe590d1c785e404f60cdea236ade 100644 (file)
--- a/ext/xmlreader/tests/006.phpt
+++ b/ext/xmlreader/tests/006.phpt
@@ -6,7 +6,7 @@ XMLReader: libxml2 XML Reader, moveToElement
 <?php 
 /* $Id$ */
 
-$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();

diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index b0d7582ef596a3c2ab6900bbaf11fffc524b265e..90396e8e50d99fa12a6057546159a2b7107fafd0 100644 (file)
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -9,7 +9,7 @@ if (!method_exists($reader, 'setRelaxNGSchema')) print "skip";
 <?php 
 /* $Id$ */
 
-$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);

diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index e3af00e4f7f368c73b38ab91cba04919bbd5f57b..18c8dba73dc1cc1d71d6684f624bdd3cfa30133b 100644 (file)
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -22,7 +22,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </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 @@ if ($reader->isValid()) {
 $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>

diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt
index 613ef678cbd9660026f232430b85541c8c0739b4..46052361c8e65717d458b6ddc85b1db93b6b6e94 100644 (file)
--- a/ext/xmlreader/tests/009.phpt
+++ b/ext/xmlreader/tests/009.phpt
@@ -6,7 +6,7 @@ XMLReader: libxml2 XML Reader, next
 <?php 
 /* $Id$ */
 
-$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();

diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt
index a107c7441ffadc09a46360168dc868aacf50dde2..c260c7160154f8a7e43fe08994d06e8a938335ba 100644 (file)
--- a/ext/xmlreader/tests/010.phpt
+++ b/ext/xmlreader/tests/010.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, next
 --FILE--
 <?php 
 /* $Id$ */
-$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+$xmlstring = b'<?xml version="1.0" encoding="UTF-8"?>
 <prefix:books xmlns:prefix="uri" isbn="" prefix:isbn="12isbn">book1</prefix:books>';
 
 $reader = new XMLReader();

diff --git a/ext/xmlreader/tests/011.phpt b/ext/xmlreader/tests/011.phpt
index 89599232fce04058ffaf5896988dadf5e1a6828e..6b30e20b5dfcd960be6857082fba8508e25f0c8b 100644 (file)
--- a/ext/xmlreader/tests/011.phpt
+++ b/ext/xmlreader/tests/011.phpt
@@ -9,7 +9,7 @@ if (!method_exists($reader, 'readInnerXml')) print "skip";
 <?php 
 /* $Id$ */
 
-$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();

diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index 1ca8ab62785b2986141cbfa6695ab3ee6cff2652..7cd4023523d3145a773e7d6452e4c0f775132350 100755 (executable)
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -6,7 +6,7 @@ XMLReader: accessing empty and non existing attributes
 <?php 
 /* $Id$ */
 
-$xmlstring =<<<EOF
+$xmlstring =b<<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <foo bar=""/>
 EOF;
@@ -18,13 +18,13 @@ var_dump($reader->getAttribute('bar'));
 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);

diff --git a/ext/xmlreader/tests/013.phpt b/ext/xmlreader/tests/013.phpt
index 1fe4f0041fe08924e6571a70590c341cccc353d9..4db4c9b6f999ff3ab93a45df2ab7992891c4d960 100755 (executable)
--- a/ext/xmlreader/tests/013.phpt
+++ b/ext/xmlreader/tests/013.phpt
@@ -7,7 +7,7 @@ XMLReader: Schema validation
 <?php 
 /* $Id$ */
 
-$xml =<<<EOF
+$xml =b<<<EOF
 <?xml version="1.0" encoding="UTF-8" ?>
 <items>
   <item>123</item>
@@ -17,7 +17,7 @@ EOF;
 
 $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 @@ $reader->close();
 ===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();