dmitry Mon Sep 13 07:55:25 2004 EDT
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/interop client_round2_interop.php
/php-src/ext/soap/tests transport001.phpt
/php-src/ext/soap/tests/bugs bug28969.phpt bug29795.phpt
bug29839.phpt bug29844.phpt
Log:
Change soap's ctors to __construct(),
rename SoapClient->__call() to SoapClinet->__soapCall().
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.119&r2=1.120&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.119 php-src/ext/soap/soap.c:1.120
--- php-src/ext/soap/soap.c:1.119 Fri Sep 10 05:02:05 2004
+++ php-src/ext/soap/soap.c Mon Sep 13 07:55:24 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.119 2004/09/10 09:02:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.120 2004/09/13 11:55:24 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -251,6 +251,12 @@
/* SoapHeader Functions */
PHP_METHOD(SoapHeader, SoapHeader);
+#ifdef ZEND_ENGINE_2
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct,
ZEND_FN(class_name##_##func_name), arginfo, flags)
+#else
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) PHP_ME(class_name,
func_name, arginfo, flags)
+#endif
+
static zend_function_entry soap_functions[] = {
#ifdef HAVE_PHP_DOMXML
PHP_FE(soap_encode_to_xml, NULL)
@@ -262,7 +268,7 @@
};
static zend_function_entry soap_fault_functions[] = {
- PHP_ME(SoapFault, SoapFault, NULL, 0)
+ SOAP_CTOR(SoapFault, SoapFault, NULL, 0)
#ifdef ZEND_ENGINE_2
PHP_ME(SoapFault, __toString, NULL, 0)
#endif
@@ -270,7 +276,7 @@
};
static zend_function_entry soap_server_functions[] = {
- PHP_ME(SoapServer, SoapServer, NULL, 0)
+ SOAP_CTOR(SoapServer, SoapServer, NULL, 0)
PHP_ME(SoapServer, setPersistence, NULL, 0)
PHP_ME(SoapServer, setClass, NULL, 0)
PHP_ME(SoapServer, addFunction, NULL, 0)
@@ -301,12 +307,12 @@
#endif
static zend_function_entry soap_client_functions[] = {
- PHP_ME(SoapClient, SoapClient, NULL, 0)
+ SOAP_CTOR(SoapClient, SoapClient, NULL, 0)
PHP_ME(SoapClient, __call, __call_args, 0)
#ifdef ZEND_ENGINE_2
- ZEND_FENTRY(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args, 0)
+ ZEND_FENTRY(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args, 0)
#else
- ZEND_NAMED_FE(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args)
+ ZEND_NAMED_FE(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args)
#endif
PHP_ME(SoapClient, __getLastRequest, NULL, 0)
PHP_ME(SoapClient, __getLastResponse, NULL, 0)
@@ -319,17 +325,17 @@
};
static zend_function_entry soap_var_functions[] = {
- PHP_ME(SoapVar, SoapVar, NULL, 0)
+ SOAP_CTOR(SoapVar, SoapVar, NULL, 0)
{NULL, NULL, NULL}
};
static zend_function_entry soap_param_functions[] = {
- PHP_ME(SoapParam, SoapParam, NULL, 0)
+ SOAP_CTOR(SoapParam, SoapParam, NULL, 0)
{NULL, NULL, NULL}
};
static zend_function_entry soap_header_functions[] = {
- PHP_ME(SoapHeader, SoapHeader, NULL, 0)
+ SOAP_CTOR(SoapHeader, SoapHeader, NULL, 0)
{NULL, NULL, NULL}
};
http://cvs.php.net/diff.php/php-src/ext/soap/interop/client_round2_interop.php?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/soap/interop/client_round2_interop.php
diff -u php-src/ext/soap/interop/client_round2_interop.php:1.16
php-src/ext/soap/interop/client_round2_interop.php:1.17
--- php-src/ext/soap/interop/client_round2_interop.php:1.16 Fri Sep 10 05:02:06
2004
+++ php-src/ext/soap/interop/client_round2_interop.php Mon Sep 13 07:55:24 2004
@@ -16,7 +16,7 @@
// | Authors: Shane Caraveo <[EMAIL PROTECTED]> |
// +----------------------------------------------------------------------+
//
-// $Id: client_round2_interop.php,v 1.16 2004/09/10 09:02:06 dmitry Exp $
+// $Id: client_round2_interop.php,v 1.17 2004/09/13 11:55:24 dmitry Exp $
//
require_once 'DB.php'; // PEAR/DB
require_once 'client_round2_params.php';
@@ -94,7 +94,7 @@
$this->_getEndpoints($test, 1);
// retreive endpoints from the endpoint server
- $endpointArray =
$soapclient->__soap_call("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/";,'uri'=>"http://soapinterop.org/";));
+ $endpointArray =
$soapclient->__soapCall("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/";,'uri'=>"http://soapinterop.org/";));
if (is_soap_fault($endpointArray) || PEAR::isError($endpointArray)) {
if ($this->html) print "<pre>";
print $soapclient->wire."\n";
@@ -428,9 +428,9 @@
$return = eval('return $soap->'.$soap_test->method_name.'('.$args.');');
} else {
if ($soap_test->headers || $soap_test->headers_expect) {
- $return =
$soap->__soap_call($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace),
$soap_test->headers, $result_headers);
+ $return =
$soap->__soapCall($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace),
$soap_test->headers, $result_headers);
} else {
- $return =
$soap->__soap_call($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace));
+ $return =
$soap->__soapCall($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace));
}
}
} catch (SoapFault $ex) {
http://cvs.php.net/diff.php/php-src/ext/soap/tests/transport001.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/soap/tests/transport001.phpt
diff -u php-src/ext/soap/tests/transport001.phpt:1.1
php-src/ext/soap/tests/transport001.phpt:1.2
--- php-src/ext/soap/tests/transport001.phpt:1.1 Thu May 20 12:55:03 2004
+++ php-src/ext/soap/tests/transport001.phpt Mon Sep 13 07:55:24 2004
@@ -10,8 +10,8 @@
class LocalSoapClient extends SoapClient {
- function LocalSoapClient($wsdl, $options) {
- $this->SoapClient($wsdl, $options);
+ function __construct($wsdl, $options) {
+ parent::__construct($wsdl, $options);
$this->server = new SoapServer($wsdl, $options);
$this->server->addFunction('Add');
}
http://cvs.php.net/diff.php/php-src/ext/soap/tests/bugs/bug28969.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/soap/tests/bugs/bug28969.phpt
diff -u php-src/ext/soap/tests/bugs/bug28969.phpt:1.1
php-src/ext/soap/tests/bugs/bug28969.phpt:1.2
--- php-src/ext/soap/tests/bugs/bug28969.phpt:1.1 Tue Aug 10 12:18:08 2004
+++ php-src/ext/soap/tests/bugs/bug28969.phpt Mon Sep 13 07:55:24 2004
@@ -11,8 +11,8 @@
class LocalSoapClient extends SoapClient {
- function LocalSoapClient($wsdl, $options) {
- $this->SoapClient($wsdl, $options);
+ function __construct($wsdl, $options) {
+ parent::__construct($wsdl, $options);
$this->server = new SoapServer($wsdl, $options);
$this->server->addFunction('test');
}
http://cvs.php.net/diff.php/php-src/ext/soap/tests/bugs/bug29795.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/soap/tests/bugs/bug29795.phpt
diff -u php-src/ext/soap/tests/bugs/bug29795.phpt:1.2
php-src/ext/soap/tests/bugs/bug29795.phpt:1.3
--- php-src/ext/soap/tests/bugs/bug29795.phpt:1.2 Thu Aug 26 11:26:32 2004
+++ php-src/ext/soap/tests/bugs/bug29795.phpt Mon Sep 13 07:55:24 2004
@@ -6,8 +6,8 @@
<?php
class LocalSoapClient extends SoapClient {
- function LocalSoapClient($wsdl, $options) {
- $this->SoapClient($wsdl, $options);
+ function __construct($wsdl, $options) {
+ parent::__construct($wsdl, $options);
}
function __doRequest($request, $location, $action, $version) {
http://cvs.php.net/diff.php/php-src/ext/soap/tests/bugs/bug29839.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/soap/tests/bugs/bug29839.phpt
diff -u php-src/ext/soap/tests/bugs/bug29839.phpt:1.2
php-src/ext/soap/tests/bugs/bug29839.phpt:1.3
--- php-src/ext/soap/tests/bugs/bug29839.phpt:1.2 Thu Aug 26 14:40:10 2004
+++ php-src/ext/soap/tests/bugs/bug29839.phpt Mon Sep 13 07:55:24 2004
@@ -11,8 +11,8 @@
class LocalSoapClient extends SoapClient {
- function LocalSoapClient($wsdl, $options) {
- $this->SoapClient($wsdl, $options);
+ function __construct($wsdl, $options) {
+ parent::__construct($wsdl, $options);
$this->server = new SoapServer($wsdl, $options);
$this->server->addFunction('EchoString');
}
http://cvs.php.net/diff.php/php-src/ext/soap/tests/bugs/bug29844.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/soap/tests/bugs/bug29844.phpt
diff -u php-src/ext/soap/tests/bugs/bug29844.phpt:1.2
php-src/ext/soap/tests/bugs/bug29844.phpt:1.3
--- php-src/ext/soap/tests/bugs/bug29844.phpt:1.2 Thu Aug 26 08:24:54 2004
+++ php-src/ext/soap/tests/bugs/bug29844.phpt Mon Sep 13 07:55:24 2004
@@ -13,8 +13,8 @@
class LocalSoapClient extends SoapClient {
- function LocalSoapClient($wsdl, $options) {
- $this->SoapClient($wsdl, $options);
+ function __construct($wsdl, $options) {
+ parent::__construct($wsdl, $options);
$this->server = new SoapServer($wsdl, $options);
$this->server->setClass('hello_world');;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
