Skip to content

Commit c4a25da

Browse files
nikicnikic
committed
Update ext/soap parameter names
Closes GH-6300.
1 parent 2180e88 commit c4a25da

File tree

4 files changed

+45
-65
lines changed

4 files changed

+45
-65
lines changed

‎ext/soap/soap.stub.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/** @generate-function-entries */
44

5-
function use_soap_error_handler(bool $handler = true): bool {}
5+
function use_soap_error_handler(bool $enable = true): bool {}
66

77
function is_soap_fault(mixed $object): bool {}
88

@@ -13,19 +13,19 @@ public function __construct(mixed $data, string $name) {}
1313

1414
class SoapHeader
1515
{
16-
public function __construct(string $namespace, string $name, mixed $data = UNKNOWN, bool $mustunderstand = false, string|int|null $actor = null) {}
16+
public function __construct(string $namespace, string $name, mixed $data = UNKNOWN, bool $mustUnderstand = false, string|int|null $actor = null) {}
1717
}
1818

1919
class SoapFault extends Exception
2020
{
21-
public function __construct(array|string|null $faultcode, string $faultstring, ?string $faultactor = null, mixed $detail = null, ?string $faultname = null, mixed $headerfault = null) {}
21+
public function __construct(array|string|null $code, string $string, ?string $actor = null, mixed $details = null, ?string $name = null, mixed $headerFault = null) {}
2222

2323
public function __toString(): string {}
2424
}
2525

2626
class SoapVar
2727
{
28-
public function __construct(mixed $data, ?int $encoding, string $type_name = "", string $type_namespace = "", string $node_name = "", string $node_namespace = "") {}
28+
public function __construct(mixed $data, ?int $encoding, string $typeName = "", string $typeNamespace = "", string $nodeName = "", string $nodeNamespace = "") {}
2929
}
3030

3131
class SoapServer
@@ -36,13 +36,13 @@ public function __construct(?string $wsdl, array $options = []) {}
3636
public function fault(string $code, string $string, string $actor = "", mixed $details = null, string $name = "") {}
3737

3838
/** @return void */
39-
public function addSoapHeader(SoapHeader $object) {}
39+
public function addSoapHeader(SoapHeader $header) {}
4040

4141
/** @return void */
4242
public function setPersistence(int $mode) {}
4343

4444
/** @return void */
45-
public function setClass(string $class_name, mixed ...$argv) {}
45+
public function setClass(string $class, mixed ...$args) {}
4646

4747
/** @return void */
4848
public function setObject(object $object) {}
@@ -57,22 +57,22 @@ public function getFunctions() {}
5757
public function addFunction($functions) {}
5858

5959
/** @return void */
60-
public function handle(?string $soap_request = null) {}
60+
public function handle(?string $request = null) {}
6161
}
6262

6363
class SoapClient
6464
{
6565
public function __construct(?string $wsdl, array $options = []) {}
6666

6767
/** @return mixed */
68-
public function __call(string $function_name, array $arguments) {}
68+
public function __call(string $name, array $args) {}
6969

7070
/**
71-
* @param SoapHeader|array|null $input_headers
72-
* @param array $output_headers
71+
* @param SoapHeader|array|null $inputHeaders
72+
* @param array $outputHeaders
7373
* @return mixed
7474
*/
75-
public function __soapCall(string $function_name, array $arguments, ?array $options = null, $input_headers = null, &$output_headers = null) {}
75+
public function __soapCall(string $name, array $args, ?array $options = null, $inputHeaders = null, &$outputHeaders = null) {}
7676

7777
/** @return array|null */
7878
public function __getFunctions() {}
@@ -93,7 +93,7 @@ public function __getLastRequestHeaders() {}
9393
public function __getLastResponseHeaders() {}
9494

9595
/** @return string|null */
96-
public function __doRequest(string $request, string $location, string $action, int $version, bool $one_way = false) {}
96+
public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false) {}
9797

9898
/** @return void */
9999
public function __setCookie(string $name, ?string $value = null) {}
@@ -102,11 +102,11 @@ public function __setCookie(string $name, ?string $value = null) {}
102102
public function __getCookies() {}
103103

104104
/**
105-
* @param SoapHeader|array|null $soapheaders
105+
* @param SoapHeader|array|null $headers
106106
* @return bool
107107
*/
108-
public function __setSoapHeaders($soapheaders = null) {}
108+
public function __setSoapHeaders($headers = null) {}
109109

110110
/** @return string|null */
111-
public function __setLocation(string $new_location = "") {}
111+
public function __setLocation(string $location = "") {}
112112
}

‎ext/soap/soap_arginfo.h

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 6cba3704e7a71fa22031734207365dd88764ddb2 */
2+
* Stub hash: 4f958b1c954386207619cfaefa02c96e90cc0da7 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0)
5-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, handler, _IS_BOOL, 0, "true")
5+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true")
66
ZEND_END_ARG_INFO()
77

88
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)
1818
ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 0)
1919
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
2020
ZEND_ARG_TYPE_INFO(0, data, IS_MIXED, 0)
21-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mustunderstand, _IS_BOOL, 0, "false")
21+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mustUnderstand, _IS_BOOL, 0, "false")
2222
ZEND_ARG_TYPE_MASK(0, actor, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_NULL, "null")
2323
ZEND_END_ARG_INFO()
2424

