Skip to content

[pull] master from php:master #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 12, 2026
Merged

[pull] master from php:master #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35cd1b6
Zend/exception.c: improve getTraceAsString() method call setup (#23665)
Girgias Sep 11, 2026
8b1668d
ext/soap: Use bool type instead of int type for functions_all field
Girgias Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Zend/zend_exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,11 +746,9 @@ ZEND_METHOD(Exception, __toString)

zend_fcall_info fci;
fci.size = sizeof(fci);
ZVAL_UNDEF(&fci.function_name);
fci.retval = &trace;
fci.param_count = 0;
fci.params = NULL;
fci.object = NULL;
fci.named_params = NULL;

zend_fcall_info_cache fcc;
Expand All @@ -765,7 +763,6 @@ ZEND_METHOD(Exception, __toString)
zend_long line = zval_get_long(GET_PROPERTY(exception, ZEND_STR_LINE));

fcc.object = Z_OBJ_P(exception);
fcc.calling_scope = Z_OBJCE_P(exception);
zend_call_function(&fci, &fcc);

if (Z_TYPE(trace) != IS_STRING) {
Expand Down
2 changes: 1 addition & 1 deletion ext/soap/php_soap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct _soapService {

struct _soap_functions {
HashTable *ft;
int functions_all;
bool functions_all;
} soap_functions;

struct _soap_class {
Expand Down
12 changes: 6 additions & 6 deletions ext/soap/soap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ PHP_METHOD(SoapServer, __construct)

service->version = version;
service->type = SOAP_FUNCTIONS;
service->soap_functions.functions_all = FALSE;
service->soap_functions.functions_all = false;
service->soap_functions.ft = zend_new_array(0);

SOAP_SERVER_BEGIN_CODE();
Expand Down Expand Up @@ -1236,7 +1236,7 @@ PHP_METHOD(SoapServer, getFunctions)
ft = &(Z_OBJCE(service->soap_object)->function_table);
} else if (service->type == SOAP_CLASS) {
ft = &service->soap_class.ce->function_table;
} else if (service->soap_functions.functions_all == TRUE) {
} else if (service->soap_functions.functions_all) {
ft = EG(function_table);
} else if (service->soap_functions.ft != NULL) {
zval *name;
Expand Down Expand Up @@ -1277,7 +1277,7 @@ PHP_METHOD(SoapServer, addFunction)
zval *tmp_function;

if (service->soap_functions.ft == NULL) {
service->soap_functions.functions_all = FALSE;
service->soap_functions.functions_all = false;
service->soap_functions.ft = zend_new_array(zend_hash_num_elements(Z_ARRVAL_P(function_name)));
}

Expand Down Expand Up @@ -1316,7 +1316,7 @@ PHP_METHOD(SoapServer, addFunction)
RETURN_THROWS();
}
if (service->soap_functions.ft == NULL) {
service->soap_functions.functions_all = FALSE;
service->soap_functions.functions_all = false;
service->soap_functions.ft = zend_new_array(0);
}

Expand All @@ -1335,7 +1335,7 @@ PHP_METHOD(SoapServer, addFunction)
efree(service->soap_functions.ft);
service->soap_functions.ft = NULL;
}
service->soap_functions.functions_all = TRUE;
service->soap_functions.functions_all = true;
} else {
zend_argument_value_error(1, "must be SOAP_FUNCTIONS_ALL when an integer is passed");
}
Expand Down Expand Up @@ -1620,7 +1620,7 @@ PHP_METHOD(SoapServer, handle)
}
function_table = &((Z_OBJCE_P(soap_obj))->function_table);
} else {
if (service->soap_functions.functions_all == TRUE) {
if (service->soap_functions.functions_all) {
function_table = EG(function_table);
} else {
function_table = service->soap_functions.ft;
Expand Down