@@ -3076,6 +3076,17 @@ static zval* to_zval_list(zval *ret, encodeTypePtr enc, xmlNodePtr data) {
30763076 return to_zval_stringc (ret , enc , data );
30773077}
30783078
3079+ static void to_xml_list_item_error (encodeTypePtr enc , encodePtr list_enc )
3080+ {
3081+ if (enc -> sdl_type && enc -> sdl_type -> kind == XSD_TYPEKIND_UNION ) {
3082+ soap_error1 (E_ERROR , "Encoding: Value does not match any member type of union type '%s'" ,
3083+ soap_type_name (enc ));
3084+ } else {
3085+ soap_error2 (E_ERROR , "Encoding: Failed to encode list item of type '%s' for list type '%s'" ,
3086+ soap_type_name (list_enc ? & list_enc -> details : NULL ), soap_type_name (enc ));
3087+ }
3088+ }
3089+
30793090static xmlNodePtr to_xml_list (encodeTypePtr enc , zval * data , int style , xmlNodePtr parent ) {
30803091 xmlNodePtr ret ;
30813092 encodePtr list_enc = NULL ;
@@ -3111,9 +3122,7 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
31113122 }
31123123 smart_str_appends (& list , (char * )dummy -> children -> content );
31133124 } else {
3114- soap_error2 (E_ERROR ,
3115- "Encoding: Failed to encode list item of type '%s' for list type '%s'" ,
3116- soap_type_name (& list_enc -> details ), soap_type_name (enc ));
3125+ to_xml_list_item_error (enc , list_enc );
31173126 }
31183127 xmlUnlinkNode (dummy );
31193128 xmlFreeNode (dummy );
@@ -3155,9 +3164,7 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
31553164 }
31563165 smart_str_appends (& list , (char * )dummy -> children -> content );
31573166 } else {
3158- soap_error2 (E_ERROR ,
3159- "Encoding: Failed to encode list item of type '%s' for list type '%s'" ,
3160- soap_type_name (& list_enc -> details ), soap_type_name (enc ));
3167+ to_xml_list_item_error (enc , list_enc );
31613168 }
31623169 xmlUnlinkNode (dummy );
31633170 xmlFreeNode (dummy );
0 commit comments