17 files changed, 62 insertions, 49 deletions
diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index fd2e075e21..8aa3f665d5 100644
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -17,8 +17,6 @@ echo file_get_contents($doc_dest);
 unset($xw);
 unlink($doc_dest);
 ?>
-===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
 <tag1/>
-===DONE===
diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index d8c822b1a5..212f224d4a 100644
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -13,8 +13,6 @@ xmlwriter_end_document($xw);
 // Force to write and empty the buffer
 echo xmlwriter_flush($xw, true);
 ?>
-===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
 <tag1/>
-===DONE===
diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index f7dcdfaa6c..4f2003fe35 100644
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -18,16 +18,14 @@ xmlwriter_write_attribute($xw, "att2", "att2_value");
 xmlwriter_text($xw, "Test text for tag1");
 $res = xmlwriter_start_element($xw, 'tag2');
 if ($res < 1) {
-	echo "StartElement context validation failed\n";
-	exit();
+    echo "StartElement context validation failed\n";
+    exit();
 }
 xmlwriter_end_document($xw);
 
 // Force to write and empty the buffer
 echo xmlwriter_flush($xw, true);
 ?>
-===DONE===
 --EXPECT--
 <?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 73c4642fb3..72766bb0e9 100644
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -24,12 +24,10 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 unset($xw);
 unlink($doc_dest);
 if ($md5_out != $md5_res) {
-	echo "failed: $md5_res != $md5_out\n";
+    echo "failed: $md5_res != $md5_out\n";
 } else {
-	echo "ok.\n";
+    echo "ok.\n";
 }
 ?>
-===DONE===
 --EXPECT--
 ok.
-===DONE===
diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt
index 41c86f857d..1726b5e329 100644
--- a/ext/xmlwriter/tests/005-mb.phpt
+++ b/ext/xmlwriter/tests/005-mb.phpt
@@ -25,8 +25,6 @@ echo file_get_contents($doc_dest);
 unset($xw);
 unlink($doc_dest);
 ?>
-===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
-===DONE===
diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index aca59e4b1f..7412408c7f 100644
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -25,8 +25,6 @@ echo file_get_contents($doc_dest);
 unset($xw);
 unlink($doc_dest);
 ?>
-===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
-===DONE===
diff --git a/ext/xmlwriter/tests/010.phpt b/ext/xmlwriter/tests/010.phpt
index 2ae160fad8..4c9b099a68 100644
--- a/ext/xmlwriter/tests/010.phpt
+++ b/ext/xmlwriter/tests/010.phpt
@@ -14,12 +14,27 @@ $xw = xmlwriter_open_uri($file);
 var_dump(xmlwriter_start_element($xw, "tag"));
 var_dump(xmlwriter_start_attribute($xw, "attr"));
 var_dump(xmlwriter_end_attribute($xw));
