From: Dmitry Stogov Date: Tue, 16 Nov 2004 12:07:32 +0000 (+0000) Subject: Class mapping was implemented (Bug #29385 Soapserver always uses std class). X-Git-Tag: RELEASE_0_2~672 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9a5dbd9b8bfe68fe4306145023d16d38224ea85;p=php Class mapping was implemented (Bug #29385 Soapserver always uses std class). --- diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index c099acfb4a..185d3e07fa 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -360,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 @@ -955,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 && @@ -975,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--; @@ -984,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 && @@ -1000,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--; @@ -1010,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); @@ -1056,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; diff --git a/ext/soap/php_soap.dsp b/ext/soap/php_soap.dsp index ef0c09f29b..4157c63320 100644 --- a/ext/soap/php_soap.dsp +++ b/ext/soap/php_soap.dsp @@ -101,6 +101,10 @@ SOURCE=.\php_http.c # End Source File # Begin Source File +SOURCE=.\php_packet_soap.c +# End Source File +# Begin Source File + SOURCE=.\php_schema.c # End Source File # Begin Source File @@ -129,6 +133,10 @@ SOURCE=.\php_http.h # End Source File # Begin Source File +SOURCE=.\php_packet_soap.h +# End Source File +# Begin Source File + SOURCE=.\php_schema.h # End Source File # Begin Source File diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index 7b631f9578..59f1a3d8fc 100644 --- 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 80591c643d..b35ac6ff2b 100644 --- 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, ¶ms, &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); } diff --git a/ext/soap/tests/classmap.wsdl b/ext/soap/tests/classmap.wsdl new file mode 100644 index 0000000000..cb081b2e98 --- /dev/null +++ b/ext/soap/tests/classmap.wsdl @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ext/soap/tests/classmap001.phpt b/ext/soap/tests/classmap001.phpt new file mode 100644 index 0000000000..0bda1674b6 --- /dev/null +++ b/ext/soap/tests/classmap001.phpt @@ -0,0 +1,50 @@ +--TEST-- +SOAP Classmap 1: SoapServer support for classmap +--SKIPIF-- + +--FILE-- + + + + + Blaat + aap + + + + +"; + +class test{ + function dotest(book $book){ + $classname=get_class($book); + return "Classname: ".$classname; + } +} + +class book{ + public $a="a"; + public $b="c"; + +} +$options=Array( + 'actor' =>'http://schema.nothing.com', + 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') + ); + +$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server->setClass("test"); +$server->handle(); +echo "ok\n"; +?> +--EXPECT-- + +Classname: book +ok diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt new file mode 100644 index 0000000000..551198e13b --- /dev/null +++ b/ext/soap/tests/classmap002.phpt @@ -0,0 +1,44 @@ +--TEST-- +SOAP Classmap 2: SoapClient support for classmap +--SKIPIF-- + +--FILE-- + + + + Blaat + aap + + +EOF; + } +} + +class book{ + public $a="a"; + public $b="c"; + +} + +$options=Array( + 'actor' =>'http://schema.nothing.com', + 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') + ); + +$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options); +$ret = $client->dotest2("???"); +var_dump($ret); +echo "ok\n"; +?> +--EXPECT-- +object(book)#2 (2) { + ["a"]=> + string(5) "Blaat" + ["b"]=> + string(3) "aap" +} +ok