*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;
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;
}
}
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);
}
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);
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];
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;
}
/* 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;
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;
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);
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) {
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) {
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");
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);
}
static xmlNodePtr to_xml_any(encodeTypePtr type, zval *data, int style, xmlNodePtr parent)
-{
+{
xmlNodePtr ret;
if (Z_TYPE_P(data) == IS_STRING) {
if (different || count == 0) {
smart_str_appendl(type, "xsd:anyType", 11);
- return get_conversion(XSD_ANYTYPE);
+ return get_conversion(XSD_ANYTYPE);
} else {
encodePtr enc;
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>\r
+<definitions name="shoppingcart"\r
+ xmlns="http://schemas.xmlsoap.org/wsdl/"\r
+ xmlns:tns="urn:test.soap#" targetNamespace="urn:test.soap#"\r
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"\r
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"\r
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"\r
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+ xmlns:types="urn:test.soap.types#">\r
+ <!-- all datatypes will be imported to namespace types: -->\r
+ <types>\r
+ <xs:schema\r
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+ xmlns:soap = "http://schemas.xmlsoap.org/wsdl/soap/"\r
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"\r
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"\r
+ xmlns:tns="urn:test.soap.types#"\r
+ targetNamespace="urn:test.soap.types#">\r
+\r
+ <xs:complexType name="A1">\r
+ <xs:all>\r
+ <xs:element name="var1" type="xs:string" nillable="true"/>\r
+ </xs:all>\r
+ </xs:complexType>\r
+\r
+ <xs:complexType name="A2">\r
+ <xs:complexContent>\r
+ <xs:extension base="tns:A1">\r
+ <xs:all>\r
+ <xs:element name="var2" type="xs:string" nillable="true"/>\r
+ </xs:all>\r
+ </xs:extension>\r
+ </xs:complexContent>\r
+ </xs:complexType>\r
+\r
+ <xs:complexType name="A3">\r
+ <xs:complexContent>\r
+ <xs:extension base="tns:A2">\r
+ <xs:all>\r
+ <xs:element name="var3" type="xs:string" nillable="true"/>\r
+ </xs:all>\r
+ </xs:extension>\r
+ </xs:complexContent>\r
+ </xs:complexType>\r
+ </xs:schema>\r
+ </types>\r
+\r
+ <message name="test-request">\r
+ <part name="a1" type="types:A1"/>\r
+ </message>\r
+ <message name="test-response">\r
+ <part name="result" type="types:A2"/>\r
+ </message>\r
+\r
+ <portType name="catalog-porttype">\r
+ <operation name="test" parameterOrder="a1">\r
+ <input name="test-request" message="tns:test-request"/>\r
+ <output name="test-response" message="tns:test-response"/>\r
+ </operation>\r
+ </portType>\r
+\r
+ <!-- @type doesn't like tns: -->\r
+ <binding name="catalog-binding" type="tns:catalog-porttype">\r
+ <soap:binding style="rpc"\r
+ transport="http://schemas.xmlsoap.org/soap/http"/>\r
+\r
+ <operation name="test">\r
+ <soap:operation soapAction="urn:test.soap#test"/>\r
+ <input>\r
+ <soap:body use="encoded" namespace="urn:test.soap#"\r
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>\r
+ </input>\r
+ <output>\r
+ <soap:body use="encoded" namespace="urn:test.soap#"\r
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>\r
+ </output>\r
+ </operation>\r
+ </binding>\r
+\r
+ <service name="catalog">\r
+ <!-- @binding doesn't like to be tns: -->\r
+ <port name="catalog-port" binding="tns:catalog-binding">\r
+ <soap:address location="xxxxxxxx"/>\r
+ </port>\r
+ </service>\r
+\r
+</definitions>\r
projects / php / commitdiff