fix tests

10 files changed, 26 insertions, 20 deletions

diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index d26096ed1f..a9349d2d16 100644
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -8,17 +8,18 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 
 $doc_dest = '001.xml';
 $xw = xmlwriter_open_uri($doc_dest);
-xmlwriter_start_document($xw, '1.0', 'utf8');
+xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
 xmlwriter_end_document($xw);
 
 // Force to write and empty the buffer
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
+unset($xw);
 unlink('001.xml');
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <tag1/>
 ===DONE===
diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index 1d769a5c22..f2537a47ff 100644
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -8,7 +8,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 
 $doc_dest = '001.xml';
 $xw = xmlwriter_open_memory($doc_dest);
-xmlwriter_start_document($xw, '1.0', 'utf8');
+xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
 xmlwriter_end_document($xw);
 
@@ -17,6 +17,6 @@ echo xmlwriter_flush($xw, true);
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <tag1/>
 ===DONE===
diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index 2ab3a9d776..5415797864 100644
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -8,7 +8,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
 
 $doc_dest = '001.xml';
 $xw = xmlwriter_open_memory($doc_dest);
-xmlwriter_start_document($xw, '1.0', 'utf8');
+xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
 
 
@@ -30,6 +30,6 @@ echo xmlwriter_flush($xw, true);
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <tag1 attr1="attr1_value" att2="att2_value">Test text for tag1<tag2/></tag1>
 ===DONE===
diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt
index 13e471da9d..2d3e858725 100644
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -8,7 +8,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 
 $doc_dest = '001.xml';
 $xw = xmlwriter_open_uri($doc_dest);
-xmlwriter_start_document($xw, '1.0', 'utf8');
+xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
 
 xmlwriter_start_pi($xw, "PHP");
@@ -19,9 +19,10 @@ xmlwriter_end_document($xw);
 // Force to write and empty the buffer
 $output_bytes = xmlwriter_flush($xw, true);
 $md5_out = md5_file($doc_dest);
-$md5_res = md5('<?xml version="1.0" encoding="utf8"?>
+$md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 <tag1><?PHP echo $a;?></tag1>
 ');
+unset($xw);
 unlink('001.xml');
 if ($md5_out != $md5_res) {
 	echo "failed: $md5_res != $md5_out\n";
diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index 6874c5d2c3..ab933c6f56 100644
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -11,7 +11,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 
 $doc_dest = '001.xml';
 $xw = xmlwriter_open_uri($doc_dest);
-xmlwriter_start_document($xw, '1.0', 'utf8');
+xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
 
 xmlwriter_start_comment($xw);
@@ -23,10 +23,11 @@ xmlwriter_end_document($xw);
 // Force to write and empty the buffer
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
+unset($xw);
 unlink('001.xml');
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
 ===DONE===
diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index 333a16a41c..be448b9c65 100644
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -9,17 +9,18 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 $doc_dest = '001.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
-$xw->startDocument('1.0', 'utf8', 'standalonearg');
+$xw->startDocument('1.0', 'UTF-8', 'standalonearg');
 $xw->startElement("tag1");
 $xw->endDocument();
 
 // Force to write and empty the buffer
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
+unset($xw);
 unlink('001.xml');
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8" standalone="standalonearg"?>
+<?xml version="1.0" encoding="UTF-8" standalone="standalonearg"?>
 <tag1/>
 ===DONE===
diff --git a/ext/xmlwriter/tests/OO_002.phpt b/ext/xmlwriter/tests/OO_002.phpt
index 515ebbb359..ec605f50a4 100644
--- a/ext/xmlwriter/tests/OO_002.phpt
+++ b/ext/xmlwriter/tests/OO_002.phpt
@@ -8,7 +8,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 
 $xw = new XMLWriter();
 $xw->openMemory();
-$xw->startDocument('1.0', 'utf8', 'standalone');
+$xw->startDocument('1.0', 'UTF-8', 'standalone');
 $xw->startElement("tag1");
 $xw->endDocument();
 
@@ -17,6 +17,6 @@ echo $xw->flush(true);
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8" standalone="standalone"?>
+<?xml version="1.0" encoding="UTF-8" standalone="standalone"?>
 <tag1/>
 ===DONE===
diff --git a/ext/xmlwriter/tests/OO_003.phpt b/ext/xmlwriter/tests/OO_003.phpt
index c0e5585fc6..7fb47910f0 100644
--- a/ext/xmlwriter/tests/OO_003.phpt
+++ b/ext/xmlwriter/tests/OO_003.phpt
@@ -8,7 +8,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, text, attribute
 
 $xw = new XMLWriter();
 $xw->openMemory();
-$xw->startDocument('1.0', 'utf8');
+$xw->startDocument('1.0', 'UTF-8');
 $xw->startElement("tag1");
 
 $res = $xw->startAttribute('attr1');
@@ -32,6 +32,6 @@ echo $xw->flush(true);
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <tag1 attr1="attr1_value" attr2="attr2_value">Test text for tag1<tag2/></tag1>
 ===DONE===
diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt
index 0effec37b8..08b423ccef 100644
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -9,7 +9,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 $doc_dest = '001.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
-$xw->startDocument('1.0', 'utf8');
+$xw->startDocument('1.0', 'UTF-8');
 $xw->startElement("tag1");
 
 $xw->startPi("PHP");
@@ -20,9 +20,10 @@ $xw->endDocument();
 // Force to write and empty the buffer
 $xw->flush(true);
 $md5_out = md5_file($doc_dest);
-$md5_res = md5('<?xml version="1.0" encoding="utf8"?>
+$md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 <tag1><?PHP echo $a;?></tag1>
 ');
+unset($xw);
 unlink('001.xml');
 if ($md5_out != $md5_res) {
 	echo "failed: $md5_res != $md5_out\n";
diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index 8037fc62f1..2c6d2f4333 100644
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -12,7 +12,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 $doc_dest = '001.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
-$xw->startDocument('1.0', 'utf8');
+$xw->startDocument('1.0', 'UTF-8');
 $xw->startElement("tag1");
 $xw->startComment();
 $xw->text('comment');
@@ -23,10 +23,11 @@ $xw->endDocument();
 // Force to write and empty the buffer
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
+unset($xw);
 unlink('001.xml');
 ?>
 ===DONE===
 --EXPECT--
-<?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
 ===DONE===