cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c soap.c /ext/soap/tests classmap003.phpt /ext/soap/tests/bugs bug35142.phpt bug36226.phpt
bug36575.phpt bug36575.wsdl

dmitry Fri Mar 3 09:20:33 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/soap/tests/bugs bug36575.phpt bug36575.wsdl Modified files: /php-src NEWS /php-src/ext/soap php_encoding.c soap.c /php-src/ext/soap/tests classmap003.phpt /php-src/ext/soap/tests/bugs bug35142.phpt bug36226.phpt Log: Fixed bug #36575 (SOAP: Incorrect complex type instantiation with hierarchies)

http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.436&r2=1.2027.2.437&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.436 php-src/NEWS:1.2027.2.437 --- php-src/NEWS:1.2027.2.436 Fri Mar 3 07:52:55 2006 +++ php-src/NEWS Fri Mar 3 09:20:33 2006 @@ -37,6 +37,8 @@ (Mike) - Fixed crash with DOMImplementation::createDocumentType("name:"). (Mike) - Fixed bug #36599 (DATE_W3C format constant incorrect). (Derick) +- Fixed bug #36575 (SOAP: Incorrect complex type instantiation with + hierarchies). (Dmitry) - Fixed bug #36510 (strtotime() fails to parse date strings with tabs). (Ilia, Derick) - Fixed bug #36459 (Incorrect adding PHPSESSID to links, which contains \r\n). http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.16&r2=1.103.2.17&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.16 php-src/ext/soap/php_encoding.c:1.103.2.17 --- php-src/ext/soap/php_encoding.c:1.103.2.16 Mon Feb 6 13:17:06 2006 +++ php-src/ext/soap/php_encoding.c Fri Mar 3 09:20:33 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.16 2006/02/06 13:17:06 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.17 2006/03/03 09:20:33 dmitry Exp $ */ #include <time.h> @@ -246,6 +246,23 @@ *pos = '\0'; } +static encodePtr find_encoder_by_type_name(sdlPtr sdl, const char *type) +{ + if (sdl && sdl->encoders) { + HashPosition pos; + encodePtr *enc; + + for (zend_hash_internal_pointer_reset_ex(sdl->encoders, &pos); + zend_hash_get_current_data_ex(sdl->encoders, (void **) &enc, &pos) == SUCCESS; + zend_hash_move_forward_ex(sdl->encoders, &pos)) { + if (strcmp((*enc)->details.type_str, type) == 0) { + return *enc; + } + } + } + return NULL; +} + xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent) { xmlNodePtr node = NULL; @@ -328,7 +345,12 @@ encodePtr enc = get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name); if (enc) { encode = enc; - } + } else if (SOAP_GLOBAL(sdl)) { + enc = find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name); + if (enc) { + encode = enc; + } + } break; } } @@ -717,7 +739,7 @@ zval_copy_ctor(&tmp); convert_to_string(&tmp); - str = php_escape_html_entities(Z_STRVAL(tmp), Z_STRLEN(tmp), &new_len, 0, 0, NULL TSRMLS_CC); + str = php_escape_html_entities(Z_STRVAL(tmp), Z_STRLEN(tmp), &new_len, 0, 0, NULL TSRMLS_CC); zval_dtor(&tmp); } @@ -758,7 +780,7 @@ xmlAddChild(parent, ret); FIND_ZVAL_NULL(data, ret, style); - if (Z_TYPE_P(data) == IS_STRING) { + if (Z_TYPE_P(data) == IS_STRING) { str = php_base64_encode((unsigned char*)Z_STRVAL_P(data), Z_STRLEN_P(data), &str_len); xmlNodeSetContentLen(ret, str, str_len); efree(str); @@ -791,14 +813,14 @@ xmlAddChild(parent, ret); FIND_ZVAL_NULL(data, ret, style); - if (Z_TYPE_P(data) != IS_STRING) { + if (Z_TYPE_P(data) != IS_STRING) { tmp = *data; zval_copy_ctor(&tmp); convert_to_string(&tmp); data = &tmp; } str = (unsigned char *) safe_emalloc(Z_STRLEN_P(data) * 2, sizeof(char), 1); - + for (i = j = 0; i < Z_STRLEN_P(data); i++) { str[j++] = hexconvtab[((unsigned char)Z_STRVAL_P(data)[i]) >> 4]; str[j++] = hexconvtab[((unsigned char)Z_STRVAL_P(data)[i]) & 15]; @@ -1157,7 +1179,7 @@ add_next_index_zval(array, val); } while ((node = get_node(node->next, model->u.element->name)) != NULL); val = array; - } else if ((SOAP_GLOBAL(features) & SOAP_SINGLE_ELEMENT_ARRAYS) && + } else if ((SOAP_GLOBAL(features) & SOAP_SINGLE_ELEMENT_ARRAYS) && (model->max_occurs == -1 || model->max_occurs > 1)) { zval *array; @@ -1200,7 +1222,7 @@ } /* Struct encode/decode */ -static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data) +static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_entry *pce) { zval *ret; xmlNodePtr trav; @@ -1210,7 +1232,9 @@ zend_bool redo_any = 0; TSRMLS_FETCH(); - if (SOAP_GLOBAL(class_map) && type->type_str) { + if (pce) { + ce = pce; + } else if (SOAP_GLOBAL(class_map) && type->type_str) { zval **classname; zend_class_entry *tmp; @@ -1253,7 +1277,20 @@ sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) { - ret = master_to_zval_int(sdlType->encode, data); + + if (ce != ZEND_STANDARD_CLASS_DEF_PTR && + sdlType->encode->to_zval == sdl_guess_convert_zval && + sdlType->encode->details.sdl_type != NULL && + (sdlType->encode->details.sdl_type->kind == XSD_TYPEKIND_COMPLEX || + sdlType->encode->details.sdl_type->kind == XSD_TYPEKIND_RESTRICTION || + sdlType->encode->details.sdl_type->kind == XSD_TYPEKIND_EXTENSION) && + (sdlType->encode->details.sdl_type->encode == NULL || + (sdlType->encode->details.sdl_type->encode->details.type != IS_ARRAY && + sdlType->encode->details.sdl_type->encode->details.type != SOAP_ENC_ARRAY))) { + ret = to_zval_object_ex(&sdlType->encode->details, data, ce); + } else { + ret = master_to_zval_int(sdlType->encode, data); + } FIND_XML_NULL(data, ret); if (get_zval_property(ret, "any" TSRMLS_CC) != NULL) { unset_zval_property(ret, "any" TSRMLS_CC); @@ -1280,7 +1317,7 @@ if (sdlType->model) { model_to_zval_object(ret, sdlType->model, data, sdl TSRMLS_CC); if (redo_any && get_zval_property(ret, "any" TSRMLS_CC) == NULL) { - model_to_zval_any(ret, data->children TSRMLS_CC); + model_to_zval_any(ret, data->children TSRMLS_CC); } } if (sdlType->attributes) { @@ -1358,6 +1395,12 @@ return ret; } +static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data) +{ + return to_zval_object_ex(type, data, NULL); +} + + static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *object, int style, int strict TSRMLS_DC) { switch (model->kind) { @@ -1598,7 +1641,7 @@ zval *tmp = get_zval_property(data, "_" TSRMLS_CC); if (tmp) { xmlParam = master_to_xml(enc, tmp, style, parent); - } else if (prop == NULL) { + } else if (prop == NULL) { xmlParam = master_to_xml(enc, data, style, parent); } else { xmlParam = xmlNewNode(NULL,"BOGUS"); @@ -1693,7 +1736,7 @@ an implicit schema. Otherwise, use form. */ if ((*attr)->namens && - (!strncmp((*attr)->namens, XML_NAMESPACE, sizeof(XML_NAMESPACE)) || + (!strncmp((*attr)->namens, XML_NAMESPACE, sizeof(XML_NAMESPACE)) || (*attr)->form == XSD_FORM_QUALIFIED)) { xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)->namens); @@ -2790,7 +2833,7 @@ } static xmlNodePtr to_xml_any(encodeTypePtr type, zval *data, int style, xmlNodePtr parent) -{ +{ xmlNodePtr ret; if (Z_TYPE_P(data) == IS_STRING) { @@ -3157,7 +3200,7 @@ if (different || count == 0) { smart_str_appendl(type, "xsd:anyType", 11); - return get_conversion(XSD_ANYTYPE); + return get_conversion(XSD_ANYTYPE); } else { encodePtr enc; http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.16&r2=1.156.2.17&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.16 php-src/ext/soap/soap.c:1.156.2.17 --- php-src/ext/soap/soap.c:1.156.2.16 Thu Mar 2 14:07:48 2006 +++ php-src/ext/soap/soap.c Fri Mar 3 09:20:33 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.16 2006/03/02 14:07:48 dmitry Exp $ */ +/* $Id: soap.c,v 1.156.2.17 2006/03/03 09:20:33 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2201,6 +2201,7 @@ MAKE_STD_ZVAL(class_map); *class_map = **tmp; + INIT_PZVAL(class_map); zval_copy_ctor(class_map); #ifdef ZEND_ENGINE_2 class_map->refcount--; http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/classmap003.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/soap/tests/classmap003.phpt diff -u php-src/ext/soap/tests/classmap003.phpt:1.1.2.1 php-src/ext/soap/tests/classmap003.phpt:1.1.2.2 --- php-src/ext/soap/tests/classmap003.phpt:1.1.2.1 Wed Feb 1 17:18:24 2006 +++ php-src/ext/soap/tests/classmap003.phpt Fri Mar 3 09:20:33 2006 @@ -49,6 +49,6 @@ --EXPECT-- B Object ( - [x] => 5 [y] => 6 + [x] => 5 ) http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug35142.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/soap/tests/bugs/bug35142.phpt diff -u php-src/ext/soap/tests/bugs/bug35142.phpt:1.1.2.1 php-src/ext/soap/tests/bugs/bug35142.phpt:1.1.2.2 --- php-src/ext/soap/tests/bugs/bug35142.phpt:1.1.2.1 Tue Nov 8 08:30:18 2005 +++ php-src/ext/soap/tests/bugs/bug35142.phpt Fri Mar 3 09:20:33 2006 @@ -49,7 +49,7 @@ public $audienceMemberId; public $timestamp; public $smokeStatus; - public $callInititator; + public $callInitiator; function __construct($audienceMemberId, $timestamp, $smokeStatus) { $this->audienceMemberId = $audienceMemberId; @@ -98,6 +98,15 @@ int(101) ["messageId"]=> int(12345) + ["source"]=> + string(3) "IVR" + ["logOnEvent"]=> + object(LogOnEvent)#%d (2) { + ["audienceMemberId"]=> + int(34567) + ["timestamp"]=> + string(25) "2005-11-08T11:22:07+03:00" + } ["logOffEvent"]=> array(2) { [0]=> @@ -123,13 +132,4 @@ string(3) "IVR" } } - ["logOnEvent"]=> - object(LogOnEvent)#%d (2) { - ["audienceMemberId"]=> - int(34567) - ["timestamp"]=> - string(25) "2005-11-08T11:22:07+03:00" - } - ["source"]=> - string(3) "IVR" } http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36226.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/soap/tests/bugs/bug36226.phpt diff -u php-src/ext/soap/tests/bugs/bug36226.phpt:1.1.2.1 php-src/ext/soap/tests/bugs/bug36226.phpt:1.1.2.2 --- php-src/ext/soap/tests/bugs/bug36226.phpt:1.1.2.1 Thu Feb 2 11:41:45 2006 +++ php-src/ext/soap/tests/bugs/bug36226.phpt Fri Mar 3 09:20:33 2006 @@ -50,7 +50,7 @@ public $audienceMemberId; public $timestamp; public $smokeStatus; - public $callInititator; + public $callInitiator; function __construct($audienceMemberId, $timestamp, $smokeStatus) { $this->audienceMemberId = $audienceMemberId; @@ -99,6 +99,18 @@ int(101) ["messageId"]=> int(12345) + ["source"]=> + string(3) "IVR" + ["logOnEvent"]=> + array(1) { + [0]=> + object(LogOnEvent)#10 (2) { + ["audienceMemberId"]=> + int(34567) + ["timestamp"]=> + string(25) "2005-11-08T11:22:07+03:00" + } + } ["logOffEvent"]=> array(2) { [0]=> @@ -124,16 +136,4 @@ string(3) "IVR" } } - ["logOnEvent"]=> - array(1) { - [0]=> - object(LogOnEvent)#10 (2) { - ["audienceMemberId"]=> - int(34567) - ["timestamp"]=> - string(25) "2005-11-08T11:22:07+03:00" - } - } - ["source"]=> - string(3) "IVR" } http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36575.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug36575.phpt +++ php-src/ext/soap/tests/bugs/bug36575.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36575.wsdl?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug36575.wsdl +++ php-src/ext/soap/tests/bugs/bug36575.wsdl