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

diff --git a/ext/dom/document.c b/ext/dom/document.c
index a22fdbc6d9f22a7850ff1034608f2f4b7ed00c6a..fa64df1683092fd5c57195945fbf2586e4ac0b08 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -173,28 +173,6 @@ int dom_document_document_element_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 /* }}} */
 
-
-/* {{{ 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

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index f7761becb3294bba393732a69678f7a590a53ce6..40be0c17e28aa37c03318003ac20c958a288936c 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -472,12 +472,13 @@ PHP_MINIT_FUNCTION(dom)
        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);

diff --git a/ext/dom/text.c b/ext/dom/text.c
index ab891770650122be82bb3004d7143b7615cf0e76..4aeef619a88196ef66220108154341fbda34ede9 100644 (file)
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -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}