Class mapping was implemented (Bug #29385 Soapserver always uses std class).

diff --git a/NEWS b/NEWS
index e86f78b6483d3e10051d57dc03f66b2b0443754c..08f9fee9203e02315a4131f7b4d60f300fb1c999 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -56,6 +56,7 @@ PHP                                                                        NEWS
 - Fixed bug #29557 (strtotime error). (Derick)
 - Fixed bug #29418 (double free when openssl_csr_new fails).
   (Kamesh Jayachandran).
+- Fixed bug #29385 (Soapserver always uses std class). (David, Dmitry)
 - Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
 - Fixed bug #28599 (strtotime fails with zero base time). (Derick)
 - Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 4138ed7d57b62cabd93b63e5cca73abb912e70e1..185d3e07fad421d2bc3e69fb3a7411a7c84513ef 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -330,6 +330,7 @@ static zval *master_to_zval_int(encodePtr encode, xmlNodePtr data)
 
 zval *master_to_zval(encodePtr encode, xmlNodePtr data)
 {
+       TSRMLS_FETCH();
        data = check_and_resolve_href(data);
 
        if (encode == NULL) {
@@ -359,7 +360,7 @@ zval *master_to_zval(encodePtr encode, xmlNodePtr data)
                        }
                }
        }
-       master_to_zval_int(encode, data);
+       return master_to_zval_int(encode, data);
 }
 
 #ifdef HAVE_PHP_DOMXML
@@ -954,8 +955,19 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
        xmlNodePtr trav;
        sdlPtr sdl;
        sdlTypePtr sdlType = type->sdl_type;
+       zend_class_entry *ce = ZEND_STANDARD_CLASS_DEF_PTR;
        TSRMLS_FETCH();
 
+       if (SOAP_GLOBAL(class_map) && type->type_str) {
+               zval             **classname;
+               zend_class_entry  *tmp;
+
+               if (zend_hash_find(SOAP_GLOBAL(class_map), type->type_str, strlen(type->type_str)+1, (void**)&classname) == SUCCESS &&
+                   Z_TYPE_PP(classname) == IS_STRING &&
+                   (tmp = zend_fetch_class(Z_STRVAL_PP(classname), Z_STRLEN_PP(classname), ZEND_FETCH_CLASS_AUTO TSRMLS_CC)) != NULL) {
+                       ce = tmp; 
+               }
+       }
        sdl = SOAP_GLOBAL(sdl);
        if (sdlType) {
                if (sdlType->kind == XSD_TYPEKIND_RESTRICTION &&
@@ -974,7 +986,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 
                                MAKE_STD_ZVAL(ret);
 
-                               object_init(ret);
+                               object_init_ex(ret, ce);
                                base = master_to_zval_int(enc, data);
 #ifdef ZEND_ENGINE_2
                                base->refcount--;
@@ -983,7 +995,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
                        } else {
                                MAKE_STD_ZVAL(ret);
                                FIND_XML_NULL(data, ret);
-                               object_init(ret);
+                               object_init_ex(ret, ce);
                        }
                } else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
                           sdlType->encode &&
@@ -999,7 +1011,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 
                                MAKE_STD_ZVAL(ret);
 
-                               object_init(ret);
+                               object_init_ex(ret, ce);
                                base = master_to_zval_int(sdlType->encode, data);
 #ifdef ZEND_ENGINE_2
                                base->refcount--;
@@ -1009,7 +1021,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
                } else {
                        MAKE_STD_ZVAL(ret);
                        FIND_XML_NULL(data, ret);
-                       object_init(ret);
+                       object_init_ex(ret, ce);
                }
                if (sdlType->model) {
                        model_to_zval_object(ret, sdlType->model, data, sdl TSRMLS_CC);
@@ -1055,7 +1067,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 
                MAKE_STD_ZVAL(ret);
                FIND_XML_NULL(data, ret);
-               object_init(ret);
+               object_init_ex(ret, ce);
 
                trav = data->children;
 
@@ -1072,7 +1084,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 #ifdef ZEND_ENGINE_2
                                        tmpVal->refcount--;
 #endif
-                                       add_property_zval_ex(ret, (char*)trav->name, key_len, tmpVal);
+                                       add_property_zval_ex(ret, (char*)trav->name, key_len, tmpVal TSRMLS_CC);
                                } else {
                                  /* Property already exist - make array */
                                  if (Z_TYPE_PP(prop) != IS_ARRAY) {

diff --git a/ext/soap/php_soap.dsp b/ext/soap/php_soap.dsp
index ef0c09f29b9244e333ef6adf97286f0d88afc3e7..4157c6332044a7da0d7c4fff8114d53ac86ce5d9 100644 (file)
--- a/ext/soap/php_soap.dsp
+++ b/ext/soap/php_soap.dsp
@@ -101,6 +101,10 @@ SOURCE=.\php_http.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\php_packet_soap.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\php_schema.c\r
 # End Source File\r
 # Begin Source File\r
@@ -129,6 +133,10 @@ SOURCE=.\php_http.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\php_packet_soap.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\php_schema.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index 7b631f9578c708b73f9d78ad3b24383ca57b0f6d..59f1a3d8fcd2f7ced89565b99485fff23bd6b657 100644 (file)
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -116,6 +116,7 @@ struct _soapService {
        char      *actor;
        char      *uri;
        xmlCharEncodingHandlerPtr encoding;
+       HashTable *class_map;
 };
 
 #define SOAP_CLASS 1
@@ -160,6 +161,7 @@ ZEND_BEGIN_MODULE_GLOBALS(soap)
        char*      cache_dir;
        long       cache_ttl;
        xmlCharEncodingHandlerPtr encoding;
+       HashTable *class_map;
 ZEND_END_MODULE_GLOBALS(soap)
 
 #ifdef PHP_WIN32

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 80591c643d78f67600846b7cf0391ab64d896b53..b35ac6ff2be41e244e9513dc0bf651eef3eb5bd7 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -441,6 +441,7 @@ PHP_RINIT_FUNCTION(soap)
        SOAP_GLOBAL(sdl) = NULL;
        SOAP_GLOBAL(soap_version) = SOAP_1_1;
        SOAP_GLOBAL(encoding) = NULL;
+       SOAP_GLOBAL(class_map) = NULL;
        return SUCCESS;
 }
 
@@ -866,6 +867,15 @@ PHP_METHOD(SoapServer, SoapServer)
            }
                }
 
