cvs: php-src /ext/dom document.c php_dom.c text.c

rrichards Thu Oct 7 07:40:24 2004 EDT Modified files: /php-src/ext/dom document.c php_dom.c text.c Log: add DOMDocument xmlEncoding, xmlStandalone, xmlVersion (spec name changes) add DOMText isElementContentWhitespace (spec name change) - old props/method kept for BC. - spec names changed when Level 3 went from Draft to Recommendation nuke some unused code http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.59&r2=1.60&ty=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.59 php-src/ext/dom/document.c:1.60 --- php-src/ext/dom/document.c:1.59 Mon Aug 30 11:07:19 2004 +++ php-src/ext/dom/document.c Thu Oct 7 07:40:19 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.59 2004/08/30 15:07:19 rrichards Exp $ */ +/* $Id: document.c,v 1.60 2004/10/07 11:40:19 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -173,28 +173,6 @@ /* }}} */ - -/* {{{ proto actualEncoding string -readonly=no -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-actualEncoding -Since: DOM Level 3 -*/ -/* READ ONLY FOR NOW USING ENCODING PROPERTY -int dom_document_actual_encoding_read(dom_object *obj, zval **retval TSRMLS_DC) -{ - ALLOC_ZVAL(*retval); - ZVAL_NULL(*retval); - return SUCCESS; -} - -int dom_document_actual_encoding_write(dom_object *obj, zval *newval TSRMLS_DC) -{ - return SUCCESS; -} -*/ - -/* }}} */ - /* {{{ proto encoding string URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-encoding Since: DOM Level 3 http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.63&r2=1.64&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.63 php-src/ext/dom/php_dom.c:1.64 --- php-src/ext/dom/php_dom.c:1.63 Mon Aug 30 11:07:20 2004 +++ php-src/ext/dom/php_dom.c Thu Oct 7 07:40:20 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.63 2004/08/30 15:07:20 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.64 2004/10/07 11:40:20 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -472,12 +472,13 @@ dom_register_prop_handler(&dom_document_prop_handlers, "doctype", dom_document_doctype_read, NULL TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "implementation", dom_document_implementation_read, NULL TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "documentElement", dom_document_document_element_read, NULL TSRMLS_CC); -/* actualEncoding currently set as read only alias to encoding - dom_register_prop_handler(&dom_document_prop_handlers, "actualEncoding", dom_document_actual_encoding_read, dom_document_actual_encoding_write TSRMLS_CC); */ dom_register_prop_handler(&dom_document_prop_handlers, "actualEncoding", dom_document_encoding_read, NULL TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "encoding", dom_document_encoding_read, dom_document_encoding_write TSRMLS_CC); + dom_register_prop_handler(&dom_document_prop_handlers, "xmlEncoding", dom_document_encoding_read, NULL TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "standalone", dom_document_standalone_read, dom_document_standalone_write TSRMLS_CC); + dom_register_prop_handler(&dom_document_prop_handlers, "xmlStandalone", dom_document_standalone_read, dom_document_standalone_write TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "version", dom_document_version_read, dom_document_version_write TSRMLS_CC); + dom_register_prop_handler(&dom_document_prop_handlers, "xmlVersion", dom_document_version_read, dom_document_version_write TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "strictErrorChecking", dom_document_strict_error_checking_read, dom_document_strict_error_checking_write TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "documentURI", dom_document_document_uri_read, dom_document_document_uri_write TSRMLS_CC); dom_register_prop_handler(&dom_document_prop_handlers, "config", dom_document_config_read, NULL TSRMLS_CC); http://cvs.php.net/diff.php/php-src/ext/dom/text.c?r1=1.20&r2=1.21&ty=u Index: php-src/ext/dom/text.c diff -u php-src/ext/dom/text.c:1.20 php-src/ext/dom/text.c:1.21 --- php-src/ext/dom/text.c:1.20 Mon May 31 08:50:28 2004 +++ php-src/ext/dom/text.c Thu Oct 7 07:40:20 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: text.c,v 1.20 2004/05/31 12:50:28 rrichards Exp $ */ +/* $Id: text.c,v 1.21 2004/10/07 11:40:20 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,6 +38,7 @@ zend_function_entry php_dom_text_class_functions[] = { PHP_FALIAS(splitText, dom_text_split_text, NULL) PHP_FALIAS(isWhitespaceInElementContent, dom_text_is_whitespace_in_element_content, NULL) + PHP_FALIAS(isElementContentWhitespace, dom_text_is_whitespace_in_element_content, NULL) PHP_FALIAS(replaceWholeText, dom_text_replace_whole_text, NULL) PHP_ME(domtext, __construct, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL}