diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-04 07:16:56 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-04 07:16:56 +0100 |
commit | 39b08ba99ccaee881055382f3c73c80e5181c186 (patch) | |
tree | cc05806472371a5e5f806c415de7ab2227aea3fd | |
parent | b16b7ad036ee67f8e79e0165e8520027a83b6170 (diff) | |
parent | c8e9aa854cb722855dad450bff5815326853ff6a (diff) | |
download | php-git-39b08ba99ccaee881055382f3c73c80e5181c186.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix print_r return types in opcache
-rw-r--r-- | ext/opcache/Optimizer/zend_func_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 5c7a30a9f5..ce23207de9 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -534,7 +534,7 @@ static const func_info_t func_infos[] = { F0("var_dump", MAY_BE_NULL), F1("var_export", MAY_BE_NULL | MAY_BE_STRING), F0("debug_zval_dump", MAY_BE_NULL), - F1("print_r", MAY_BE_FALSE | MAY_BE_STRING), + F1("print_r", MAY_BE_TRUE | MAY_BE_STRING), F0("memory_get_usage", MAY_BE_FALSE | MAY_BE_LONG), F0("memory_get_peak_usage", MAY_BE_FALSE | MAY_BE_LONG), F0("register_shutdown_function", MAY_BE_NULL | MAY_BE_FALSE), |