-var_dump(xmlwriter_start_attribute($xw, "-1"));
+
+try {
+    xmlwriter_start_attribute($xw, "-1");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
 var_dump(xmlwriter_end_attribute($xw));
-var_dump(xmlwriter_start_attribute($xw, "\""));
+
+try {
+    xmlwriter_start_attribute($xw, "\"");
+} catch (ValueError $e) {
+     echo $e->getMessage(), "\n";
+}
+
 var_dump(xmlwriter_end_attribute($xw));
 var_dump(xmlwriter_end_element($xw));
 
+// Force to write and empty the buffer
+xmlwriter_flush($xw, empty: true);
+
 unset($xw);
 
 var_dump(file_get_contents($file));
@@ -32,13 +47,9 @@ echo "Done\n";
 bool(true)
 bool(true)
 bool(true)
-
-Warning: xmlwriter_start_attribute(): Invalid Attribute Name in %s on line %d
-bool(false)
-bool(false)
-
-Warning: xmlwriter_start_attribute(): Invalid Attribute Name in %s on line %d
+xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, "-1" given
 bool(false)
+xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, """ given
 bool(false)
 bool(true)
 string(14) "<tag attr=""/>"
diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index bd5edf08d8..4ed1abb5aa 100644
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -18,8 +18,6 @@ echo file_get_contents($doc_dest);
 unset($xw);
 unlink($doc_dest);
 ?>
-===DONE===
 --EXPECT--
 <?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 2f606cca7c..84fef5c349 100644
--- a/ext/xmlwriter/tests/OO_002.phpt
+++ b/ext/xmlwriter/tests/OO_002.phpt
@@ -14,8 +14,6 @@ $xw->endDocument();
 // Force to write and empty the buffer
 echo $xw->flush(true);
 ?>
-===DONE===
 --EXPECT--
 <?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 aa64b63e5f..ba1e7e177d 100644
--- a/ext/xmlwriter/tests/OO_003.phpt
+++ b/ext/xmlwriter/tests/OO_003.phpt
@@ -21,16 +21,14 @@ $xw->endAttribute();
 $xw->text("Test text for tag1");
 $res = $xw->startElement('tag2');
 if ($res < 1) {
-	echo "StartElement context validation failed\n";
-	exit();
+    echo "StartElement context validation failed\n";
+    exit();
 }
 $xw->endDocument();
 
 // Force to write and empty the buffer
 echo $xw->flush(true);
 ?>
-===DONE===
 --EXPECT--
 <?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 ecda7a1b03..17dbee9d28 100644
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -25,12 +25,10 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 unset($xw);
 unlink($doc_dest);
 if ($md5_out != $md5_res) {
-	echo "failed: $md5_res != $md5_out\n";
+    echo "failed: $md5_res != $md5_out\n";
 } else {
-	echo "ok.\n";
+    echo "ok.\n";
 }
 ?>
-===DONE===
 --EXPECT--
 ok.
-===DONE===
diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index 7478ac71ed..98e6b253b4 100644
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -25,8 +25,6 @@ echo file_get_contents($doc_dest);
 unset($xw);
 unlink($doc_dest);
 ?>
-===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
-===DONE===
diff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt
index c87af84722..c04ffe3167 100644
--- a/ext/xmlwriter/tests/bug41326.phpt
+++ b/ext/xmlwriter/tests/bug41326.phpt
@@ -15,7 +15,6 @@ $xml->writeElement('foo', null);
 $xml->writeElement('foo2', "");
 $xml->writeElement('foo3');
 $xml->startElement('bar');
-$xml->endElement('bar');
 $xml->endElement();
 $xml->endElement();
 print $xml->flush(true);
@@ -36,8 +35,7 @@ $xw->endElement();
 $xw->endDocument();
 print $xw->flush(true);
 ?>
---EXPECTF--
-Warning: XMLWriter::endElement() expects exactly 0 parameters, 1 given in %s on line %d
+--EXPECT--
 <?xml version="1.0"?>
 <test>
  <foo/>
diff --git a/ext/xmlwriter/tests/bug79029.phpt b/ext/xmlwriter/tests/bug79029.phpt
index b6b0c84b18..2e6f70dc0a 100644
--- a/ext/xmlwriter/tests/bug79029.phpt
+++ b/ext/xmlwriter/tests/bug79029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 #79029 (Use After Free's in XMLReader / XMLWriter)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xmlwriter")) print "skip xmlwriter extension not available";
 if (!extension_loaded("xmlreader")) print "skip xmlreader extension not available";
 ?>
diff --git a/ext/xmlwriter/tests/bug79344.phpt b/ext/xmlwriter/tests/bug79344.phpt
new file mode 100644
index 0000000000..565e5889dc
--- /dev/null
+++ b/ext/xmlwriter/tests/bug79344.phpt
@@ -0,0 +1,23 @@
+--TEST--
+FR #79344 (xmlwriter_write_attribute_ns: $prefix should be nullable)
+--SKIPIF--
+<?php
+if (!extension_loaded('xmlwriter')) die('skip xmlwriter extension not available');
+?>
+--FILE--
+<?php
+$writer = new XMLWriter;
+$writer->openMemory();
+$writer->setIndent(true);
+$writer->startElement('foo');
+
+$writer->writeAttributeNS(null, 'test1', null, 'test1');
+$writer->startAttributeNS(null, 'test2', null);
+$writer->text('test2');
+$writer->endAttribute();
+
+$writer->endElement();
+echo $writer->outputMemory();
+?>
+--EXPECT--
+<foo test1="test1" test2="test2"/>
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
index 64d93a19c2..a3af772d89 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
@@ -4,12 +4,15 @@ xmlwriter_open_uri with empty string as parameter
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
 <?php
-var_dump(xmlwriter_open_uri(''));
+try {
+    xmlwriter_open_uri('');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 ?>
 --CREDITS--
 Koen Kuipers koenk82@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---EXPECTF--
-Warning: xmlwriter_open_uri(): Empty string as source in %s on line %d
-bool(false)
+--EXPECT--
+xmlwriter_open_uri(): Argument #1 ($uri) cannot be empty
diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
index d887008256..26f243dfef 100644
--- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
@@ -5,9 +5,9 @@ xmlwriter_set_indent_string passing xmlwriter resource
 --FILE--
 <?php
 $temp_filename = __DIR__."/xmlwriter_set_indent_string.tmp";
-	$fp = fopen($temp_filename, "w");
-	fwrite ($fp, "Hi");
-	fclose($fp);
+    $fp = fopen($temp_filename, "w");
+    fwrite ($fp, "Hi");
+    fclose($fp);
 $resource = xmlwriter_open_uri($temp_filename);
 var_dump(xmlwriter_set_indent_string($resource, '  '));
 ?>