dmitry          Thu Jan 20 07:40:16 2005 EDT

  Added files:                 (Branch: PHP_5_0)
    /php-src/ext/soap/tests/bugs        bug31422.phpt 

  Modified files:              
    /php-src    NEWS 
    /php-src/ext/soap   soap.c 
    /php-src/ext/soap/tests/schema      schema030.phpt schema031.phpt 
                                        schema032.phpt schema033.phpt 
                                        schema034.phpt schema035.phpt 
                                        schema036.phpt schema037.phpt 
                                        schema038.phpt schema039.phpt 
                                        schema040.phpt schema041.phpt 
                                        schema042.phpt schema043.phpt 
                                        schema044.phpt schema045.phpt 
                                        schema046.phpt schema047.phpt 
                                        schema048.phpt schema049.phpt 
                                        schema050.phpt schema051.phpt 
                                        schema052.phpt schema053.phpt 
                                        schema062.phpt schema064.phpt 
                                        schema065.phpt schema066.phpt 
                                        schema067.phpt schema069.phpt 
                                        schema070.phpt test_schema.inc 
  Log:
  Fixed bug #31422 (No Error-Logging on SoapServer-Side).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.198&r2=1.1760.2.199&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.198 php-src/NEWS:1.1760.2.199
--- php-src/NEWS:1.1760.2.198   Wed Jan 19 20:41:52 2005
+++ php-src/NEWS        Thu Jan 20 07:40:14 2005
@@ -12,6 +12,7 @@
   non-existent object ref). (Tony)
 - Fixed bug #31444 (Memory leak in zend_language_scanner.c).
   (hexer at studentcenter dot org)
+- Fixed bug #31422 (No Error-Logging on SoapServer-Side). (Dmitry)
 - Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe)
 - Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
 - Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.15&r2=1.110.2.16&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.15 php-src/ext/soap/soap.c:1.110.2.16
--- php-src/ext/soap/soap.c:1.110.2.15  Thu Jan 20 01:13:53 2005
+++ php-src/ext/soap/soap.c     Thu Jan 20 07:40:15 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: soap.c,v 1.110.2.15 2005/01/20 06:13:53 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.16 2005/01/20 12:40:15 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -615,7 +615,7 @@
        int found, name_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name, 
&name_len, &pzval) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "wrong number of 
parameters");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        enc = get_conversion(Z_TYPE_P(pzval));
@@ -631,7 +631,7 @@
        xmlNodePtr node;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &dom) == 
FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "wrong number of 
parameters");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        if (zend_hash_index_find(Z_OBJPROP_P(dom), 1, (void **)&addr) == 
FAILURE) {
@@ -652,7 +652,7 @@
        int name_length;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &data, 
&name, &name_length) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
 #ifndef ZEND_ENGINE_2
@@ -674,7 +674,7 @@
        zend_bool must_understand = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|zbz", &ns, 
&ns_len, &name, &name_len, &data, &must_understand, &actor) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        add_property_stringl(this_ptr, "namespace", ns, ns_len, 1);
@@ -692,7 +692,7 @@
        } else if (Z_TYPE_P(actor) == IS_STRING) {
                add_property_stringl(this_ptr, "actor", Z_STRVAL_P(actor), 
Z_STRLEN_P(actor), 1);
        } else {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 }
 
@@ -709,7 +709,7 @@
                &fault_string, &fault_string_len,
                &fault_actor, &fault_actor_len,
                &details, &name, &name_len, &headerfault) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        set_soap_fault(this_ptr, fault_code, fault_string, fault_actor, 
details, name TSRMLS_CC);
@@ -770,7 +770,7 @@
        int stype_len, ns_len, name_len, namens_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!z|ssss", &data, 