2525
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapFault___construct, 0, 0, 2)
26-
ZEND_ARG_TYPE_MASK(0, faultcode, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, NULL)
27-
ZEND_ARG_TYPE_INFO(0, faultstring, IS_STRING, 0)
28-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, faultactor, IS_STRING, 1, "null")
29-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, detail, IS_MIXED, 0, "null")
30-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, faultname, IS_STRING, 1, "null")
31-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, headerfault, IS_MIXED, 0, "null")
26+
ZEND_ARG_TYPE_MASK(0, code, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, NULL)
27+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
28+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, actor, IS_STRING, 1, "null")
29+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, details, IS_MIXED, 0, "null")
30+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
31+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, headerFault, IS_MIXED, 0, "null")
3232
ZEND_END_ARG_INFO()
3333

3434
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()
3737
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapVar___construct, 0, 0, 2)
3838
ZEND_ARG_TYPE_INFO(0, data, IS_MIXED, 0)
3939
ZEND_ARG_TYPE_INFO(0, encoding, IS_LONG, 1)
40-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type_name, IS_STRING, 0, "\"\"")
41-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type_namespace, IS_STRING, 0, "\"\"")
42-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, node_name, IS_STRING, 0, "\"\"")
43-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, node_namespace, IS_STRING, 0, "\"\"")
40+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, typeName, IS_STRING, 0, "\"\"")
41+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, typeNamespace, IS_STRING, 0, "\"\"")
42+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nodeName, IS_STRING, 0, "\"\"")
43+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nodeNamespace, IS_STRING, 0, "\"\"")
4444
ZEND_END_ARG_INFO()
4545

4646
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer___construct, 0, 0, 1)
@@ -57,16 +57,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_fault, 0, 0, 2)
5757
ZEND_END_ARG_INFO()
5858

5959
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_addSoapHeader, 0, 0, 1)
60-
ZEND_ARG_OBJ_INFO(0, object, SoapHeader, 0)
60+
ZEND_ARG_OBJ_INFO(0, header, SoapHeader, 0)
6161
ZEND_END_ARG_INFO()
6262

6363
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_setPersistence, 0, 0, 1)
6464
ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
6565
ZEND_END_ARG_INFO()
6666

6767
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_setClass, 0, 0, 1)
68-
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
69-
ZEND_ARG_VARIADIC_TYPE_INFO(0, argv, IS_MIXED, 0)
68+
ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
69+
ZEND_ARG_VARIADIC_TYPE_INFO(0, args, IS_MIXED, 0)
7070
ZEND_END_ARG_INFO()
7171

7272
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)
8181
ZEND_END_ARG_INFO()
8282

8383
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapServer_handle, 0, 0, 0)
84-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, soap_request, IS_STRING, 1, "null")
84+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request, IS_STRING, 1, "null")
8585
ZEND_END_ARG_INFO()
8686

8787
#define arginfo_class_SoapClient___construct arginfo_class_SoapServer___construct
8888

8989
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___call, 0, 0, 2)
90-
ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0)
91-
ZEND_ARG_TYPE_INFO(0, arguments, IS_ARRAY, 0)
90+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
91+
ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
9292
ZEND_END_ARG_INFO()
9393

9494
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___soapCall, 0, 0, 2)
95-
ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0)
96-
ZEND_ARG_TYPE_INFO(0, arguments, IS_ARRAY, 0)
95+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
96+
ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
9797
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
98-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, input_headers, "null")
99-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, output_headers, "null")
98+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, inputHeaders, "null")
99+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, outputHeaders, "null")
100100
ZEND_END_ARG_INFO()
101101

102102
#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)
116116
ZEND_ARG_TYPE_INFO(0, location, IS_STRING, 0)
117117
ZEND_ARG_TYPE_INFO(0, action, IS_STRING, 0)
118118
ZEND_ARG_TYPE_INFO(0, version, IS_LONG, 0)
119-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, one_way, _IS_BOOL, 0, "false")
119+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, oneWay, _IS_BOOL, 0, "false")
120120
ZEND_END_ARG_INFO()
121121

122122
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setCookie, 0, 0, 1)
@@ -127,11 +127,11 @@ ZEND_END_ARG_INFO()
127127
#define arginfo_class_SoapClient___getCookies arginfo_class_SoapServer_getFunctions
128128

129129
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setSoapHeaders, 0, 0, 0)
130-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, soapheaders, "null")
130+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, headers, "null")
131131
ZEND_END_ARG_INFO()
132132

133133
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setLocation, 0, 0, 0)
134-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, new_location, IS_STRING, 0, "\"\"")
134+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 0, "\"\"")
135135
ZEND_END_ARG_INFO()
136136

137137

‎ext/soap/tests/bugs/bug41477.phpt

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎ext/soap/tests/fault_warning.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ echo get_class($fault);
3939

4040
?>
4141
--EXPECT--
42-
SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code
43-
SoapFault::__construct(): Argument #1 ($faultcode) must be of type array|string|null, stdClass given
42+
SoapFault::__construct(): Argument #1 ($code) is not a valid fault code
43+
SoapFault::__construct(): Argument #1 ($code) must be of type array|string|null, stdClass given
4444
SoapFault
4545
SoapFault
46-
SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code
47-
SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code
46+
SoapFault::__construct(): Argument #1 ($code) is not a valid fault code
47+
SoapFault::__construct(): Argument #1 ($code) is not a valid fault code
4848
SoapFault

0 commit comments

Comments
 (0)