cvs: php-src(PHP_5_2) /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests 008.phpt bug39504.phpt

bjori Sat Jan 6 15:53:33 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/xmlwriter/tests bug39504.phpt Modified files: /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xmlwriter/tests 008.phpt Log: MFH: bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not entity) Add & improve test http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.10&r2=1.20.2.12.2.11&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.10 php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.11 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.10 Mon Jan 1 19:35:47 2007 +++ php-src/ext/xmlwriter/php_xmlwriter.c Sat Jan 6 15:53:32 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.20.2.12.2.10 2007/01/01 19:35:47 iliaa Exp $ */ +/* $Id: php_xmlwriter.c,v 1.20.2.12.2.11 2007/01/06 15:53:32 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1336,7 +1336,7 @@ } /* }}} */ -/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content) +/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content [, int pe [, string pubid [, string sysid [, string ndataid]]]]) Write full DTD Entity tag - returns FALSE on error */ static PHP_FUNCTION(xmlwriter_write_dtd_entity) { @@ -1345,21 +1345,26 @@ xmlTextWriterPtr ptr; char *name, *content; int name_len, content_len, retval; + /* Optional parameters */ + char *pubid = NULL, *sysid = NULL, *ndataid = NULL; + int pe = 0, pubid_len, sysid_len, ndataid_len; #ifdef ZEND_ENGINE_2 zval *this = getThis(); if (this) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", - &name, &name_len, &content, &content_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|lsss", + &name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len, + &sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) { return; } XMLWRITER_FROM_OBJECT(intern, this); } else #endif { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &pind, - &name, &name_len, &content, &content_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|lsss", &pind, + &name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len, + &sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) { return; } ZEND_FETCH_RESOURCE(intern,xmlwriter_object *, &pind, -1, "XMLWriter", le_xmlwriter); @@ -1370,7 +1375,7 @@ ptr = intern->ptr; if (ptr) { - retval = xmlTextWriterWriteDTDAttlist(ptr, (xmlChar *)name, (xmlChar *)content); + retval = xmlTextWriterWriteDTDEntity(ptr, pe, (xmlChar *)name, (xmlChar *)pubid, (xmlChar *)sysid, (xmlChar *)ndataid, (xmlChar *)content); if (retval != -1) { RETURN_TRUE; } http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/008.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u Index: php-src/ext/xmlwriter/tests/008.phpt diff -u php-src/ext/xmlwriter/tests/008.phpt:1.1.2.3 php-src/ext/xmlwriter/tests/008.phpt:1.1.2.3.2.1 --- php-src/ext/xmlwriter/tests/008.phpt:1.1.2.3 Mon Dec 12 21:21:11 2005 +++ php-src/ext/xmlwriter/tests/008.phpt Sat Jan 6 15:53:33 2007 @@ -6,11 +6,15 @@ ?> --FILE-- <?php -/* $Id: 008.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */ +/* $Id: 008.phpt,v 1.1.2.3.2.1 2007/01/06 15:53:33 bjori Exp $ */ $xw = xmlwriter_open_memory(); xmlwriter_set_indent($xw, TRUE); xmlwriter_start_document($xw, NULL, "UTF-8"); +xmlwriter_start_dtd_entity($xw, "ent", false); +xmlwriter_text($xw, "val"); +xmlwriter_end_dtd_entity($xw); +xmlwriter_write_dtd_entity($xw, "ent2", "val2"); xmlwriter_write_dtd_element($xw, 'sxe', '(elem1+, elem11, elem22*)'); xmlwriter_write_dtd_attlist($xw, 'sxe', 'id CDATA #implied'); xmlwriter_start_dtd_element($xw, 'elem1'); @@ -27,6 +31,8 @@ ?> --EXPECT-- <?xml version="1.0" encoding="UTF-8"?> +<!ENTITY ent "val"> +<!ENTITY ent2 "val2"> <!ELEMENT sxe (elem1+, elem11, elem22*)> <!ATTLIST sxe id CDATA #implied> <!ELEMENT elem1 elem2*> http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/bug39504.phpt?view=markup&rev=1.1 Index: php-src/ext/xmlwriter/tests/bug39504.phpt +++ php-src/ext/xmlwriter/tests/bug39504.phpt --TEST-- bug# 39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity) --FILE-- <?php $xw = xmlwriter_open_memory(); xmlwriter_start_document($xw, NULL, "UTF-8"); xmlwriter_start_dtd($xw, "root"); xmlwriter_write_dtd_entity($xw, "ent2", "val2"); xmlwriter_end_dtd($xw); xmlwriter_start_element($xw, "root"); xmlwriter_end_document($xw); print xmlwriter_flush($xw, true); ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE root [<!ENTITY ent2 "val2">]><root/>