From 10371b034ab5c3db1f1b347e2de566575ede44b2 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 26 May 2006 09:02:35 +0000 Subject: [PATCH] Fixed bug #37523 (namespaces added too late, leads to missing xsi:type attributes. incompatibility with libxml2-2.6.24) --- NEWS | 2 + ext/soap/php_encoding.c | 73 +++++++++---------- ext/soap/soap.c | 2 - ext/soap/tests/bugs/bug30799.phpt | 2 +- ext/soap/tests/bugs/bug34449.phpt | 2 +- ext/soap/tests/bugs/bug35273.phpt | 2 +- ext/soap/tests/bugs/bug36575.phpt | 4 +- ext/soap/tests/bugs/bug37278.phpt | 2 +- .../interop/Round2/Base/r2_base_003p.phpt | 4 +- .../interop/Round2/Base/r2_base_003s.phpt | 4 +- .../interop/Round2/Base/r2_base_003w.phpt | 4 +- .../interop/Round2/Base/r2_base_006p.phpt | 2 +- .../interop/Round2/Base/r2_base_006s.phpt | 4 +- .../interop/Round2/Base/r2_base_006w.phpt | 4 +- .../interop/Round2/Base/r2_base_007p.phpt | 2 +- .../interop/Round2/Base/r2_base_007s.phpt | 4 +- .../interop/Round2/Base/r2_base_007w.phpt | 4 +- .../interop/Round2/Base/r2_base_008p.phpt | 4 +- .../interop/Round2/Base/r2_base_008s.phpt | 4 +- .../interop/Round2/Base/r2_base_008w.phpt | 4 +- .../interop/Round2/Base/r2_base_009p.phpt | 4 +- .../interop/Round2/Base/r2_base_009s.phpt | 4 +- .../interop/Round2/Base/r2_base_009w.phpt | 4 +- .../interop/Round2/Base/r2_base_011p.phpt | 2 +- .../interop/Round2/Base/r2_base_011s.phpt | 4 +- .../interop/Round2/Base/r2_base_011w.phpt | 4 +- .../interop/Round2/Base/r2_base_013p.phpt | 2 +- .../interop/Round2/Base/r2_base_013s.phpt | 4 +- .../interop/Round2/Base/r2_base_013w.phpt | 4 +- .../interop/Round2/Base/r2_base_014p.phpt | 4 +- .../interop/Round2/Base/r2_base_014s.phpt | 4 +- .../interop/Round2/Base/r2_base_014w.phpt | 4 +- .../interop/Round2/Base/r2_base_015p.phpt | 2 +- .../interop/Round2/Base/r2_base_015s.phpt | 4 +- .../interop/Round2/Base/r2_base_015w.phpt | 4 +- .../interop/Round2/Base/r2_base_016p.phpt | 4 +- .../interop/Round2/Base/r2_base_016s.phpt | 4 +- .../interop/Round2/Base/r2_base_016w.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_001p.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_001s.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_001w.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_002p.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_002s.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_002w.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_003p.phpt | 2 +- .../interop/Round2/GroupB/r2_groupB_003s.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_003w.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_004p.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_004s.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_004w.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_005p.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_005s.phpt | 4 +- .../interop/Round2/GroupB/r2_groupB_005w.phpt | 4 +- .../Round3/GroupD/r3_groupD_import2_001w.phpt | 4 +- .../Round3/GroupD/r3_groupD_import3_001w.phpt | 4 +- .../Round3/GroupD/r3_groupD_import3_002w.phpt | 4 +- .../Round3/GroupD/r3_groupD_rpcenc_002w.phpt | 4 +- .../Round3/GroupD/r3_groupD_rpcenc_003w.phpt | 4 +- .../Round3/GroupD/r3_groupD_rpcenc_004w.phpt | 4 +- .../Round3/GroupE/r3_groupE_list_001w.phpt | 4 +- .../Round3/GroupE/r3_groupE_list_002w.phpt | 4 +- .../Round3/GroupE/r3_groupE_list_003w.phpt | 4 +- .../Round3/GroupE/r3_groupE_list_004w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_001w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_002w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_003w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_004w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_005w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_006w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_007w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_008w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_009w.phpt | 4 +- .../GroupH/r4_groupH_complex_rpcenc_010w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_001w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_002w.phpt | 2 +- .../GroupH/r4_groupH_simple_rpcenc_003w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_004w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_005w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_006w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_007w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_008w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_009w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_010w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_011w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_012w.phpt | 2 +- .../GroupH/r4_groupH_simple_rpcenc_013w.phpt | 2 +- .../GroupH/r4_groupH_simple_rpcenc_014w.phpt | 2 +- .../GroupH/r4_groupH_simple_rpcenc_015w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_016w.phpt | 4 +- .../GroupH/r4_groupH_simple_rpcenc_017w.phpt | 4 +- .../GroupH/r4_groupH_soapfault_001w.phpt | 4 +- .../GroupH/r4_groupH_soapfault_002w.phpt | 4 +- .../GroupH/r4_groupH_soapfault_004w.phpt | 2 +- ext/soap/tests/schema/schema009.phpt | 2 +- ext/soap/tests/schema/schema010.phpt | 2 +- ext/soap/tests/schema/schema011.phpt | 2 +- ext/soap/tests/schema/schema012.phpt | 2 +- ext/soap/tests/schema/schema013.phpt | 2 +- ext/soap/tests/schema/schema014.phpt | 2 +- ext/soap/tests/schema/schema015.phpt | 2 +- ext/soap/tests/schema/schema016.phpt | 2 +- ext/soap/tests/schema/schema017.phpt | 2 +- ext/soap/tests/schema/schema018.phpt | 2 +- ext/soap/tests/schema/schema019.phpt | 2 +- ext/soap/tests/schema/schema020.phpt | 2 +- ext/soap/tests/schema/schema021.phpt | 2 +- ext/soap/tests/schema/schema022.phpt | 2 +- ext/soap/tests/schema/schema023.phpt | 2 +- ext/soap/tests/schema/schema024.phpt | 2 +- ext/soap/tests/schema/schema025.phpt | 2 +- ext/soap/tests/schema/schema026.phpt | 2 +- ext/soap/tests/schema/schema027.phpt | 2 +- ext/soap/tests/schema/schema028.phpt | 2 +- ext/soap/tests/schema/schema029.phpt | 2 +- ext/soap/tests/schema/schema054.phpt | 2 +- ext/soap/tests/schema/schema055.phpt | 2 +- ext/soap/tests/schema/schema062.phpt | 2 +- ext/soap/tests/schema/schema065.phpt | 2 +- ext/soap/tests/schema/schema066.phpt | 2 +- ext/soap/tests/schema/schema067.phpt | 2 +- ext/soap/tests/schema/schema069.phpt | 2 +- ext/soap/tests/schema/schema070.phpt | 2 +- ext/soap/tests/schema/schema075.phpt | 2 +- ext/soap/tests/schema/schema076.phpt | 2 +- ext/soap/tests/schema/schema077.phpt | 2 +- ext/soap/tests/server025.phpt | 2 +- ext/soap/tests/soap12/T31.phpt | 2 +- ext/soap/tests/soap12/T41.phpt | 2 +- ext/soap/tests/soap12/T42.phpt | 2 +- ext/soap/tests/soap12/T44.phpt | 2 +- ext/soap/tests/soap12/T45.phpt | 2 +- ext/soap/tests/soap12/T46.phpt | 2 +- ext/soap/tests/soap12/T47.phpt | 2 +- ext/soap/tests/soap12/T48.phpt | 2 +- ext/soap/tests/soap12/T49.phpt | 2 +- ext/soap/tests/soap12/T50.phpt | 2 +- 136 files changed, 238 insertions(+), 243 deletions(-) diff --git a/NEWS b/NEWS index 4fc2652a44..b20fe40a04 100644 --- a/NEWS +++ b/NEWS @@ -53,6 +53,8 @@ PHP NEWS - Fixed bug #37563 (array_key_exists performance is poor for &$array). (Ilia) - Fixed bug #37558 (timeout functionality doesn't work after a second PHP starup on the same thread). (p dot desarnaud at wanadoo dot fr) +- Fixed bug #37523 (namespaces added too late, leads to missing xsi:type + attributes. incompatibility with libxml2-2.6.24). (Dmitry) - Fixed bug #37514 (strtotime doesn't assume year correctly). (Derick) - Fixed bug #37510 (session_regenerate_id changes session_id() even on failure). (Hannes) diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 5c3c6db56f..195ae4d448 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -88,6 +88,10 @@ static encodePtr get_array_type(xmlNodePtr node, zval *array, smart_str *out_typ static xmlNodePtr check_and_resolve_href(xmlNodePtr data); +static void set_ns_prop(xmlNodePtr node, char *ns, char *name, char *val); +static void set_xsi_nil(xmlNodePtr node); +static void set_xsi_type(xmlNodePtr node, char *type); + static void get_type_str(xmlNodePtr node, const char* ns, const char* type, smart_str* ret); static void set_ns_and_type_ex(xmlNodePtr node, char *ns, char *type); @@ -113,7 +117,7 @@ static void set_ns_and_type(xmlNodePtr node, encodeTypePtr type); { \ if (!zval || Z_TYPE_P(zval) == IS_NULL) { \ if (style == SOAP_ENCODED) {\ - xmlSetProp(xml, "xsi:nil", "true"); \ + set_xsi_nil(xml); \ } \ return xml; \ } \ @@ -307,9 +311,6 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par if (style == SOAP_ENCODED || (SOAP_GLOBAL(sdl) && encode != enc)) { if (zend_hash_find(ht, "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) { - if (style == SOAP_LITERAL) { - encode_add_ns(node, XSI_NAMESPACE); - } if (zend_hash_find(ht, "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) { set_ns_and_type_ex(node, Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype)); } else { @@ -1015,7 +1016,7 @@ static xmlNodePtr to_xml_null(encodeTypePtr type, zval *data, int style, xmlNode ret = xmlNewNode(NULL,"BOGUS"); xmlAddChild(parent, ret); if (style == SOAP_ENCODED) { - xmlSetProp(ret, "xsi:nil", "true"); + set_xsi_nil(ret); } return ret; } @@ -1428,12 +1429,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval * if (Z_TYPE_PP(val) == IS_NULL && model->u.element->nillable) { property = xmlNewNode(NULL,"BOGUS"); xmlAddChild(node, property); - if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "true"); - } else { - xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "true"); - } + set_xsi_nil(property); } else { property = master_to_xml(enc, *val, style, node); if (property->children && property->children->content && @@ -1454,12 +1450,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval * if (Z_TYPE_P(data) == IS_NULL && model->u.element->nillable) { property = xmlNewNode(NULL,"BOGUS"); xmlAddChild(node, property); - if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "true"); - } else { - xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "true"); - } + set_xsi_nil(property); } else { property = master_to_xml(enc, data, style, node); if (property->children && property->children->content && @@ -1479,12 +1470,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval * } else if (strict && model->u.element->nillable && model->min_occurs > 0) { property = xmlNewNode(NULL,model->u.element->name); xmlAddChild(node, property); - if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "true"); - } else { - xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "true"); - } + set_xsi_nil(property); if (style == SOAP_LITERAL && model->u.element->namens && model->u.element->form == XSD_FORM_QUALIFIED) { @@ -1619,7 +1605,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo xmlParam = xmlNewNode(NULL,"BOGUS"); xmlAddChild(parent, xmlParam); if (style == SOAP_ENCODED) { - xmlSetProp(xmlParam, "xsi:nil", "true"); + set_xsi_nil(xmlParam); } return xmlParam; } @@ -1699,12 +1685,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo if (Z_TYPE_PP(val) == IS_NULL && array_el->nillable) { property = xmlNewNode(NULL,"BOGUS"); xmlAddChild(xmlParam, property); - if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "true"); - } else { - xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "true"); - } + set_xsi_nil(property); } else { property = master_to_xml(array_el->encode, *val, style, xmlParam); } @@ -2165,7 +2146,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod smart_str_append(&array_type, &array_size); smart_str_appendc(&array_type, ']'); smart_str_0(&array_type); - xmlSetProp(xmlParam, SOAP_1_1_ENC_NS_PREFIX":arrayType", array_type.c); + set_ns_prop(xmlParam, SOAP_1_1_ENC_NAMESPACE, "arrayType", array_type.c); } else { int i = 0; while (i < array_size.len) { @@ -2174,8 +2155,8 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod } smart_str_0(&array_type); smart_str_0(&array_size); - xmlSetProp(xmlParam, SOAP_1_2_ENC_NS_PREFIX":itemType", array_type.c); - xmlSetProp(xmlParam, SOAP_1_2_ENC_NS_PREFIX":arraySize", array_size.c); + set_ns_prop(xmlParam, SOAP_1_2_ENC_NAMESPACE, "itemType", array_type.c); + set_ns_prop(xmlParam, SOAP_1_2_ENC_NAMESPACE, "arraySize", array_size.c); } } smart_str_free(&array_type); @@ -2431,7 +2412,7 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP xmlAddChild(item,key); if (zend_hash_get_current_key(data->value.ht, &key_val, (long *)&int_val, FALSE) == HASH_KEY_IS_STRING) { if (style == SOAP_ENCODED) { - xmlSetProp(key, "xsi:type", "xsd:string"); + set_xsi_type(key, "xsd:string"); } xmlNodeSetContent(key, key_val); } else { @@ -2440,7 +2421,7 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP smart_str_0(&tmp); if (style == SOAP_ENCODED) { - xmlSetProp(key, "xsi:type", "xsd:int"); + set_xsi_type(key, "xsd:int"); } xmlNodeSetContentLen(key, tmp.c, tmp.len); @@ -2518,7 +2499,6 @@ static xmlNodePtr guess_xml_convert(encodeTypePtr type, zval *data, int style, x ret = master_to_xml(enc, data, style, parent); /* if (style == SOAP_LITERAL && SOAP_GLOBAL(sdl)) { - encode_add_ns(node, XSI_NAMESPACE); set_ns_and_type(ret, &enc->details); } */ @@ -3050,7 +3030,7 @@ static void set_ns_and_type_ex(xmlNodePtr node, char *ns, char *type) { smart_str nstype = {0}; get_type_str(node, ns, type, &nstype); - xmlSetProp(node, "xsi:type", nstype.c); + set_xsi_type(node, nstype.c); smart_str_free(&nstype); } @@ -3083,6 +3063,21 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns) return xmlns; } +static void set_ns_prop(xmlNodePtr node, char *ns, char *name, char *val) +{ + xmlSetNsProp(node, encode_add_ns(node, ns), name, val); +} + +static void set_xsi_nil(xmlNodePtr node) +{ + set_ns_prop(node, XSI_NAMESPACE, "nil", "true"); +} + +static void set_xsi_type(xmlNodePtr node, char *type) +{ + set_ns_prop(node, XSI_NAMESPACE, "type", type); +} + void encode_reset_ns() { TSRMLS_FETCH(); @@ -3142,7 +3137,7 @@ static encodePtr get_array_type(xmlNodePtr node, zval *array, smart_str *type TS char *prev_stype = NULL, *cur_stype = NULL, *prev_ns = NULL, *cur_ns = NULL; if (!array || Z_TYPE_P(array) != IS_ARRAY) { - smart_str_appendl(type, "xsd:anyType", 11); + smart_str_appendl(type, "xsd:anyType", sizeof("xsd:anyType")-1); return get_conversion(XSD_ANYTYPE); } @@ -3204,7 +3199,7 @@ static encodePtr get_array_type(xmlNodePtr node, zval *array, smart_str *type TS } if (different || count == 0) { - smart_str_appendl(type, "xsd:anyType", 11); + smart_str_appendl(type, "xsd:anyType", sizeof("xsd:anyType")-1); return get_conversion(XSD_ANYTYPE); } else { encodePtr enc; diff --git a/ext/soap/soap.c b/ext/soap/soap.c index c853372c2e..f8926da0ea 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -3910,7 +3910,6 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function if (use == SOAP_ENCODED) { xmlNewNs(envelope, XSD_NAMESPACE, XSD_NS_PREFIX); - xmlNewNs(envelope, XSI_NAMESPACE, XSI_NS_PREFIX); if (version == SOAP_1_1) { xmlNewNs(envelope, SOAP_1_1_ENC_NAMESPACE, SOAP_1_1_ENC_NS_PREFIX); xmlSetNsProp(envelope, envelope->ns, "encodingStyle", SOAP_1_1_ENC_NAMESPACE); @@ -4122,7 +4121,6 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function if (use == SOAP_ENCODED) { xmlNewNs(envelope, XSD_NAMESPACE, XSD_NS_PREFIX); - xmlNewNs(envelope, XSI_NAMESPACE, XSI_NS_PREFIX); if (version == SOAP_1_1) { xmlNewNs(envelope, SOAP_1_1_ENC_NAMESPACE, SOAP_1_1_ENC_NS_PREFIX); xmlSetNsProp(envelope, envelope->ns, "encodingStyle", SOAP_1_1_ENC_NAMESPACE); diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt index 9fa0b12f0e..d5f2da5170 100644 --- a/ext/soap/tests/bugs/bug30799.phpt +++ b/ext/soap/tests/bugs/bug30799.phpt @@ -21,5 +21,5 @@ echo "ok\n"; ?> --EXPECT-- -abc +abc ok diff --git a/ext/soap/tests/bugs/bug34449.phpt b/ext/soap/tests/bugs/bug34449.phpt index 5aa30bbcac..1bc9ff8749 100755 --- a/ext/soap/tests/bugs/bug34449.phpt +++ b/ext/soap/tests/bugs/bug34449.phpt @@ -17,4 +17,4 @@ $client->AnyFunction(new SoapVar($my_xml, XSD_ANYXML)); ?> --EXPECT-- - + diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt index 12a555c5c3..9c33d891ca 100755 --- a/ext/soap/tests/bugs/bug35273.phpt +++ b/ext/soap/tests/bugs/bug35273.phpt @@ -18,4 +18,4 @@ echo "ok\n"; ?> --EXPECT-- -