+               if (zend_hash_find(ht, "classmap", sizeof("classmap"), (void**)&tmp) == SUCCESS &&
+                       Z_TYPE_PP(tmp) == IS_ARRAY) {
+                       zval *ztmp;
+
+                       ALLOC_HASHTABLE(service->class_map);
+                       zend_hash_init(service->class_map, 0, NULL, ZVAL_PTR_DTOR, 0);
+                       zend_hash_copy(service->class_map, (*tmp)->value.ht, (copy_ctor_func_t) zval_add_ref, (void *) &ztmp, sizeof(zval *));
+               }
+
        } else if (wsdl == NULL) {
                php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. 'uri' option is required in nonWSDL mode.");
        }
@@ -1267,6 +1277,7 @@ PHP_METHOD(SoapServer, handle)
        char *arg = NULL;
        int arg_len;
        xmlCharEncodingHandlerPtr old_encoding;
+       HashTable *old_class_map;
 
        SOAP_SERVER_BEGIN_CODE();
 
@@ -1410,6 +1421,8 @@ PHP_METHOD(SoapServer, handle)
        SOAP_GLOBAL(sdl) = service->sdl;
        old_encoding = SOAP_GLOBAL(encoding);
        SOAP_GLOBAL(encoding) = service->encoding;
+       old_class_map = SOAP_GLOBAL(class_map);
+       SOAP_GLOBAL(class_map) = service->class_map;
        old_soap_version = SOAP_GLOBAL(soap_version);
        function = deserialize_function_call(service->sdl, doc_request, service->actor, &function_name, &num_params, &params, &soap_version, &soap_headers TSRMLS_CC);
        xmlFreeDoc(doc_request);
@@ -1674,6 +1687,7 @@ fail:
        SOAP_GLOBAL(soap_version) = old_soap_version;
        SOAP_GLOBAL(encoding) = old_encoding;
        SOAP_GLOBAL(sdl) = old_sdl;
+       SOAP_GLOBAL(class_map) = old_class_map;
 
        /* Free soap headers */
        zval_dtor(&retval);
@@ -1986,6 +2000,18 @@ PHP_METHOD(SoapClient, SoapClient)
                                add_property_stringl(this_ptr, "_encoding", Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);                     
                        }
                }
+               if (zend_hash_find(ht, "classmap", sizeof("classmap"), (void**)&tmp) == SUCCESS &&
+                       Z_TYPE_PP(tmp) == IS_ARRAY) {
+                       zval *class_map;
+
+                       MAKE_STD_ZVAL(class_map);
+                       *class_map = **tmp;
+                       zval_copy_ctor(class_map);
+#ifdef ZEND_ENGINE_2
+                       class_map->refcount--;  /*FIXME*/
+#endif
+                       add_property_zval(this_ptr, "_classmap", class_map);
+               }
        } else if (wsdl == NULL) {
                php_error_docref(NULL TSRMLS_CC, E_ERROR, "'location' and 'uri' options are requred in nonWSDL mode.");
                return;
@@ -2097,6 +2123,7 @@ static void do_soap_call(zval* this_ptr,
        int soap_version;
        zval response;
        xmlCharEncodingHandlerPtr old_encoding;
+       HashTable *old_class_map;
 
        SOAP_CLIENT_BEGIN_CODE();
 
@@ -2128,6 +2155,13 @@ static void do_soap_call(zval* this_ptr,
        } else {
                SOAP_GLOBAL(encoding) = NULL;
        }
+       old_class_map = SOAP_GLOBAL(class_map);
+       if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_classmap", sizeof("_classmap"), (void **) &tmp) == SUCCESS &&
+           Z_TYPE_PP(tmp) == IS_ARRAY) {
+               SOAP_GLOBAL(class_map) = (*tmp)->value.ht;
+       } else {
+               SOAP_GLOBAL(class_map) = NULL;
+       }
 
        if (sdl != NULL) {
                fn = get_function(sdl, function);
@@ -2228,6 +2262,7 @@ static void do_soap_call(zval* this_ptr,
   if (SOAP_GLOBAL(encoding) != NULL) {
                xmlCharEncCloseFunc(SOAP_GLOBAL(encoding));
   }
+  SOAP_GLOBAL(class_map) = old_class_map;
        SOAP_GLOBAL(encoding) = old_encoding;
        SOAP_GLOBAL(sdl) = old_sdl;
        SOAP_CLIENT_END_CODE();
@@ -3980,5 +4015,9 @@ static void delete_service(void *data)
        if (service->encoding) {
                xmlCharEncCloseFunc(service->encoding);
        }
+       if (service->class_map) {
+               zend_hash_destroy(service->class_map);
+               FREE_HASHTABLE(service->class_map);
+       }
        efree(service);
 }