&type, &stype, &stype_len, &ns, &ns_len, &name, &name_len, &namens, 
&namens_len) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        if (Z_TYPE_P(type) == IS_NULL) {
@@ -818,14 +818,14 @@
        SOAP_SERVER_BEGIN_CODE();
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &wsdl, 
&options) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        if (Z_TYPE_P(wsdl) == IS_STRING) {
        } else if (Z_TYPE_P(wsdl) == IS_NULL) {
                wsdl = NULL;
        } else {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        service = emalloc(sizeof(soapService));
@@ -1022,7 +1022,7 @@
                smart_str_free(&resloved_ns);
        } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 
ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &type, &type_len, &class_name, 
&class_name_len, &type) == SUCCESS) {
        } else {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Wrong number of 
parameters");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 }
 #endif
@@ -1178,7 +1178,7 @@
        FETCH_THIS_SERVICE(service);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", 
&function_name) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters 
passed");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        /* TODO: could use zend_is_callable here */
@@ -1284,7 +1284,7 @@
        FETCH_THIS_SERVICE(service);
        SOAP_GLOBAL(soap_version) = service->version;
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &arg, 
&arg_len) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters 
passed");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
        INIT_ZVAL(retval);
 
@@ -1794,63 +1794,106 @@
                return;
        }
 