NameSurname

 +

NameSurname

 diff --git a/ext/soap/tests/bugs/bug36575.phpt b/ext/soap/tests/bugs/bug36575.phpt index aad8fcad6a..9bf5415220 100755 --- a/ext/soap/tests/bugs/bug36575.phpt +++ b/ext/soap/tests/bugs/bug36575.phpt @@ -46,7 +46,7 @@ echo "ok\n"; ?> --EXPECT-- -onetwo +onetwo -onevar twovar three +onevar twovar three ok diff --git a/ext/soap/tests/bugs/bug37278.phpt b/ext/soap/tests/bugs/bug37278.phpt index 15ef3c94c1..f3fd7c17b4 100755 --- a/ext/soap/tests/bugs/bug37278.phpt +++ b/ext/soap/tests/bugs/bug37278.phpt @@ -21,4 +21,4 @@ try { ?> --EXPECT-- - \ No newline at end of file + diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt index 66bc63113f..8aadcbb6f7 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok \ No newline at end of file diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt index e2f4c790a6..e215ec1b07 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok \ No newline at end of file diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt index d76c28abfe..cf6544b755 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok \ No newline at end of file diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt index f332a825b0..a85d3c481a 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt @@ -15,5 +15,5 @@ echo "ok\n"; goodbad -goodbad +goodbad ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt index de822b2d1c..8ea498a5c6 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt @@ -17,7 +17,7 @@ echo "ok\n"; ?> --EXPECT-- -goodbad +goodbad -goodbad +goodbad ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt index 7844d4ac87..18aa020765 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -goodbad +goodbad -goodbad +goodbad ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt index ddf9879394..bfa5e1c725 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt @@ -15,5 +15,5 @@ echo "ok\n"; good -good +good ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt index 778446a5c1..6d46588a37 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt @@ -16,7 +16,7 @@ echo "ok\n"; ?> --EXPECT-- -good +good -good +good ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt index 89bf6ea5c0..cdc791dc7a 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -good +good -good +good ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt index b419a866db..21125586b1 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt index 2ee4b6de9c..2bae84505f 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt @@ -15,7 +15,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt index 25de1542a6..1750aabc4a 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt index 94a0983e56..bee2f79634 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt index d2d9734fc0..071d54dc54 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt @@ -14,7 +14,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt index daa8f5615e..9c2c130b81 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt index 7a6b1477e7..739ded994d 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt @@ -15,5 +15,5 @@ echo "ok\n"; 12343243242 -12343243242 +12343243242 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt index f892147593..d7699e2ea6 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt @@ -18,7 +18,7 @@ echo "ok\n"; ?> --EXPECT-- -12343243242 +12343243242 -12343243242 +12343243242 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt index 20686b249c..3229e54fdd 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -12343243242 +12343243242 -12343243242 +12343243242 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt index 815b4dffb7..133f88b15e 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt @@ -15,5 +15,5 @@ echo "ok\n"; 1.322334.2325.325 -1.322334.2325.325 +1.322334.2325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt index 72124be8ab..5ce96d803f 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt @@ -18,7 +18,7 @@ echo "ok\n"; ?> --EXPECT-- -1.322334.2325.325 +1.322334.2325.325 -1.322334.2325.325 +1.322334.2325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt index e4291ab0d5..07b7cc86a2 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -1.322334.2325.325 +1.322334.2325.325 -1.322334.2325.325 +1.322334.2325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt index 107f953644..567dde5fbf 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325 +arg34325.325 -arg34325.325 +arg34325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt index b15dc30d6d..a47f70769f 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt @@ -18,7 +18,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325 +arg34325.325 -arg34325.325 +arg34325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt index 8c0f29f2d6..be49c5c577 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325 +arg34325.325 -arg34325.325 +arg34325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt index 3162c26fdb..0d779dc063 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt @@ -24,5 +24,5 @@ echo "ok\n"; arg34325.325arg34325.325 -arg34325.325arg34325.325 +arg34325.325arg34325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt index 47a270b5c2..887210548b 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt @@ -32,7 +32,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325arg34325.325 +arg34325.325arg34325.325 -arg34325.325arg34325.325 +arg34325.325arg34325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt index 3b7e61da70..83c369dab3 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt @@ -22,7 +22,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325arg34325.325 +arg34325.325arg34325.325 -arg34325.325arg34325.325 +arg34325.325arg34325.325 ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt index ab00416ea9..0c3a028f1e 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt index e64fde8072..24cd42b0de 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt index b3647a594a..856610d45d 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt index 5047a990e4..d2b6fc7f1e 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -arg3434.345 +arg3434.345 arg3434.345 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt index 9b6670772c..ea32aba35e 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt @@ -18,7 +18,7 @@ echo "ok\n"; ?> --EXPECT-- -arg3434.345 +arg3434.345 arg3434.345 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt index 8fd43336a2..5c2b93eee2 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -arg3434.345 +arg3434.345 arg3434.345 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt index 6ea475c3f0..9899f55332 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt @@ -15,5 +15,5 @@ echo "ok\n"; arg3434.345 -arg3434.345 +arg3434.345 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt index 3fcf6de66b..1d7d1db049 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt @@ -18,5 +18,5 @@ echo "ok\n"; arg3434.345 -arg3434.345 +arg3434.345 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt index 97fece7aab..b1515bcad6 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt @@ -15,5 +15,5 @@ echo "ok\n"; arg3434.345 -arg3434.345 +arg3434.345 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt index 80dff6d5be..417ae10a41 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt @@ -18,5 +18,5 @@ echo "ok\n"; row0col0row0col1row0col2row1col0row1col1row1col2 -row0col0row0col1row0col2row1col0row1col1row1col2 +row0col0row0col1row0col2row1col0row1col1row1col2 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt index 5161144fee..59f213414c 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt @@ -25,7 +25,7 @@ echo "ok\n"; ?> --EXPECT-- -row0col0row0col1row0col2row1col0row1col1row1col2 +row0col0row0col1row0col2row1col0row1col1row1col2 -row0col0row0col1row0col2row1col0row1col1row1col2 +row0col0row0col1row0col2row1col0row1col1row1col2 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt index 5d4ad0cfc6..a3e9357b7e 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt @@ -16,7 +16,7 @@ echo "ok\n"; ?> --EXPECT-- -row0col0row0col1row0col2row1col0row1col1row1col2 +row0col0row0col1row0col2row1col0row1col1row1col2 -row0col0row0col1row0col2row1col0row1col1row1col2 +row0col0row0col1row0col2row1col0row1col1row1col2 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt index fbeb9afd57..2a2ce246ca 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt @@ -23,7 +23,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34123.45arg2342123.452 +arg34123.45arg2342123.452 -arg34123.45arg2342123.452 +arg34123.45arg2342123.452 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt index ad18c2b432..e868809db7 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt @@ -23,7 +23,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34123.45arg2342123.452 +arg34123.45arg2342123.452 -arg34123.45arg2342123.452 +arg34123.45arg2342123.452 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt index 4bbc51f127..69dbdd7c21 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt @@ -23,7 +23,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34123.45arg2342123.452 +arg34123.45arg2342123.452 -arg34123.45arg2342123.452 +arg34123.45arg2342123.452 ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt index 61298389e3..08e2e7bccd 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt @@ -18,7 +18,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325redbluegreen +arg34325.325redbluegreen -arg34325.325redbluegreen +arg34325.325redbluegreen ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt index fcb5990093..331a619efe 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt @@ -23,7 +23,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325redbluegreen +arg34325.325redbluegreen -arg34325.325redbluegreen +arg34325.325redbluegreen ok diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt index 206fca84e9..9b7661c22a 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt @@ -18,7 +18,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325redbluegreen +arg34325.325redbluegreen -arg34325.325redbluegreen +arg34325.325redbluegreen ok diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt index 53ac18bafd..236dd049d8 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325 +arg34325.325 -arg34325.325 +arg34325.325 ok diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt index 2a4d656076..17650e7783 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325 +arg34325.325 -arg34325.325 +arg34325.325 ok diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt index b3e2d7b121..f6b67f2ba7 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325arg34325.325 +arg34325.325arg34325.325 -arg34325.325arg34325.325 +arg34325.325arg34325.325 ok diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt index a3fc99d27e..e5ca54908d 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -onetwothree +onetwothree -onetwothree +onetwothree ok diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt index 2ebd90b499..4f36a7ec48 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -325.32534arg +325.32534arg -325.32534arg +325.32534arg ok diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt index 732dfcce38..32dd9d9ba0 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt index 1221e05b5c..9061da6a39 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt @@ -21,9 +21,9 @@ echo "ok\n"; ?> --EXPECT-- -1arg1 +1arg1 -1arg1 +1arg1 object(stdClass)#5 (3) { ["varInt"]=> int(1) diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt index a56b3fb62d..2b566679c0 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt @@ -21,9 +21,9 @@ echo "ok\n"; ?> --EXPECT-- -1arg12arg2 +1arg12arg2 -1arg12arg2 +1arg12arg2 object(stdClass)#6 (3) { ["varInt"]=> int(1) diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt index ce86f0f66e..cf2a9dae1b 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt @@ -21,9 +21,9 @@ echo "ok\n"; ?> --EXPECT-- -1arg12arg23arg3 +1arg12arg23arg3 -1arg12arg23arg3 +1arg12arg23arg3 object(stdClass)#7 (3) { ["varInt"]=> int(1) diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt index 3fa8da4cd5..17dc4a3a91 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt @@ -21,8 +21,8 @@ echo "ok\n"; ?> --EXPECT-- - + - + NULL ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt index 7d5104a20f..c02f722331 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt @@ -21,7 +21,7 @@ echo "ok\n"; ?> --EXPECT-- -arg34325.325 +arg34325.325 -SOAP-ENV:ServerFault in response to 'echoSOAPStructFault'.arg34325.325 +SOAP-ENV:ServerFault in response to 'echoSOAPStructFault'.arg34325.325 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt index 0587b6e1f2..ab200670df 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt @@ -20,7 +20,7 @@ echo "ok\n"; ?> --EXPECT-- -12.34512 +12.34512 -SOAP-ENV:ServerFault in response to 'echoBaseStructFault'.12.34512 +SOAP-ENV:ServerFault in response to 'echoBaseStructFault'.12.34512 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt index a06d7e7444..27f6a794a0 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt @@ -28,7 +28,7 @@ echo "ok\n"; ?> --EXPECT-- -12.34512arg-35 +12.34512arg-35 -SOAP-ENV:ServerFault in response to 'echoExtendedStructFault'.12.34512arg-35 +SOAP-ENV:ServerFault in response to 'echoExtendedStructFault'.12.34512arg-35 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt index d93e0d7a61..57c72bf652 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt @@ -28,7 +28,7 @@ echo "ok\n"; ?> --EXPECT-- -1arg34325.32512.34512 +1arg34325.32512.34512 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg34325.325 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg34325.325 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt index f11191daf2..9a31ca6b5d 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt @@ -28,7 +28,7 @@ echo "ok\n"; ?> --EXPECT-- -2arg34325.32512.34512 +2arg34325.32512.34512 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34512 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34512 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt index 88017ace1b..7d6ccba81b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt @@ -28,7 +28,7 @@ echo "ok\n"; ?> --EXPECT-- -3arg34325.32512.34512 +3arg34325.32512.34512 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg34325.325 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg34325.325 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt index c58485ce1a..8827731064 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt @@ -36,7 +36,7 @@ echo "ok\n"; ?> --EXPECT-- -112.345112.3452arg-3512.3453arg-35true +112.345112.3452arg-3512.3453arg-35true -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3451 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3451 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt index 09978000ac..9f0069adb2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt @@ -36,7 +36,7 @@ echo "ok\n"; ?> --EXPECT-- -212.345112.3452arg-3512.3453arg-35true +212.345112.3452arg-3512.3453arg-35true -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3452arg-35 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3452arg-35 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt index 2d8504183f..6971cd9e1e 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt @@ -36,7 +36,7 @@ echo "ok\n"; ?> --EXPECT-- -312.345112.3452arg-3512.3453arg-35true +312.345112.3452arg-3512.3453arg-35true -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3453arg-35true +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3453arg-35true ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt index 0e0a3c237b..c90d332aa0 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt @@ -36,7 +36,7 @@ echo "ok\n"; ?> --EXPECT-- -412.345112.3452arg-3512.3453arg-35true +412.345112.3452arg-3512.3453arg-35true -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3451 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3451 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt index 41c53ee024..943c777441 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + -SOAP-ENV:ServerFault in response to 'echoEmptyFault'. +SOAP-ENV:ServerFault in response to 'echoEmptyFault'. ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt index b7167d8092..9bd340cd8f 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt @@ -15,5 +15,5 @@ echo "ok\n"; Hello World -SOAP-ENV:ServerFault in response to 'echoStringFault'.Hello World +SOAP-ENV:ServerFault in response to 'echoStringFault'.Hello World ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt index 6db29e9e5b..e60cc7fc1b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -3412 +3412 -SOAP-ENV:ServerFault in response to 'echoIntArrayFault'.3412 +SOAP-ENV:ServerFault in response to 'echoIntArrayFault'.3412 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt index ad6c1a2ed2..36e53d74ac 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -1Hello world12.34545678 +1Hello world12.34545678 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt index 7f9dfc8acb..18078dd364 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -2Hello world12.34545678 +2Hello world12.34545678 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.Hello world +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.Hello world ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt index dd7b52f664..8b857e7f12 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -3Hello world12.34545678 +3Hello world12.34545678 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34545678 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34545678 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt index a9f30b92a5..f343286319 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -4Hello world12.34545678 +4Hello world12.34545678 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. +SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt index 9c8421877b..f5cf86da92 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -1Hello World12.345onetwothree +1Hello World12.345onetwothree -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt index 5efaaa146e..62920954f1 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -2Hello World12.345onetwothree +2Hello World12.345onetwothree -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.Hello World +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.Hello World ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt index 43793dcb34..25a7da54c7 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -3Hello World12.345onetwothree +3Hello World12.345onetwothree -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.onetwothree +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.onetwothree ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt index 6941bb2572..2c1199c271 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -4Hello World12.345onetwothree +4Hello World12.345onetwothree -SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt index 984f05bcb9..d3f054b1eb 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt @@ -15,5 +15,5 @@ echo "ok\n"; 1arg1arg2 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt index 4ff8afc9d5..463c65af35 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt @@ -15,5 +15,5 @@ echo "ok\n"; 2arg1arg2 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg2 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg2 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt index a84ad6db97..ad7514fab3 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt @@ -15,5 +15,5 @@ echo "ok\n"; 3arg1arg2 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt index 9deae78563..2e4139f712 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -11621 +11621 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt index d324fb31a2..88063d0926 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -21621 +21621 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.1 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.1 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt index 7a820922a9..6e9173de52 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- -31621 +31621 -SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 +SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt index d50637afe1..17aabd5d44 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt index f31cd7c6a5..9106a5e1e6 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt @@ -13,7 +13,7 @@ echo "ok\n"; ?> --EXPECT-- - + - + ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt index 11069bc58e..17f4beba1a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt @@ -14,6 +14,6 @@ echo "ok\n"; ?> --EXPECT-- -Hello World +Hello World SOAP-ENV:MustUnderstandHeader not understood diff --git a/ext/soap/tests/schema/schema009.phpt b/ext/soap/tests/schema/schema009.phpt index 5198debd90..f7d10242cc 100644 --- a/ext/soap/tests/schema/schema009.phpt +++ b/ext/soap/tests/schema/schema009.phpt @@ -15,6 +15,6 @@ echo "ok"; ?> --EXPECT-- -one two +one two string(7) "one two" ok diff --git a/ext/soap/tests/schema/schema010.phpt b/ext/soap/tests/schema/schema010.phpt index 6cea56ee48..49136b9fe4 100644 --- a/ext/soap/tests/schema/schema010.phpt +++ b/ext/soap/tests/schema/schema010.phpt @@ -15,6 +15,6 @@ echo "ok"; ?> --EXPECT-- -one two +one two string(7) "one two" ok diff --git a/ext/soap/tests/schema/schema011.phpt b/ext/soap/tests/schema/schema011.phpt index c66f0f7a10..8296311a46 100644 --- a/ext/soap/tests/schema/schema011.phpt +++ b/ext/soap/tests/schema/schema011.phpt @@ -19,6 +19,6 @@ echo "ok"; ?> --EXPECT-- -123 456 +123 456 string(7) "123 456" ok diff --git a/ext/soap/tests/schema/schema012.phpt b/ext/soap/tests/schema/schema012.phpt index 7ba25f9637..1d542d81d8 100644 --- a/ext/soap/tests/schema/schema012.phpt +++ b/ext/soap/tests/schema/schema012.phpt @@ -19,6 +19,6 @@ echo "ok"; ?> --EXPECT-- -123 456 +123 456 string(7) "123 456" ok diff --git a/ext/soap/tests/schema/schema013.phpt b/ext/soap/tests/schema/schema013.phpt index ee2e114bd6..4794d2d0f1 100644 --- a/ext/soap/tests/schema/schema013.phpt +++ b/ext/soap/tests/schema/schema013.phpt @@ -15,6 +15,6 @@ echo "ok"; ?> --EXPECT-- -str +str string(3) "str" ok diff --git a/ext/soap/tests/schema/schema014.phpt b/ext/soap/tests/schema/schema014.phpt index 87edb3ad30..0ffff86e6f 100644 --- a/ext/soap/tests/schema/schema014.phpt +++ b/ext/soap/tests/schema/schema014.phpt @@ -15,6 +15,6 @@ echo "ok"; ?> --EXPECT-- -123.5 +123.5 string(5) "123.5" ok diff --git a/ext/soap/tests/schema/schema015.phpt b/ext/soap/tests/schema/schema015.phpt index dc9a02d586..fe9b96b8cf 100644 --- a/ext/soap/tests/schema/schema015.phpt +++ b/ext/soap/tests/schema/schema015.phpt @@ -25,6 +25,6 @@ echo "ok"; ?> --EXPECT-- -str +str string(3) "str" ok diff --git a/ext/soap/tests/schema/schema016.phpt b/ext/soap/tests/schema/schema016.phpt index 714fb59743..462fc71404 100644 --- a/ext/soap/tests/schema/schema016.phpt +++ b/ext/soap/tests/schema/schema016.phpt @@ -25,6 +25,6 @@ echo "ok"; ?> --EXPECT-- -123.5 +123.5 string(5) "123.5" ok diff --git a/ext/soap/tests/schema/schema017.phpt b/ext/soap/tests/schema/schema017.phpt index 8b20483783..e7674cfc41 100644 --- a/ext/soap/tests/schema/schema017.phpt +++ b/ext/soap/tests/schema/schema017.phpt @@ -22,6 +22,6 @@ echo "ok"; ?> --EXPECT-- -123.5 +123.5 string(5) "123.5" ok diff --git a/ext/soap/tests/schema/schema018.phpt b/ext/soap/tests/schema/schema018.phpt index f41e277aaa..0f3e8b84ac 100644 --- a/ext/soap/tests/schema/schema018.phpt +++ b/ext/soap/tests/schema/schema018.phpt @@ -22,6 +22,6 @@ echo "ok"; ?> --EXPECT-- -123.5 +123.5 string(5) "123.5" ok diff --git a/ext/soap/tests/schema/schema019.phpt b/ext/soap/tests/schema/schema019.phpt index 73938772bf..0d2d753764 100644 --- a/ext/soap/tests/schema/schema019.phpt +++ b/ext/soap/tests/schema/schema019.phpt @@ -22,6 +22,6 @@ echo "ok"; ?> --EXPECT-- -123.5 456.7 +123.5 456.7 string(11) "123.5 456.7" ok diff --git a/ext/soap/tests/schema/schema020.phpt b/ext/soap/tests/schema/schema020.phpt index 899b773756..3ceb3de625 100644 --- a/ext/soap/tests/schema/schema020.phpt +++ b/ext/soap/tests/schema/schema020.phpt @@ -22,6 +22,6 @@ echo "ok"; ?> --EXPECT-- -123.5 456.7 +123.5 456.7 string(11) "123.5 456.7" ok diff --git a/ext/soap/tests/schema/schema021.phpt b/ext/soap/tests/schema/schema021.phpt index 1400107f81..0628c6b3b8 100644 --- a/ext/soap/tests/schema/schema021.phpt +++ b/ext/soap/tests/schema/schema021.phpt @@ -19,6 +19,6 @@ echo "ok"; ?> --EXPECT-- -123 123.5 456.7 str +123 123.5 456.7 str string(19) "123 123.5 456.7 str" ok diff --git a/ext/soap/tests/schema/schema022.phpt b/ext/soap/tests/schema/schema022.phpt index bfbb05c772..fd598f6243 100644 --- a/ext/soap/tests/schema/schema022.phpt +++ b/ext/soap/tests/schema/schema022.phpt @@ -19,6 +19,6 @@ echo "ok"; ?> --EXPECT-- -123 123.5 str +123 123.5 str string(13) "123 123.5 str" ok diff --git a/ext/soap/tests/schema/schema023.phpt b/ext/soap/tests/schema/schema023.phpt index 162a46e7f5..550bacfe84 100644 --- a/ext/soap/tests/schema/schema023.phpt +++ b/ext/soap/tests/schema/schema023.phpt @@ -19,7 +19,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> int(123) diff --git a/ext/soap/tests/schema/schema024.phpt b/ext/soap/tests/schema/schema024.phpt index 628dfd73fd..af836d1ffb 100644 --- a/ext/soap/tests/schema/schema024.phpt +++ b/ext/soap/tests/schema/schema024.phpt @@ -21,7 +21,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> int(123) diff --git a/ext/soap/tests/schema/schema025.phpt b/ext/soap/tests/schema/schema025.phpt index f9c7af7586..748e45804d 100644 --- a/ext/soap/tests/schema/schema025.phpt +++ b/ext/soap/tests/schema/schema025.phpt @@ -20,7 +20,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> int(123) diff --git a/ext/soap/tests/schema/schema026.phpt b/ext/soap/tests/schema/schema026.phpt index a80215ed4f..e17b5ac60b 100644 --- a/ext/soap/tests/schema/schema026.phpt +++ b/ext/soap/tests/schema/schema026.phpt @@ -21,7 +21,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> int(123) diff --git a/ext/soap/tests/schema/schema027.phpt b/ext/soap/tests/schema/schema027.phpt index 968b8562db..e3b382ebe9 100644 --- a/ext/soap/tests/schema/schema027.phpt +++ b/ext/soap/tests/schema/schema027.phpt @@ -19,7 +19,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> array(1) { diff --git a/ext/soap/tests/schema/schema028.phpt b/ext/soap/tests/schema/schema028.phpt index f86a875848..7cc4ba568a 100644 --- a/ext/soap/tests/schema/schema028.phpt +++ b/ext/soap/tests/schema/schema028.phpt @@ -20,7 +20,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> array(1) { diff --git a/ext/soap/tests/schema/schema029.phpt b/ext/soap/tests/schema/schema029.phpt index 8ae0a3b12f..2081affc6d 100644 --- a/ext/soap/tests/schema/schema029.phpt +++ b/ext/soap/tests/schema/schema029.phpt @@ -22,7 +22,7 @@ echo "ok"; ?> --EXPECT-- -123123 +123123 array(2) { [0]=> array(1) { diff --git a/ext/soap/tests/schema/schema054.phpt b/ext/soap/tests/schema/schema054.phpt index fc5cb05761..b1ff74e419 100644 --- a/ext/soap/tests/schema/schema054.phpt +++ b/ext/soap/tests/schema/schema054.phpt @@ -11,7 +11,7 @@ echo "ok"; ?> --EXPECT-- -a123b123.5 +a123b123.5 array(2) { ["a"]=> int(123) diff --git a/ext/soap/tests/schema/schema055.phpt b/ext/soap/tests/schema/schema055.phpt index 013cd92fd8..f6ead2f13d 100644 --- a/ext/soap/tests/schema/schema055.phpt +++ b/ext/soap/tests/schema/schema055.phpt @@ -18,7 +18,7 @@ echo "ok"; ?> --EXPECT-- -a123b123.5 +a123b123.5 array(2) { ["a"]=> int(123) diff --git a/ext/soap/tests/schema/schema062.phpt b/ext/soap/tests/schema/schema062.phpt index 1dc51ef765..60b06568ed 100644 --- a/ext/soap/tests/schema/schema062.phpt +++ b/ext/soap/tests/schema/schema062.phpt @@ -19,7 +19,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (2) { ["_"]=> NULL diff --git a/ext/soap/tests/schema/schema065.phpt b/ext/soap/tests/schema/schema065.phpt index e3f0d646dc..3199a6bc8f 100644 --- a/ext/soap/tests/schema/schema065.phpt +++ b/ext/soap/tests/schema/schema065.phpt @@ -16,7 +16,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (2) { ["str"]=> string(3) "str" diff --git a/ext/soap/tests/schema/schema066.phpt b/ext/soap/tests/schema/schema066.phpt index b281271963..7fe47bbd2c 100644 --- a/ext/soap/tests/schema/schema066.phpt +++ b/ext/soap/tests/schema/schema066.phpt @@ -16,7 +16,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (2) { ["str"]=> string(3) "str" diff --git a/ext/soap/tests/schema/schema067.phpt b/ext/soap/tests/schema/schema067.phpt index 0e4000957a..5ee0036ebe 100644 --- a/ext/soap/tests/schema/schema067.phpt +++ b/ext/soap/tests/schema/schema067.phpt @@ -16,7 +16,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (2) { ["str"]=> string(3) "str" diff --git a/ext/soap/tests/schema/schema069.phpt b/ext/soap/tests/schema/schema069.phpt index e4f733a1c0..ccaa342406 100644 --- a/ext/soap/tests/schema/schema069.phpt +++ b/ext/soap/tests/schema/schema069.phpt @@ -17,7 +17,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (2) { ["str"]=> string(3) "str" diff --git a/ext/soap/tests/schema/schema070.phpt b/ext/soap/tests/schema/schema070.phpt index af9abdc10f..0c1e249392 100644 --- a/ext/soap/tests/schema/schema070.phpt +++ b/ext/soap/tests/schema/schema070.phpt @@ -19,7 +19,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (2) { ["str"]=> string(3) "str" diff --git a/ext/soap/tests/schema/schema075.phpt b/ext/soap/tests/schema/schema075.phpt index 0f430f59d7..5867e55a7c 100644 --- a/ext/soap/tests/schema/schema075.phpt +++ b/ext/soap/tests/schema/schema075.phpt @@ -18,7 +18,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (3) { ["int1"]=> int(1) diff --git a/ext/soap/tests/schema/schema076.phpt b/ext/soap/tests/schema/schema076.phpt index 6e6444a5df..3ad2eae33a 100644 --- a/ext/soap/tests/schema/schema076.phpt +++ b/ext/soap/tests/schema/schema076.phpt @@ -18,7 +18,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (3) { ["int1"]=> int(1) diff --git a/ext/soap/tests/schema/schema077.phpt b/ext/soap/tests/schema/schema077.phpt index 779503cb4a..16057cfcf9 100644 --- a/ext/soap/tests/schema/schema077.phpt +++ b/ext/soap/tests/schema/schema077.phpt @@ -18,7 +18,7 @@ echo "ok"; ?> --EXPECTF-- - + object(stdClass)#%d (3) { ["int1"]=> int(1) diff --git a/ext/soap/tests/server025.phpt b/ext/soap/tests/server025.phpt index 0a98b4108a..eb5d647eb5 100755 --- a/ext/soap/tests/server025.phpt +++ b/ext/soap/tests/server025.phpt @@ -42,5 +42,5 @@ echo "ok\n"; ?> --EXPECT-- -Hello Header!Hello Header!Hello Body! +Hello Header!Hello Header!Hello Body! ok diff --git a/ext/soap/tests/soap12/T31.phpt b/ext/soap/tests/soap12/T31.phpt index 56dc883a61..04f0353bf0 100644 --- a/ext/soap/tests/soap12/T31.phpt +++ b/ext/soap/tests/soap12/T31.phpt @@ -17,6 +17,6 @@ include "soap12-test.inc"; ?> --EXPECT-- - + ok diff --git a/ext/soap/tests/soap12/T41.phpt b/ext/soap/tests/soap12/T41.phpt index d57eead1e8..f874adc895 100644 --- a/ext/soap/tests/soap12/T41.phpt +++ b/ext/soap/tests/soap12/T41.phpt @@ -26,5 +26,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhello world420.005 +returnhello world420.005 ok diff --git a/ext/soap/tests/soap12/T42.phpt b/ext/soap/tests/soap12/T42.phpt index 7ce828135d..5b05c28962 100644 --- a/ext/soap/tests/soap12/T42.phpt +++ b/ext/soap/tests/soap12/T42.phpt @@ -35,5 +35,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhello world420.005bye world430.123 +returnhello world420.005bye world430.123 ok diff --git a/ext/soap/tests/soap12/T44.phpt b/ext/soap/tests/soap12/T44.phpt index 2264f105c8..3e307c1357 100644 --- a/ext/soap/tests/soap12/T44.phpt +++ b/ext/soap/tests/soap12/T44.phpt @@ -23,5 +23,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhello world420.005 +returnhello world420.005 ok diff --git a/ext/soap/tests/soap12/T45.phpt b/ext/soap/tests/soap12/T45.phpt index 4bbcc818d4..24db941682 100644 --- a/ext/soap/tests/soap12/T45.phpt +++ b/ext/soap/tests/soap12/T45.phpt @@ -31,5 +31,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhello world420.005nested struct995.5 +returnhello world420.005nested struct995.5 ok diff --git a/ext/soap/tests/soap12/T46.phpt b/ext/soap/tests/soap12/T46.phpt index 9cbb4b16da..8098ef72e7 100644 --- a/ext/soap/tests/soap12/T46.phpt +++ b/ext/soap/tests/soap12/T46.phpt @@ -32,5 +32,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhello world420.005redbluegreen +returnhello world420.005redbluegreen ok diff --git a/ext/soap/tests/soap12/T47.phpt b/ext/soap/tests/soap12/T47.phpt index a9bb43e368..8a92f0a3c8 100644 --- a/ext/soap/tests/soap12/T47.phpt +++ b/ext/soap/tests/soap12/T47.phpt @@ -25,5 +25,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -return5.512999.9 +return5.512999.9 ok diff --git a/ext/soap/tests/soap12/T48.phpt b/ext/soap/tests/soap12/T48.phpt index 07ac4070ae..f7cf0fe3b8 100644 --- a/ext/soap/tests/soap12/T48.phpt +++ b/ext/soap/tests/soap12/T48.phpt @@ -25,5 +25,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhelloworld +returnhelloworld ok diff --git a/ext/soap/tests/soap12/T49.phpt b/ext/soap/tests/soap12/T49.phpt index c919e2b76a..9687d03b94 100644 --- a/ext/soap/tests/soap12/T49.phpt +++ b/ext/soap/tests/soap12/T49.phpt @@ -25,5 +25,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -returnhelloworld +returnhelloworld ok diff --git a/ext/soap/tests/soap12/T50.phpt b/ext/soap/tests/soap12/T50.phpt index 8e431e5aec..e3fcc0c316 100644 --- a/ext/soap/tests/soap12/T50.phpt +++ b/ext/soap/tests/soap12/T50.phpt @@ -25,5 +25,5 @@ include "soap12-test.inc"; ?> --EXPECT-- -return100200 +return100200 ok -- 2.40.0