summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Magnusson <bjori@php.net>2006-11-09 20:02:23 +0000
committerHannes Magnusson <bjori@php.net>2006-11-09 20:02:23 +0000
commit3cd6518f392db926d439c0a277b11de7035ab959 (patch)
tree8ced4df2c6513be124b0580c7eba948b3b5714cd
parent26fb0b51b563e9ab249a52326da168727568efb6 (diff)
downloadphp-git-3cd6518f392db926d439c0a277b11de7035ab959.tar.gz
Enable xmlwriter_start_dtd_entity(), xmlwriter_end_dtd_entity() & xmlwriter_write_dtd_entity()
-rw-r--r--ext/xmlwriter/php_xmlwriter.c9
-rw-r--r--ext/xmlwriter/tests/008.phpt6
2 files changed, 15 insertions, 0 deletions
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index ce70c8d03d..48d2fb6ef8 100644
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -72,6 +72,9 @@ static PHP_FUNCTION(xmlwriter_write_dtd_element);
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 @@ static zend_function_entry xmlwriter_functions[] = {
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 @@ static zend_function_entry xmlwriter_class_functions[] = {
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)
diff --git a/ext/xmlwriter/tests/008.phpt b/ext/xmlwriter/tests/008.phpt
index 6226e8ec16..88768b1130 100644
--- a/ext/xmlwriter/tests/008.phpt
+++ b/ext/xmlwriter/tests/008.phpt
@@ -11,6 +11,10 @@ if (!extension_loaded("xmlwriter")) die("skip");
$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 @@ print $output;
?>
--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*>