-       /*
-         Trap all errors
-         What do do with these warnings
-           E_WARNING, E_NOTICE, E_CORE_WARNING, E_COMPILE_WARNING, 
E_USER_WARNING, E_USER_NOTICE
-        */
-       if (error_num == E_USER_ERROR || error_num == E_COMPILE_ERROR || 
error_num == E_CORE_ERROR ||
-               error_num == E_ERROR || error_num == E_PARSE) {
-               char* code = SOAP_GLOBAL(error_code);
-               char buffer[1024];
-               int buffer_len;
-               zval outbuf, outbuflen;
-
-               INIT_ZVAL(outbuf);
-               INIT_ZVAL(outbuflen);
-
-               buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args);
-               buffer[sizeof(buffer)-1]=0;
-               if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {
-                       buffer_len = sizeof(buffer) - 1;
-               }
-               if (SOAP_GLOBAL(error_object) &&
-                   Z_TYPE_P(SOAP_GLOBAL(error_object)) == IS_OBJECT &&
-                   Z_OBJCE_P(SOAP_GLOBAL(error_object)) == soap_class_entry) {
+       if (SOAP_GLOBAL(error_object) &&
+           Z_TYPE_P(SOAP_GLOBAL(error_object)) == IS_OBJECT &&
+           instanceof_function(Z_OBJCE_P(SOAP_GLOBAL(error_object)), 
soap_class_entry TSRMLS_CC)) {
 #ifdef ZEND_ENGINE_2
-                       zval **tmp;
+               zval **tmp;
 
-                       if 
(zend_hash_find(Z_OBJPROP_P(SOAP_GLOBAL(error_object)), "_exceptions", 
sizeof("_exceptions"), (void **) &tmp) != SUCCESS ||
-                           Z_TYPE_PP(tmp) != IS_BOOL || Z_LVAL_PP(tmp) != 0) {
-                               zval *fault, *exception;
-
-                               if (code == NULL) {
-                                       code = "Client";
-                               }
-                               fault = 
add_soap_fault(SOAP_GLOBAL(error_object), code, buffer, NULL, NULL TSRMLS_CC);
-                               MAKE_STD_ZVAL(exception);
-                               *exception = *fault;
-                               zval_copy_ctor(exception);
-                               INIT_PZVAL(exception);
-                               zend_throw_exception_object(exception 
TSRMLS_CC);
-                               zend_bailout();
-                       } else {
-                               old_error_handler(error_num, error_filename, 
error_lineno, format, args);
+               if ((error_num == E_USER_ERROR || 
+                    error_num == E_COMPILE_ERROR || 
+                    error_num == E_CORE_ERROR ||
+                    error_num == E_ERROR || 
+                    error_num == E_PARSE) &&
+                   (zend_hash_find(Z_OBJPROP_P(SOAP_GLOBAL(error_object)), 
"_exceptions", sizeof("_exceptions"), (void **) &tmp) != SUCCESS ||
+                    Z_TYPE_PP(tmp) != IS_BOOL || Z_LVAL_PP(tmp) != 0)) {
+                       zval *fault, *exception;
+                       char* code = SOAP_GLOBAL(error_code);
+                       char buffer[1024];
+                       int buffer_len;
+                       zval outbuf, outbuflen;
+                       int old = PG(display_errors);
+
+                       INIT_ZVAL(outbuf);
+                       INIT_ZVAL(outbuflen);
+
+                       buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, args);
+                       buffer[sizeof(buffer)-1]=0;
+                       if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {
+                               buffer_len = sizeof(buffer) - 1;
                        }
-#else
+
+                       if (code == NULL) {
+                               code = "Client";
+                       }
+                       fault = add_soap_fault(SOAP_GLOBAL(error_object), code, 
buffer, NULL, NULL TSRMLS_CC);
+                       MAKE_STD_ZVAL(exception);
+                       *exception = *fault;
+                       zval_copy_ctor(exception);
+                       INIT_PZVAL(exception);
+                       zend_throw_exception_object(exception TSRMLS_CC);
+
+                       PG(display_errors) = 0;
+                       zend_try {
+                               old_error_handler(error_num, error_filename, 
error_lineno, format, args);
+                       } zend_catch {
+                       } zend_end_try();
+                       PG(display_errors) = 1;
+                       zend_bailout();
+               } else {
                        old_error_handler(error_num, error_filename, 
error_lineno, format, args);
+               }
+#else
+               old_error_handler(error_num, error_filename, error_lineno, 
format, args);
 #endif
-               } else {
+       } else {
+               int old = PG(display_errors);
+               int fault = 0;
+               zval fault_obj;
+
+               if (error_num == E_USER_ERROR || 
+                   error_num == E_COMPILE_ERROR || 
+                   error_num == E_CORE_ERROR ||
+                   error_num == E_ERROR || 
+                   error_num == E_PARSE) {
+
+                       char* code = SOAP_GLOBAL(error_code);
+                       char buffer[1024];
+                       int buffer_len;
+                       zval outbuf, outbuflen;
+
+                       INIT_ZVAL(outbuf);
+                       INIT_ZVAL(outbuflen);
+
+                       buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, args);
+                       buffer[sizeof(buffer)-1]=0;
+                       if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {
+                               buffer_len = sizeof(buffer) - 1;
+                       }
+
                        if (code == NULL) {
                                code = "Server";
                        }
                        /* Get output buffer and send as fault detials */
                        if (php_ob_get_length(&outbuflen TSRMLS_CC) != FAILURE 
&& Z_LVAL(outbuflen) != 0) {
-                               php_ob_get_buffer(&outbuf TSRMLS_CC);
+                   php_ob_get_buffer(&outbuf TSRMLS_CC);
                        }
                        php_end_ob_buffer(0, 0 TSRMLS_CC);
 
-                       soap_server_fault(code, buffer, NULL, &outbuf, NULL 
TSRMLS_CC);
+                       INIT_ZVAL(fault_obj);
+                       set_soap_fault(&fault_obj, code, buffer, NULL, &outbuf, 
NULL TSRMLS_CC);
+                       fault = 1;
+               }
+
+               PG(display_errors) = 0;
+               zend_try {
+                       old_error_handler(error_num, error_filename, 
error_lineno, format, args);
+               } zend_catch {
+               } zend_end_try();
+               PG(display_errors) = old;
+
+               if (fault) {
+                       soap_server_fault_ex(NULL, &fault_obj, NULL TSRMLS_CC);
                }
        }
 }
@@ -1891,13 +1934,13 @@
        SOAP_CLIENT_BEGIN_CODE();
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &wsdl, 
&options) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid 
parameters.");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
                return;
        }
 
        if (Z_TYPE_P(wsdl) == IS_STRING) {
        } else if (Z_TYPE_P(wsdl) != IS_NULL ) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "$wsdl must be string 
