From 7c7fd9ae2f6d935633d6f53612dcdf05f7a8afb5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 6 Oct 2020 15:29:44 +0200 Subject: [PATCH] Update ext/soap parameter names --- ext/soap/soap.stub.php | 30 +++++++++--------- ext/soap/soap_arginfo.h | 52 +++++++++++++++---------------- ext/soap/tests/bugs/bug41477.phpt | 20 ------------ ext/soap/tests/fault_warning.phpt | 8 ++--- 4 files changed, 45 insertions(+), 65 deletions(-) delete mode 100644 ext/soap/tests/bugs/bug41477.phpt diff --git a/ext/soap/soap.stub.php b/ext/soap/soap.stub.php index 0709c6092ef1d..fd4c84bdb2fc3 100644 --- a/ext/soap/soap.stub.php +++ b/ext/soap/soap.stub.php @@ -2,7 +2,7 @@ /** @generate-function-entries */ -function use_soap_error_handler(bool $handler = true): bool {} +function use_soap_error_handler(bool $enable = true): bool {} function is_soap_fault(mixed $object): bool {} @@ -13,19 +13,19 @@ public function __construct(mixed $data, string $name) {} class SoapHeader { - public function __construct(string $namespace, string $name, mixed $data = UNKNOWN, bool $mustunderstand = false, string|int|null $actor = null) {} + public function __construct(string $namespace, string $name, mixed $data = UNKNOWN, bool $mustUnderstand = false, string|int|null $actor = null) {} } class SoapFault extends Exception { - public function __construct(array|string|null $faultcode, string $faultstring, ?string $faultactor = null, mixed $detail = null, ?string $faultname = null, mixed $headerfault = null) {} + public function __construct(array|string|null $code, string $string, ?string $actor = null, mixed $details = null, ?string $name = null, mixed $headerFault = null) {} public function __toString(): string {} } class SoapVar { - public function __construct(mixed $data, ?int $encoding, string $type_name = "", string $type_namespace = "", string $node_name = "", string $node_namespace = "") {} + public function __construct(mixed $data, ?int $encoding, string $typeName = "", string $typeNamespace = "", string $nodeName = "", string $nodeNamespace = "") {} } class SoapServer @@ -36,13 +36,13 @@ public function __construct(?string $wsdl, array $options = []) {} public function fault(string $code, string $string, string $actor = "", mixed $details = null, string $name = "") {} /** @return void */ - public function addSoapHeader(SoapHeader $object) {} + public function addSoapHeader(SoapHeader $header) {} /** @return void */ public function setPersistence(int $mode) {} /** @return void */ - public function setClass(string $class_name, mixed ...$argv) {} + public function setClass(string $class, mixed ...$args) {} /** @return void */ public function setObject(object $object) {} @@ -57,7 +57,7 @@ public function getFunctions() {} public function addFunction($functions) {} /** @return void */ - public function handle(?string $soap_request = null) {} + public function handle(?string $request = null) {} } class SoapClient @@ -65,14 +65,14 @@ class SoapClient public function __construct(?string $wsdl, array $options = []) {} /** @return mixed */ - public function __call(string $function_name, array $arguments) {} + public function __call(string $name, array $args) {} /** - * @param SoapHeader|array|null $input_headers - * @param array $output_headers + * @param SoapHeader|array|null $inputHeaders + * @param array $outputHeaders * @return mixed */ - public function __soapCall(string $function_name, array $arguments, ?array $options = null, $input_headers = null, &$output_headers = null) {} + public function __soapCall(string $name, array $args, ?array $options = null, $inputHeaders = null, &$outputHeaders = null) {} /** @return array|null */ public function __getFunctions() {} @@ -93,7 +93,7 @@ public function __getLastRequestHeaders() {} public function __getLastResponseHeaders() {} /** @return string|null */ - public function __doRequest(string $request, string $location, string $action, int $version, bool $one_way = false) {} + public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false) {} /** @return void */ public function __setCookie(string $name, ?string $value = null) {} @@ -102,11 +102,11 @@ public function __setCookie(string $name, ?string $value = null) {} public function __getCookies() {} /** - * @param SoapHeader|array|null $soapheaders + * @param SoapHeader|array|null $headers * @return bool */ - public function __setSoapHeaders($soapheaders = null) {} + public function __setSoapHeaders($headers = null) {} /** @return string|null */ - public function __setLocation(string $new_location = "") {} + public function __setLocation(string $location = "") {} } diff --git a/ext/soap/soap_arginfo.h b/ext/soap/soap_arginfo.h index d6153c4812b29..76824922de10e 100644 --- a/ext/soap/soap_arginfo.h +++ b/ext/soap/soap_arginfo.h @@ -1,8 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 6cba3704e7a71fa22031734207365dd88764ddb2 */ + * Stub hash: 4f958b1c954386207619cfaefa02c96e90cc0da7 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, handler, _IS_BOOL, 0, "true") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_is_soap_fault, 0, 1, _IS_BOOL, 0) @@ -18,17 +18,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapHeader___construct, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, data, IS_MIXED, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mustunderstand, _IS_BOOL, 0, "false") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mustUnderstand, _IS_BOOL, 0, "false") ZEND_ARG_TYPE_MASK(0, actor, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_NULL, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapFault___construct, 0, 0, 2) - ZEND_ARG_TYPE_MASK(0, faultcode, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, NULL) - ZEND_ARG_TYPE_INFO(0, faultstring, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, faultactor, IS_STRING, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, detail, IS_MIXED, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, faultname, IS_STRING, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, headerfault, IS_MIXED, 0, "null") + ZEND_ARG_TYPE_MASK(0, code, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, NULL) + ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, actor, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, details, IS_MIXED, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, headerFault, IS_MIXED, 0, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SoapFault___toString, 0, 0, IS_STRING, 0) @@ -37,10 +37,10 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapVar___construct, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, data, IS_MIXED, 0) ZEND_ARG_TYPE_INFO(0, encoding, IS_LONG, 1) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type_name, IS_STRING, 0, "\"\"") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type_namespace, IS_STRING, 0, "\"\"") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, node_name, IS_STRING, 0, "\"\"") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, node_namespace, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, typeName, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, typeNamespace, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nodeName, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nodeNamespace, IS_STRING, 0, "\"\"") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer___construct, 0, 0, 1) @@ -57,7 +57,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_fault, 0, 0, 2) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_addSoapHeader, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, object, SoapHeader, 0) + ZEND_ARG_OBJ_INFO(0, header, SoapHeader, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_setPersistence, 0, 0, 1) @@ -65,8 +65,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_setPersistence, 0, 0, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_setClass, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0) - ZEND_ARG_VARIADIC_TYPE_INFO(0, argv, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0) + ZEND_ARG_VARIADIC_TYPE_INFO(0, args, IS_MIXED, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_setObject, 0, 0, 1) @@ -81,22 +81,22 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_addFunction, 0, 0, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_handle, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, soap_request, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request, IS_STRING, 1, "null") ZEND_END_ARG_INFO() #define arginfo_class_SoapClient___construct arginfo_class_SoapServer___construct ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___call, 0, 0, 2) - ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, arguments, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___soapCall, 0, 0, 2) - ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, arguments, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, input_headers, "null") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, output_headers, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, inputHeaders, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, outputHeaders, "null") ZEND_END_ARG_INFO() #define arginfo_class_SoapClient___getFunctions arginfo_class_SoapServer_getFunctions @@ -116,7 +116,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___doRequest, 0, 0, 4) ZEND_ARG_TYPE_INFO(0, location, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, action, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, version, IS_LONG, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, one_way, _IS_BOOL, 0, "false") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, oneWay, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setCookie, 0, 0, 1) @@ -127,11 +127,11 @@ ZEND_END_ARG_INFO() #define arginfo_class_SoapClient___getCookies arginfo_class_SoapServer_getFunctions ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setSoapHeaders, 0, 0, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, soapheaders, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, headers, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setLocation, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, new_location, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 0, "\"\"") ZEND_END_ARG_INFO() diff --git a/ext/soap/tests/bugs/bug41477.phpt b/ext/soap/tests/bugs/bug41477.phpt deleted file mode 100644 index a103e692024ff..0000000000000 --- a/ext/soap/tests/bugs/bug41477.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -Bug #41477 (no arginfo about SoapClient::__soapCall()) ---SKIPIF-- - ---FILE-- -getMethod('__soapCall'); -$arrParams = $objRfMethod->getParameters(); -foreach($arrParams as $objRfParam) -{ - var_dump($objRfParam->getName()); -} -?> ---EXPECT-- -string(13) "function_name" -string(9) "arguments" -string(7) "options" -string(13) "input_headers" -string(14) "output_headers" diff --git a/ext/soap/tests/fault_warning.phpt b/ext/soap/tests/fault_warning.phpt index 3a9fec6710d4a..c74934d7b90e4 100644 --- a/ext/soap/tests/fault_warning.phpt +++ b/ext/soap/tests/fault_warning.phpt @@ -39,10 +39,10 @@ echo get_class($fault); ?> --EXPECT-- -SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code -SoapFault::__construct(): Argument #1 ($faultcode) must be of type array|string|null, stdClass given +SoapFault::__construct(): Argument #1 ($code) is not a valid fault code +SoapFault::__construct(): Argument #1 ($code) must be of type array|string|null, stdClass given SoapFault SoapFault -SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code -SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code +SoapFault::__construct(): Argument #1 ($code) is not a valid fault code +SoapFault::__construct(): Argument #1 ($code) is not a valid fault code SoapFault