bjori Thu Nov 9 20:02:23 2006 UTC
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/xmlwriter/tests 008.phpt
Log:
Enable xmlwriter_start_dtd_entity(), xmlwriter_end_dtd_entity() &
xmlwriter_write_dtd_entity()
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.40
php-src/ext/xmlwriter/php_xmlwriter.c:1.41
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.40 Thu Nov 9 16:18:27 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.c Thu Nov 9 20:02:23 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.40 2006/11/09 16:18:27 nlopess Exp $ */
+/* $Id: php_xmlwriter.c,v 1.41 2006/11/09 20:02:23 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -72,6 +72,9 @@
static PHP_FUNCTION(xmlwriter_start_dtd_attlist);
static PHP_FUNCTION(xmlwriter_end_dtd_attlist);
static PHP_FUNCTION(xmlwriter_write_dtd_attlist);
+static PHP_FUNCTION(xmlwriter_start_dtd_entity);
+static PHP_FUNCTION(xmlwriter_end_dtd_entity);
+static PHP_FUNCTION(xmlwriter_write_dtd_entity);
#endif
static PHP_FUNCTION(xmlwriter_open_uri);
static PHP_FUNCTION(xmlwriter_open_memory);
@@ -215,6 +218,9 @@
PHP_FE(xmlwriter_start_dtd_attlist, NULL)
PHP_FE(xmlwriter_end_dtd_attlist, NULL)
PHP_FE(xmlwriter_write_dtd_attlist, NULL)
+ PHP_FE(xmlwriter_start_dtd_entity, NULL)
+ PHP_FE(xmlwriter_end_dtd_entity, NULL)
+ PHP_FE(xmlwriter_write_dtd_entity, NULL)
#endif
PHP_FE(xmlwriter_output_memory, NULL)
PHP_FE(xmlwriter_flush, NULL)
@@ -273,6 +279,9 @@
PHP_ME_MAPPING(startDtdAttlist, xmlwriter_start_dtd_attlist, NULL, 0)
PHP_ME_MAPPING(endDtdAttlist, xmlwriter_end_dtd_attlist, NULL, 0)
PHP_ME_MAPPING(writeDtdAttlist, xmlwriter_write_dtd_attlist, NULL, 0)
+ PHP_ME_MAPPING(startDtdEntity, xmlwriter_start_dtd_entity, NULL, 0)
+ PHP_ME_MAPPING(endDtdEntity, xmlwriter_end_dtd_entity, NULL, 0)
+ PHP_ME_MAPPING(writeDtdEntity, xmlwriter_write_dtd_entity, NULL, 0)
#endif
PHP_ME_MAPPING(outputMemory, xmlwriter_output_memory, NULL, 0)
PHP_ME_MAPPING(flush, xmlwriter_flush,
NULL, 0)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/008.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/008.phpt
diff -u php-src/ext/xmlwriter/tests/008.phpt:1.2
php-src/ext/xmlwriter/tests/008.phpt:1.3
--- php-src/ext/xmlwriter/tests/008.phpt:1.2 Mon Dec 12 21:21:36 2005
+++ php-src/ext/xmlwriter/tests/008.phpt Thu Nov 9 20:02:23 2006
@@ -6,11 +6,15 @@
?>
--FILE--
<?php
-/* $Id: 008.phpt,v 1.2 2005/12/12 21:21:36 tony2001 Exp $ */
+/* $Id: 008.phpt,v 1.3 2006/11/09 20:02:23 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*>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