or null.");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "$wsdl must be string 
or null");
                return;
        } else {
                wsdl = NULL;
@@ -1912,7 +1955,7 @@
                            Z_TYPE_PP(tmp) == IS_STRING) {
                                add_property_stringl(this_ptr, "location", 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"'location' option is requred in nonWSDL mode.");
+                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"'location' option is requred in nonWSDL mode");
                                return;
                        }
 
@@ -1920,7 +1963,7 @@
                            Z_TYPE_PP(tmp) == IS_STRING) {
                                add_property_stringl(this_ptr, "uri", 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"'uri' option is requred in nonWSDL mode.");
+                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"'uri' option is requred in nonWSDL mode");
                                return;
                        }
 
@@ -2002,7 +2045,7 @@
                
                        encoding = xmlFindCharEncodingHandler(Z_STRVAL_PP(tmp));
        if (encoding == NULL) {
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"Invalid 'encoding' option - '%s'.", Z_STRVAL_PP(tmp));
+                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"Invalid 'encoding' option - '%s'", Z_STRVAL_PP(tmp));
            } else {
                    xmlCharEncCloseFunc(encoding);
                                add_property_stringl(this_ptr, "_encoding", 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);                     
@@ -2021,7 +2064,7 @@
                        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.");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "'location' and 'uri' 
options are requred in nonWSDL mode");
                return;
        }
 
@@ -2097,6 +2140,7 @@
                add_soap_fault(this_ptr, "Client", "SoapSlient::__doRequest() 
failed", NULL, NULL TSRMLS_CC);
                ret = FALSE;
        } else if (Z_TYPE_P(response) != IS_STRING) {
+               add_soap_fault(this_ptr, "Client", "SoapSlient::__doRequest() 
returned non string value", NULL, NULL TSRMLS_CC);
                ret = FALSE;
        } else if (zend_hash_find(Z_OBJPROP_P(this_ptr), "trace", 
sizeof("trace"), (void **) &trace) == SUCCESS &&
            Z_LVAL_PP(trace) > 0) {
@@ -2296,7 +2340,7 @@
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|zzz",
                &function, &function_len, &args, &options, &headers, 
&output_headers) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
 
        if (options) {
@@ -2314,7 +2358,7 @@
                                soap_action = Z_STRVAL_PP(tmp);
                        }
                } else if (Z_TYPE_P(options) != IS_NULL) {
-                       php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid 
arguments");
+                       php_error_docref(NULL TSRMLS_CC, E_ERROR, "first 
parameter must be string or null");
                }
        }
 
@@ -2327,7 +2371,7 @@
                while (zend_hash_get_current_data(soap_headers, (void**)&tmp) 
== SUCCESS) {
                        if (Z_TYPE_PP(tmp) != IS_OBJECT ||
                            Z_OBJCE_PP(tmp) != soap_header_class_entry) {
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"Invalid arguments");
+                               php_error_docref(NULL TSRMLS_CC, E_ERROR, 
"Invalid SOAP header");
                        }
                        zend_hash_move_forward(soap_headers);
                }
@@ -2338,7 +2382,7 @@
                zend_hash_next_index_insert(soap_headers, &headers, 
sizeof(zval*), NULL);
          headers = NULL;
        } else{
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid SOAP 
header");
        }
 
        arg_count = zend_hash_num_elements(Z_ARRVAL_P(args));
