Use zend_parse_parameters_none() in XmlWriter::openMemory()

And fix incorrect uses in tests

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 921cd4151a84b1a0cf7017ffdfa3e9bcc2d67e9a..3f7b0da924283a638a39bda9edf78d88f89be470 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -1700,6 +1700,10 @@ static PHP_FUNCTION(xmlwriter_open_memory)
        zval *self = getThis();
        ze_xmlwriter_object *ze_obj = NULL;
 
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
+       }
+
        if (self) {
                /* We do not use XMLWRITER_FROM_OBJECT, xmlwriter init function here */
                ze_obj = Z_XMLWRITER_P(self);

diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index 13c7da17bf0e9f946912b3db07b0eeca759d5062..d8c822b1a582de0e5e49d8a456959f42ce03157b 100644 (file)
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -5,8 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 --FILE--
 <?php
 
-$doc_dest = '002.xml';
-$xw = xmlwriter_open_memory($doc_dest);
+$xw = xmlwriter_open_memory();
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
 xmlwriter_end_document($xw);

diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index f1463c7dfc4ba131a8172dfbd92f5c1d81164b87..f7dcdfaa6c5278740a332e4836233a0ba73673ef 100644 (file)
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -5,8 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
 --FILE--
 <?php
 
-$doc_dest = '003.xml';
-$xw = xmlwriter_open_memory($doc_dest);
+$xw = xmlwriter_open_memory();
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");