Skip to content

Commit 35b2426

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Clarify that location is required in do_request Regenerate arginfo file
2 parents dd64928 + 40ba9f6 commit 35b2426

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

ext/soap/soap.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,11 +2215,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
22152215

22162216
ZVAL_STRINGL(&func,"__doRequest",sizeof("__doRequest")-1);
22172217
ZVAL_STRINGL(&params[0], buf, buf_size);
2218-
if (location == NULL) {
2219-
ZVAL_NULL(&params[1]);
2220-
} else {
2221-
ZVAL_STRING(&params[1], location);
2222-
}
2218+
ZVAL_STRING(&params[1], location);
22232219
if (action == NULL) {
22242220
ZVAL_NULL(&params[2]);
22252221
} else {
@@ -2371,6 +2367,7 @@ static void do_soap_call(zend_execute_data *execute_data,
23712367

23722368
if (location == NULL) {
23732369
location = binding->location;
2370+
ZEND_ASSERT(location);
23742371
}
23752372
if (binding->bindingType == BINDING_SOAP) {
23762373
sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)fn->bindingAttributes;

ext/soap/soap_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: b22d29a51c17d627763229aac15718702002daec */
2+
* Stub hash: c0d32b2d8f3c39203b437a01dc79cd4e934dc9f7 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true")
@@ -131,7 +131,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setSoapHeaders, 0, 0, 0)
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, location, IS_STRING, 0, "\"\"")
134+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 1, "null")
135135
ZEND_END_ARG_INFO()
136136

137137

0 commit comments

Comments
 (0)