@@ -2491,7 +2535,7 @@
            &location, &location_size,
            &action, &action_size,
            &version) == FAILURE) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "wrong parameters");
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
        }
        if (make_http_soap_request(this_ptr, buf, buf_size, location, action, 
version,
            &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value) TSRMLS_CC)) {
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema030.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema030.phpt
diff -u php-src/ext/soap/tests/schema/schema030.phpt:1.1 
php-src/ext/soap/tests/schema/schema030.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema030.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema030.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["str"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema031.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema031.phpt
diff -u php-src/ext/soap/tests/schema/schema031.phpt:1.1 
php-src/ext/soap/tests/schema/schema031.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema031.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema031.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["str"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema032.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema032.phpt
diff -u php-src/ext/soap/tests/schema/schema032.phpt:1.1 
php-src/ext/soap/tests/schema/schema032.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema032.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema032.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int 
xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (1) {
+object(stdClass)#%d (1) {
   ["int"]=>
   int(123)
 }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema033.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema033.phpt
diff -u php-src/ext/soap/tests/schema/schema033.phpt:1.1 
php-src/ext/soap/tests/schema/schema033.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema033.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema033.phpt        Thu Jan 20 07:40:15 2005
@@ -21,14 +21,14 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"nest"=>array("int"=>123.5)));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><nest 
xsi:type="ns1:testType2"><int 
xsi:type="xsd:int">123</int></nest></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["nest"]=>
-  object(stdClass)#6 (1) {
+  object(stdClass)#%d (1) {
     ["int"]=>
     int(123)
   }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema034.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema034.phpt
diff -u php-src/ext/soap/tests/schema/schema034.phpt:1.1 
php-src/ext/soap/tests/schema/schema034.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema034.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema034.phpt        Thu Jan 20 07:40:15 2005
@@ -22,14 +22,14 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5)));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><testType2 
xsi:type="ns1:testType2"><int 
xsi:type="xsd:int">123</int></testType2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["testType2"]=>
-  object(stdClass)#6 (1) {
+  object(stdClass)#%d (1) {
     ["int"]=>
     int(123)
   }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema035.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema035.phpt
diff -u php-src/ext/soap/tests/schema/schema035.phpt:1.1 
php-src/ext/soap/tests/schema/schema035.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema035.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema035.phpt        Thu Jan 20 07:40:15 2005
@@ -23,14 +23,14 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5)));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><testType2 
xsi:type="ns1:testType2"><int 
xsi:type="xsd:int">123</int></testType2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["testType2"]=>
-  object(stdClass)#6 (1) {
+  object(stdClass)#%d (1) {
     ["int"]=>
     int(123)
   }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema036.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema036.phpt
diff -u php-src/ext/soap/tests/schema/schema036.phpt:1.1 
php-src/ext/soap/tests/schema/schema036.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema036.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema036.phpt        Thu Jan 20 07:40:15 2005
@@ -22,14 +22,14 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5)));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><testType2 
xsi:type="ns1:testType2"><int 
xsi:type="xsd:int">123</int></testType2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["testType2"]=>
-  object(stdClass)#6 (1) {
+  object(stdClass)#%d (1) {
     ["int"]=>
     int(123)
   }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema037.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema037.phpt
