- MFH: Added arginfo

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 14d80cb6d188cff98160b29d4467818d26e652ef..529c2779995e17fabf893049efd9b4c0bab749ee 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -277,14 +277,219 @@ PHP_METHOD(SoapHeader, SoapHeader);
 
 #define SOAP_CTOR(class_name, func_name, arginfo, flags) PHP_ME(class_name, func_name, arginfo, flags)
 
+/* {{{ arginfo */
+#ifdef ZEND_ENGINE_2
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapparam_soapparam, 0, 0, 2)
+       ZEND_ARG_INFO(0, data)
+       ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapheader_soapheader, 0, 0, 2)
+       ZEND_ARG_INFO(0, namespace)
+       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, data)
+       ZEND_ARG_INFO(0, mustunderstand)
+       ZEND_ARG_INFO(0, actor)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapfault_soapfault, 0, 0, 2)
+       ZEND_ARG_INFO(0, faultcode)
+       ZEND_ARG_INFO(0, faultstring)
+       ZEND_ARG_INFO(0, faultactor)
+       ZEND_ARG_INFO(0, detail)
+       ZEND_ARG_INFO(0, faultname)
+       ZEND_ARG_INFO(0, headerfault)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapvar_soapvar, 0, 0, 2)
+       ZEND_ARG_INFO(0, data)
+       ZEND_ARG_INFO(0, encoding)
+       ZEND_ARG_INFO(0, type_name)
+       ZEND_ARG_INFO(0, type_namespace)
+       ZEND_ARG_INFO(0, node_name)
+       ZEND_ARG_INFO(0, node_namespace)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_fault, 0, 0, 2)
+       ZEND_ARG_INFO(0, code)
+       ZEND_ARG_INFO(0, string)
+       ZEND_ARG_INFO(0, actor)
+       ZEND_ARG_INFO(0, details)
+       ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_addsoapheader, 0, 0, 1)
+       ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_soapserver, 0, 0, 1)
+       ZEND_ARG_INFO(0, wsdl)
+       ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setpersistence, 0, 0, 1)
+       ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setclass, 0, 0, 1)
+       ZEND_ARG_INFO(0, class_name)
+       ZEND_ARG_INFO(0, args)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setobject, 0, 0, 1)
+       ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapserver_getfunctions, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_addfunction, 0, 0, 1)
+       ZEND_ARG_INFO(0, functions)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_handle, 0, 0, 0)
+       ZEND_ARG_INFO(0, soap_request)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient_soapclient, 0, 0, 1)
+       ZEND_ARG_INFO(0, wsdl)
+       ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___call, 0, 0, 2)
+       ZEND_ARG_INFO(0, function_name)
+       ZEND_ARG_INFO(0, arguments)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___soapcall, 0, 0, 2)
+       ZEND_ARG_INFO(0, function_name)
+       ZEND_ARG_INFO(0, arguments)
+       ZEND_ARG_INFO(0, options)
+       ZEND_ARG_INFO(0, input_headers)
+       ZEND_ARG_INFO(1, output_headers)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getfunctions, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapclient___gettypes, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastrequest, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastresponse, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastrequestheaders, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastresponseheaders, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___dorequest, 0, 0, 4)
+       ZEND_ARG_INFO(0, request)
+       ZEND_ARG_INFO(0, location)
+       ZEND_ARG_INFO(0, action)
+       ZEND_ARG_INFO(0, version)
+       ZEND_ARG_INFO(0, one_way)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setcookie, 0, 0, 1)
+       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setsoapheaders, 0, 0, 1)
+       ZEND_ARG_INFO(0, soapheaders)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setlocation, 0, 0, 0)
+       ZEND_ARG_INFO(0, new_location)
+ZEND_END_ARG_INFO()
+
+static 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soap_use_soap_error_handler, 0, 0, 0)
+       ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO()
+
+static 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_soap_is_soap_fault, 0, 0, 1)
+       ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+#else
+unsigned char arginfo_soapclient___call[] = { 2, BYREF_NONE, BYREF_NONE };
+unsigned char arginfo_soapclient___soapcall[] = { 5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
+# define arginfo_soapclient_soapclient                                         NULL
+# define arginfo_soapclient___getlastrequest                   NULL
+# define arginfo_soapclient___getlastresponse                  NULL
+# define arginfo_soapclient___getlastrequestheaders    NULL
+# define arginfo_soapclient___getlastresponseheaders   NULL
+# define arginfo_soapclient___getfunctions                             NULL
+# define arginfo_soapclient___gettypes                                 NULL
+# define arginfo_soapclient___dorequest                                        NULL
+# define arginfo_soapclient___setcookie                                        NULL
+# define arginfo_soapclient___setlocation                              NULL
+# define arginfo_soapclient___setsoapheaders                   NULL
+
+# define arginfo_soapserver_soapserver                                 NULL
+# define arginfo_soapserver_setpersistence                             NULL
+# define arginfo_soapserver_setclass                                   NULL
+# define arginfo_soapserver_setobject                                  NULL
+# define arginfo_soapserver_addfunction                                        NULL
+# define arginfo_soapserver_getfunctions                               NULL
+# defina arginfo_soapserver_handle                                             NULL
+# define arginfo_soapserver_fault                                              NULL
+# define arginfo_soapserver_addsoapheader                              NULL
+
+# define arginfo_soapvar_soapvar                                               NULL
+
+# define arginfo_soapfault_soapfault                                   NULL
+
+# define arginfo_soapheader_soapheader                                 NULL
+
+# define arginfo_soapparam_soapparam                                   NULL
+
+# define arginfo_soap_use_soap_error_handler                   NULL
+
+# define arginfo_soap_is_soap_fault                                            NULL
+#endif
+/* }}} */
+
 static const zend_function_entry soap_functions[] = {
-       PHP_FE(use_soap_error_handler, NULL)
-       PHP_FE(is_soap_fault, NULL)
+       PHP_FE(use_soap_error_handler,  arginfo_soap_use_soap_error_handler)
+       PHP_FE(is_soap_fault,                   arginfo_soap_is_soap_fault)
        {NULL, NULL, NULL}
 };
 
 static const zend_function_entry soap_fault_functions[] = {
-       SOAP_CTOR(SoapFault, SoapFault, NULL, 0)
+       SOAP_CTOR(SoapFault, SoapFault, arginfo_soapfault_soapfault, 0)
 #ifdef ZEND_ENGINE_2
        PHP_ME(SoapFault, __toString, NULL, 0)
 #endif
@@ -292,64 +497,47 @@ static const zend_function_entry soap_fault_functions[] = {
 };
 
 static const zend_function_entry soap_server_functions[] = {
-       SOAP_CTOR(SoapServer, SoapServer, NULL, 0)
-       PHP_ME(SoapServer, setPersistence, NULL, 0)
-       PHP_ME(SoapServer, setClass, NULL, 0)
-       PHP_ME(SoapServer, setObject, NULL, 0)
-       PHP_ME(SoapServer, addFunction, NULL, 0)
-       PHP_ME(SoapServer, getFunctions, NULL, 0)
-       PHP_ME(SoapServer, handle, NULL, 0)
-       PHP_ME(SoapServer, fault, NULL, 0)
-       PHP_ME(SoapServer, addSoapHeader, NULL, 0)
+       SOAP_CTOR(SoapServer, SoapServer,       arginfo_soapserver_soapserver, 0)
+       PHP_ME(SoapServer, setPersistence,      arginfo_soapserver_setpersistence, 0)
+       PHP_ME(SoapServer, setClass,            arginfo_soapserver_setclass, 0)
+       PHP_ME(SoapServer, setObject,           arginfo_soapserver_setobject, 0)
+       PHP_ME(SoapServer, addFunction,         arginfo_soapserver_addfunction, 0)
+       PHP_ME(SoapServer, getFunctions,        arginfo_soapserver_getfunctions, 0)
+       PHP_ME(SoapServer, handle,                      arginfo_soapserver_handle, 0)
+       PHP_ME(SoapServer, fault,                       arginfo_soapserver_fault, 0)
+       PHP_ME(SoapServer, addSoapHeader,       arginfo_soapserver_addsoapheader, 0)
        {NULL, NULL, NULL}
 };
 
-#ifdef ZEND_ENGINE_2
-ZEND_BEGIN_ARG_INFO(__call_args, 0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(__soap_call_args, 0, 0, 2)
-       ZEND_ARG_INFO(0, function_name)
-       ZEND_ARG_INFO(0, arguments)
-       ZEND_ARG_INFO(0, options)
-       ZEND_ARG_INFO(0, input_headers)
-       ZEND_ARG_INFO(1, output_headers)
-ZEND_END_ARG_INFO()
-#else
-unsigned char __call_args[] = { 2, BYREF_NONE, BYREF_NONE };
-unsigned char __soap_call_args[] = { 5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
-#endif
-
 static const zend_function_entry soap_client_functions[] = {
-       SOAP_CTOR(SoapClient, SoapClient, NULL, 0)
-       PHP_ME(SoapClient, __call, __call_args, 0)
-       ZEND_NAMED_ME(__soapCall, ZEND_MN(SoapClient___call), __soap_call_args, 0)
-       PHP_ME(SoapClient, __getLastRequest, NULL, 0)
-       PHP_ME(SoapClient, __getLastResponse, NULL, 0)
-       PHP_ME(SoapClient, __getLastRequestHeaders, NULL, 0)
-       PHP_ME(SoapClient, __getLastResponseHeaders, NULL, 0)
-       PHP_ME(SoapClient, __getFunctions, NULL, 0)
-       PHP_ME(SoapClient, __getTypes, NULL, 0)
-       PHP_ME(SoapClient, __doRequest, NULL, 0)
-       PHP_ME(SoapClient, __setCookie, NULL, 0)
-       PHP_ME(SoapClient, __setLocation, NULL, 0)
-       PHP_ME(SoapClient, __setSoapHeaders, NULL, 0)
+       SOAP_CTOR(SoapClient, SoapClient, arginfo_soapclient_soapclient, 0)
+       PHP_ME(SoapClient, __call,                                              arginfo_soapclient___call, 0)
+       ZEND_NAMED_ME(__soapCall, ZEND_MN(SoapClient___call), arginfo_soapclient___soapcall, 0)
+       PHP_ME(SoapClient, __getLastRequest,                    arginfo_soapclient___getlastrequest, 0)
+       PHP_ME(SoapClient, __getLastResponse,                   arginfo_soapclient___getlastresponse, 0)
+       PHP_ME(SoapClient, __getLastRequestHeaders,     arginfo_soapclient___getlastrequestheaders, 0)
+       PHP_ME(SoapClient, __getLastResponseHeaders,    arginfo_soapclient___getlastresponseheaders, 0)
+       PHP_ME(SoapClient, __getFunctions,                              arginfo_soapclient___getfunctions, 0)
+       PHP_ME(SoapClient, __getTypes,                                  arginfo_soapclient___gettypes, 0)
+       PHP_ME(SoapClient, __doRequest,                                 arginfo_soapclient___dorequest, 0)
+       PHP_ME(SoapClient, __setCookie,                                 arginfo_soapclient___setcookie, 0)
+       PHP_ME(SoapClient, __setLocation,                               arginfo_soapclient___setlocation, 0)
+       PHP_ME(SoapClient, __setSoapHeaders,                    arginfo_soapclient___setsoapheaders, 0)
        {NULL, NULL, NULL}
 };
 
 static const zend_function_entry soap_var_functions[] = {
-       SOAP_CTOR(SoapVar, SoapVar, NULL, 0)
+       SOAP_CTOR(SoapVar, SoapVar, arginfo_soapvar_soapvar, 0)
        {NULL, NULL, NULL}
 };
 
 static const zend_function_entry soap_param_functions[] = {
-       SOAP_CTOR(SoapParam, SoapParam, NULL, 0)
+       SOAP_CTOR(SoapParam, SoapParam, arginfo_soapparam_soapparam, 0)
        {NULL, NULL, NULL}
 };
 
 static const zend_function_entry soap_header_functions[] = {
-       SOAP_CTOR(SoapHeader, SoapHeader, NULL, 0)
+       SOAP_CTOR(SoapHeader, SoapHeader, arginfo_soapheader_soapheader, 0)
        {NULL, NULL, NULL}
 };
 

diff --git a/ext/soap/tests/any.phpt b/ext/soap/tests/any.phpt
index f41fcdfc79b9f5eef919aaa4718fe003d6763138..93a0e6693a83700d9090786c6e3c2b59b27f7515 100755 (executable)
--- a/ext/soap/tests/any.phpt
+++ b/ext/soap/tests/any.phpt
@@ -35,7 +35,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('echoAnyElement');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug28969.phpt b/ext/soap/tests/bugs/bug28969.phpt
index 6634888eac1807f0d8ec231be214548739e11639..dd8c3a162c62aa19c69af1d332aca063c09303f2 100644 (file)
--- a/ext/soap/tests/bugs/bug28969.phpt
+++ b/ext/soap/tests/bugs/bug28969.phpt
@@ -17,7 +17,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug29795.phpt b/ext/soap/tests/bugs/bug29795.phpt
index cb78cfcb64df1b8bd1133996858fa54f2c6668c9..388caa60b6c220d3bd5b0fa75baf3260e96d92bf 100644 (file)
--- a/ext/soap/tests/bugs/bug29795.phpt
+++ b/ext/soap/tests/bugs/bug29795.phpt
@@ -12,7 +12,7 @@ class LocalSoapClient extends SoapClient {
     parent::__construct($wsdl, $options);
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" 
 xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 

diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
index 0b0e0baf496f00185529e7b151cd6c075c3fbbde..11d924ec7851199ee590792aaf931292e073c5f7 100644 (file)
--- a/ext/soap/tests/bugs/bug29839.phpt
+++ b/ext/soap/tests/bugs/bug29839.phpt
@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('EchoString');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt
index c96b14d40cfa96740590f1af191c527c96d61d7f..efaccbc31a7e48bd885732c8ae3383d6a3a933a1 100644 (file)
--- a/ext/soap/tests/bugs/bug29844.phpt
+++ b/ext/soap/tests/bugs/bug29844.phpt
@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setClass('hello_world');;
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt
index e119b71d76cf6f3d2371455318b1659ec27ac5e9..281f958202d326fbbec1e83added7c1428f31373 100644 (file)
--- a/ext/soap/tests/bugs/bug30045.phpt
+++ b/ext/soap/tests/bugs/bug30045.phpt
@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('foo');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     $xml = simplexml_load_string($request);
     echo $xml->children("http://schemas.xmlsoap.org/soap/envelope/")->Body->children("http://test-uri")->children()->param1->asXML(),"\n";
     unset($xml);

diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt
index 6cd2396d522054bcb5a735e598b90eb28f2c3662..2104c6d409ec0b442d4b7c05a749b9a563d26224 100644 (file)
--- a/ext/soap/tests/bugs/bug30106.phpt
+++ b/ext/soap/tests/bugs/bug30106.phpt
@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {
                $this->server->addFunction("getContinentList"); 
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
        echo $request;
     ob_start();
     $this->server->handle($request);

diff --git a/ext/soap/tests/bugs/bug30175.phpt b/ext/soap/tests/bugs/bug30175.phpt
index f5501ac9bdce5a426c4d3034b8e4bb2f51eefb1e..8d721ea69d62eb3c841b22225f903d4bd3dee74b 100644 (file)
--- a/ext/soap/tests/bugs/bug30175.phpt
+++ b/ext/soap/tests/bugs/bug30175.phpt
@@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0
 
 class LocalSoapClient extends SoapClient {
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope

diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt
index cd4a4f2a81cb37eb0bc7d1a01b89ff3512ae05f3..0f473b359e83cc0cee64efbfbb9426b6316407bb 100644 (file)
--- a/ext/soap/tests/bugs/bug30928.phpt
+++ b/ext/soap/tests/bugs/bug30928.phpt
@@ -24,7 +24,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt
index 60eb40c1ef71b83af7be7315099fcd6df1ea915b..9def10372677b26ba10450a8e5f99bcdeaf67a2b 100644 (file)
--- a/ext/soap/tests/bugs/bug31695.phpt
+++ b/ext/soap/tests/bugs/bug31695.phpt
@@ -17,7 +17,7 @@ class LocalSoapClient extends SoapClient {
                $this->server->addFunction("Test"); 
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
        echo "$location\n";
     ob_start();
     $this->server->handle($request);

diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt
index 9d56c28ea347b25346bf01fab982864ed2cfa31d..6dc94661ae86cf04e38dbc2b046011398785b8ea 100644 (file)
--- a/ext/soap/tests/bugs/bug32776.phpt
+++ b/ext/soap/tests/bugs/bug32776.phpt
@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug32941.phpt b/ext/soap/tests/bugs/bug32941.phpt
index 5fd17df18e06d87912c87e9cde55b8c25841a823..d1e3fff85db8002d3f0b04fc4d0fada6280bb256 100755 (executable)
--- a/ext/soap/tests/bugs/bug32941.phpt
+++ b/ext/soap/tests/bugs/bug32941.phpt
@@ -5,7 +5,7 @@ Bug #32941 (Sending structured exception kills a php)
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
        return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope

diff --git a/ext/soap/tests/bugs/bug34449.phpt b/ext/soap/tests/bugs/bug34449.phpt
index 1bc9ff8749c12f379fcf1aa4ad464684af695082..f5766e29bc992827fdbdc21f269e7e5831765f2d 100755 (executable)
--- a/ext/soap/tests/bugs/bug34449.phpt
+++ b/ext/soap/tests/bugs/bug34449.phpt
@@ -5,7 +5,7 @@ Bug #34449 (ext/soap: XSD_ANYXML functionality not exposed)
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
        echo "$request\n";
        exit;
   }

diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt
index 3600d25ebdef407880b611926c1a39494424dc74..0f9543b715641fc0f40fe4c0e4b92a49f4e3a9f2 100755 (executable)
--- a/ext/soap/tests/bugs/bug34453.phpt
+++ b/ext/soap/tests/bugs/bug34453.phpt
@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('EchoString');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt
index d05f9bd7f5faf15ae5f81e2853883c68bc260b12..b99565129c0fe5e91ff46f03c3255e37137f62ad 100755 (executable)
--- a/ext/soap/tests/bugs/bug34643.phpt
+++ b/ext/soap/tests/bugs/bug34643.phpt
@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setClass('fp');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt
index 79eea0dbe0d450eee649b651c5efdd9a4209f399..94c1aa954b777e968404ec06b6472206eb7c6b74 100755 (executable)
--- a/ext/soap/tests/bugs/bug35142.phpt
+++ b/ext/soap/tests/bugs/bug35142.phpt
@@ -24,7 +24,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                echo "$request\n";
     $this->server->handle($request);
     return $response;

diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt
index cc313e1c6eb6c5473fc96213eae067c50c2157ae..e22ebd7dcaae9c3771327828c257856cb1764a6c 100755 (executable)
--- a/ext/soap/tests/bugs/bug35273.phpt
+++ b/ext/soap/tests/bugs/bug35273.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
        echo $request;
        exit;
        }

diff --git a/ext/soap/tests/bugs/bug36226-2.phpt b/ext/soap/tests/bugs/bug36226-2.phpt
index 5479ae9d10cf7f569a6a88ba99a96a07d9908817..8110737616a0c0158c808bb9448ea4bffff1452d 100755 (executable)
--- a/ext/soap/tests/bugs/bug36226-2.phpt
+++ b/ext/soap/tests/bugs/bug36226-2.phpt
@@ -20,7 +20,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     echo "$request\n";
     $this->server->handle($request);
     return $response;

diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt
index 29bcd7d7103da4b0467d3fa641c447724b02f9df..8c01c5b5d3f789009dcd1857c6113f606b807b5d 100755 (executable)
--- a/ext/soap/tests/bugs/bug36226.phpt
+++ b/ext/soap/tests/bugs/bug36226.phpt
@@ -24,7 +24,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                echo "$request\n";
     $this->server->handle($request);
     return $response;

diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt
index 35fc61e2c8b959a221805d278042891a162b8440..9fbb032d8f7dcee98b089d2b5b306338333f708a 100755 (executable)
--- a/ext/soap/tests/bugs/bug36999.phpt
+++ b/ext/soap/tests/bugs/bug36999.phpt
@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('echoLong');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug37083.phpt b/ext/soap/tests/bugs/bug37083.phpt
index 8737a22df2d4e3c68a6b2cf19b4f782540297a0c..d915ec0440fccc37331c23eb448a1672ea3f56b1 100755 (executable)
--- a/ext/soap/tests/bugs/bug37083.phpt
+++ b/ext/soap/tests/bugs/bug37083.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache=3
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-       function __doRequest($request, $location, $action, $version) {
+       function __doRequest($request, $location, $action, $version, $one_way = 0) {
                return <<<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/ext/soap/tests/bugs/bug38004.phpt b/ext/soap/tests/bugs/bug38004.phpt
index 6e92b19ef44ce684f1800274ecb7d56473c37baf..fea4f0379a7c13bd196e9f8cb09695fb8e1bc628 100755 (executable)
--- a/ext/soap/tests/bugs/bug38004.phpt
+++ b/ext/soap/tests/bugs/bug38004.phpt
@@ -19,7 +19,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt
index 5a0d017ec194fc48323ff75f48eeb265901f9ae9..6a4fb2580bc2f29e2c1ef7ac14ef578525b87bc7 100755 (executable)
--- a/ext/soap/tests/bugs/bug38005.phpt
+++ b/ext/soap/tests/bugs/bug38005.phpt
@@ -17,7 +17,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug38055.phpt b/ext/soap/tests/bugs/bug38055.phpt
index ee19cdc1ae351db0671bd632041241f8ee177ce9..82b6c76f77c2eaa35c2ea001022155ddbd6fe849 100755 (executable)
--- a/ext/soap/tests/bugs/bug38055.phpt
+++ b/ext/soap/tests/bugs/bug38055.phpt
@@ -20,7 +20,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt
index 868b4f2254d28b0e6096bc659e4015757e882ae0..c9bf3c165ce4d30832625ea8535612191a212906 100755 (executable)
--- a/ext/soap/tests/bugs/bug38067.phpt
+++ b/ext/soap/tests/bugs/bug38067.phpt
@@ -19,7 +19,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/bugs/bug38536.phpt b/ext/soap/tests/bugs/bug38536.phpt
index 1dd84d601edf822fcd825b5b4194793aa89e15b0..feea46e97e59f343d9fc34115421793fcd7f0319 100755 (executable)
--- a/ext/soap/tests/bugs/bug38536.phpt
+++ b/ext/soap/tests/bugs/bug38536.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class LocalSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope

diff --git a/ext/soap/tests/bugs/bug39121.phpt b/ext/soap/tests/bugs/bug39121.phpt
index 5b3ccbc76494314acd0c0c7fbbf7f9cdf4c84a61..caa7f6cce99ac2bb4a007be868e343cb76d39a6d 100755 (executable)
--- a/ext/soap/tests/bugs/bug39121.phpt
+++ b/ext/soap/tests/bugs/bug39121.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class LocalSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">

diff --git a/ext/soap/tests/bugs/bug42692.phpt b/ext/soap/tests/bugs/bug42692.phpt
index 6511556b584f458c86fcf50207262c3f42695ef7..3a4e099b1021796e332b3ea9a3c866f4f4512e25 100755 (executable)
--- a/ext/soap/tests/bugs/bug42692.phpt
+++ b/ext/soap/tests/bugs/bug42692.phpt
@@ -16,7 +16,7 @@ class TestSoap extends SoapClient {
                $this->server->addFunction("checkAuth");
        }
 
-       function __doRequest($request, $location, $action, $version) {
+       function __doRequest($request, $location, $action, $version, $one_way = 0) {
                ob_start();
                $this->server->handle($request);
                $response = ob_get_contents();

diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt
index 69675a5a223eb1e0956adbdbf80a6b3ee1b2f616..d79deb6d39101454fff8fc73f9e58c3d09bed7d9 100644 (file)
--- a/ext/soap/tests/classmap002.phpt
+++ b/ext/soap/tests/classmap002.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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>

diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt
index ac87a1682edcecdcc95fc69c6111837aebeb3543..4d0118fef43e7c295fcfef770cf52b7b222edb44 100755 (executable)
--- a/ext/soap/tests/classmap003.phpt
+++ b/ext/soap/tests/classmap003.phpt
@@ -33,7 +33,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction("f");
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/classmap004.phpt b/ext/soap/tests/classmap004.phpt
index 3b9d678e6abae84ef253f667efdbbe3240868367..e8bf58a4f9e84490fb2bc140b3c646c916a25184 100755 (executable)
--- a/ext/soap/tests/classmap004.phpt
+++ b/ext/soap/tests/classmap004.phpt
@@ -41,7 +41,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction("f");
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/transport001.phpt b/ext/soap/tests/transport001.phpt
index 9134d3d7fb89bfba93c94a27f750ca270161b13e..9ab0d3d9d18abc522852e20a2f8d7a7c5933a85f 100644 (file)
--- a/ext/soap/tests/transport001.phpt
+++ b/ext/soap/tests/transport001.phpt
@@ -16,7 +16,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('Add');
   }
 
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt
index cfe1a6d441b77a53ae2917393e9824b3d15db2a3..6c9d86d80c43a51cc7e02623e7f52187db4a9386 100755 (executable)
--- a/ext/soap/tests/typemap003.phpt
+++ b/ext/soap/tests/typemap003.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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>

diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt
index 768cdcacdc38ed83ee6bb64474cae5cc59c6cb5e..4fe15f7f9f26bd8067f29f77bc91f1f79a98b123 100755 (executable)
--- a/ext/soap/tests/typemap004.phpt
+++ b/ext/soap/tests/typemap004.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                echo $request;
                exit;
        }       

diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt
index e8523287f738e15d0513c05574e4e9c1e3f85a85..34dcc3f5d4b26946e563ce29ebf0297544c74040 100755 (executable)
--- a/ext/soap/tests/typemap007.phpt
+++ b/ext/soap/tests/typemap007.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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>

diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt
index eebefeeca28e2a5d50074b27d4e00621be55eafb..192f6dc0d26a5769bd0fe7b334ab0ed18bb227a3 100755 (executable)
--- a/ext/soap/tests/typemap008.phpt
+++ b/ext/soap/tests/typemap008.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                echo $request;
                exit;
        }       

diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt
index 65a0666f2b00835a790a28af1a029ffdeeaec10a..1e2addceeca6f09b538f9900f4642ec8cf1c1e36 100755 (executable)
--- a/ext/soap/tests/typemap011.phpt
+++ b/ext/soap/tests/typemap011.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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>

diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt
index 9855f805928322059679412b0f6f81f7b748c7e4..847957a9821cec48292a05b7a46e4eb576c454e5 100755 (executable)
--- a/ext/soap/tests/typemap012.phpt
+++ b/ext/soap/tests/typemap012.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
                echo $request;
                exit;
        }