diff -u php-src/ext/soap/tests/schema/schema037.phpt:1.1 
php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema037.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema037.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 int="123" xsi:type="ns1:testType"><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema038.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema038.phpt
diff -u php-src/ext/soap/tests/schema/schema038.phpt:1.1 
php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema038.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema038.phpt        Thu Jan 20 07:40:15 2005
@@ -17,10 +17,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 int="123" xsi:type="ns1:testType"><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema039.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema039.phpt
diff -u php-src/ext/soap/tests/schema/schema039.phpt:1.1 
php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema039.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema039.phpt        Thu Jan 20 07:40:15 2005
@@ -19,10 +19,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 int="123" xsi:type="ns1:testType"><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema040.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema040.phpt
diff -u php-src/ext/soap/tests/schema/schema040.phpt:1.1 
php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema040.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema040.phpt        Thu Jan 20 07:40:15 2005
@@ -20,10 +20,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 int="123" xsi:type="ns1:testType"><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema041.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema041.phpt
diff -u php-src/ext/soap/tests/schema/schema041.phpt:1.1 
php-src/ext/soap/tests/schema/schema041.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema041.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema041.phpt        Thu Jan 20 07:40:15 2005
@@ -19,10 +19,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><str 
xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["str"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema042.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema042.phpt
diff -u php-src/ext/soap/tests/schema/schema042.phpt:1.1 
php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema042.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema042.phpt        Thu Jan 20 07:40:15 2005
@@ -17,10 +17,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" 
int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["_"]=>
   int(123)
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema043.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema043.phpt
diff -u php-src/ext/soap/tests/schema/schema043.phpt:1.1 
php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema043.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema043.phpt        Thu Jan 20 07:40:15 2005
@@ -24,10 +24,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" int="123" 
int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (3) {
+object(stdClass)#%d (3) {
   ["_"]=>
   int(123)
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema044.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema044.phpt
diff -u php-src/ext/soap/tests/schema/schema044.phpt:1.1 
php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema044.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema044.phpt        Thu Jan 20 07:40:15 2005
@@ -17,10 +17,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" 
int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["_"]=>
   int(123)
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema045.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema045.phpt
diff -u php-src/ext/soap/tests/schema/schema045.phpt:1.1 
php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema045.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema045.phpt        Thu Jan 20 07:40:15 2005
@@ -24,10 +24,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" 
int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["_"]=>
   int(123)
   ["int2"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema046.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema046.phpt
diff -u php-src/ext/soap/tests/schema/schema046.phpt:1.1 
php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema046.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema046.phpt        Thu Jan 20 07:40:15 2005
@@ -24,10 +24,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" int="123" 
int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (3) {
+object(stdClass)#%d (3) {
   ["_"]=>
   int(123)
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema047.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema047.phpt
diff -u php-src/ext/soap/tests/schema/schema047.phpt:1.1 
php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema047.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema047.phpt        Thu Jan 20 07:40:15 2005
@@ -22,10 +22,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" int2="123"><int 
xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["int2"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema048.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema048.phpt
diff -u php-src/ext/soap/tests/schema/schema048.phpt:1.1 
php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema048.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema048.phpt        Thu Jan 20 07:40:15 2005
@@ -24,10 +24,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType" 
int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["_"]=>
   int(123)
   ["int2"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema049.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema049.phpt
diff -u php-src/ext/soap/tests/schema/schema049.phpt:1.1 
php-src/ext/soap/tests/schema/schema049.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema049.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema049.phpt        Thu Jan 20 07:40:15 2005
@@ -24,10 +24,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int2 
xsi:type="xsd:int">123</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (1) {
+object(stdClass)#%d (1) {
   ["int2"]=>
   int(123)
 }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema050.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema050.phpt
diff -u php-src/ext/soap/tests/schema/schema050.phpt:1.1 
php-src/ext/soap/tests/schema/schema050.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema050.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema050.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><int2 
xsi:type="xsd:int">123</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["int2"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema051.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema051.phpt
diff -u php-src/ext/soap/tests/schema/schema051.phpt:1.1 
php-src/ext/soap/tests/schema/schema051.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema051.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema051.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array(123.5,456.7)));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><int2 
xsi:type="xsd:int">123</int2><int2 
xsi:type="xsd:int">456</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["int2"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema052.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema052.phpt
diff -u php-src/ext/soap/tests/schema/schema052.phpt:1.1 
php-src/ext/soap/tests/schema/schema052.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema052.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema052.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array(123.5)));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><int2 
xsi:type="xsd:int">123</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["int"]=>
   int(123)
   ["int2"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema053.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema053.phpt
diff -u php-src/ext/soap/tests/schema/schema053.phpt:1.1 
php-src/ext/soap/tests/schema/schema053.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema053.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema053.phpt        Thu Jan 20 07:40:15 2005
@@ -16,10 +16,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array()));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><int 
xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (1) {
+object(stdClass)#%d (1) {
   ["int"]=>
   int(123)
 }
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema062.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema062.phpt
diff -u php-src/ext/soap/tests/schema/schema062.phpt:1.1 
php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema062.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema062.phpt        Thu Jan 20 07:40:15 2005
@@ -17,10 +17,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("_"=>NULL,"int"=>123.5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:nil="1" int="123" 
xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["_"]=>
   NULL
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema064.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema064.phpt
diff -u php-src/ext/soap/tests/schema/schema064.phpt:1.1 
php-src/ext/soap/tests/schema/schema064.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema064.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema064.phpt        Thu Jan 20 07:40:15 2005
@@ -33,10 +33,10 @@
 ));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 xsi:type="ns1:testType"><dateTime 
xsi:type="xsd:dateTime">1976-04-05T01:02:03Z</dateTime><time 
xsi:type="xsd:time">01:02:03Z</time><date 
xsi:type="xsd:date">1976-04-05Z</date><gYearMonth 
xsi:type="xsd:gYearMonth">1976-04Z</gYearMonth><gYear 
xsi:type="xsd:gYear">1976Z</gYear><gMonthDay 
xsi:type="xsd:gMonthDay">--04-05Z</gMonthDay><gDay 
xsi:type="xsd:gDay">---05Z</gDay><gMonth 
xsi:type="xsd:gMonth">--04--Z</gMonth></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#4 (8) {
+object(stdClass)#%d (8) {
   ["dateTime"]=>
   string(20) "1976-04-05T01:02:03Z"
   ["time"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema065.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema065.phpt
diff -u php-src/ext/soap/tests/schema/schema065.phpt:1.1 
php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema065.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema065.phpt        Thu Jan 20 07:40:15 2005
@@ -14,10 +14,10 @@
 test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 str="str" 
xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema066.phpt?r1=1.2&r2=1.2.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema066.phpt
diff -u php-src/ext/soap/tests/schema/schema066.phpt:1.2 
php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.1
--- php-src/ext/soap/tests/schema/schema066.phpt:1.2    Tue Feb 24 05:14:09 2004
+++ php-src/ext/soap/tests/schema/schema066.phpt        Thu Jan 20 07:40:15 2005
@@ -14,10 +14,10 @@
 test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 str="str" 
xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema067.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema067.phpt
diff -u php-src/ext/soap/tests/schema/schema067.phpt:1.1 
php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema067.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema067.phpt        Thu Jan 20 07:40:15 2005
@@ -14,10 +14,10 @@
 
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>5));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 str="str" int="5" 
xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema069.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema069.phpt
diff -u php-src/ext/soap/tests/schema/schema069.phpt:1.1 
php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema069.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema069.phpt        Thu Jan 20 07:40:15 2005
@@ -15,10 +15,10 @@
 test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 str="str" 
xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema070.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/soap/tests/schema/schema070.phpt
diff -u php-src/ext/soap/tests/schema/schema070.phpt:1.1 
php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.1
--- php-src/ext/soap/tests/schema/schema070.phpt:1.1    Wed Jan 28 08:33:48 2004
+++ php-src/ext/soap/tests/schema/schema070.phpt        Thu Jan 20 07:40:15 2005
@@ -17,10 +17,10 @@
 test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
 echo "ok";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://test-uri/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><testParam
 str="str" 
xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (2) {
+object(stdClass)#%d (2) {
   ["str"]=>
   string(3) "str"
   ["int"]=>
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/test_schema.inc?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/soap/tests/schema/test_schema.inc
diff -u php-src/ext/soap/tests/schema/test_schema.inc:1.6 
php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.1
--- php-src/ext/soap/tests/schema/test_schema.inc:1.6   Fri Feb 27 09:52:23 2004
+++ php-src/ext/soap/tests/schema/test_schema.inc       Thu Jan 20 07:40:15 2005
@@ -62,13 +62,15 @@
   $x->test($param);
   $xml = xml_parser_create();
   $req = $x->__getlastrequest();
-  echo $req;
   if ($style == "rpc") {
     $HTTP_RAW_POST_DATA = $req;
     ob_start();
     $y->handle();
     ob_end_clean();
+    echo $req;
     var_dump($val);
+  } else {
+    echo $req;
   }
 }
 ?>
\ No newline at end of file

http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug31422.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug31422.phpt
+++ php-src/ext/soap/tests/bugs/bug31422.phpt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to