Rename the ini setting

Author: TysonAndre

Zend/tests/exception_024.phpt

@@ -1,7 +1,7 @@
 --TEST--
-throwable_string_param_max_len ini setting
+zend.exception_string_param_max_len ini setting
 --INI--
-throwable_string_param_max_len = 23
+zend.exception_string_param_max_len = 23
 --FILE--
 <?php
 

Zend/tests/exception_025.phpt

@@ -1,18 +1,18 @@
 --TEST--
-throwable_string_param_max_len ini setting
+zend.exception_string_param_max_len ini setting
 --FILE--
 <?php
 
 function main($arg) {
     echo (new Exception()), "\n";
 }
-var_dump(ini_set('throwable_string_param_max_len', '-1'));
-var_dump(ini_set('throwable_string_param_max_len', '1000001'));
-var_dump(ini_set('throwable_string_param_max_len', '1000000'));
-var_dump(ini_set('throwable_string_param_max_len', '20'));
+var_dump(ini_set('zend.exception_string_param_max_len', '-1'));
+var_dump(ini_set('zend.exception_string_param_max_len', '1000001'));
+var_dump(ini_set('zend.exception_string_param_max_len', '1000000'));
+var_dump(ini_set('zend.exception_string_param_max_len', '20'));
 main('short');
 main('123456789012345678901234567890');
-var_dump(ini_set('throwable_string_param_max_len', '0'));
+var_dump(ini_set('zend.exception_string_param_max_len', '0'));
 main('short');
 main('');
 

Zend/zend_exceptions.c

@@ -483,8 +483,8 @@ static void _build_trace_args(zval *arg, smart_str *str) /* {{{ */
 			break;
 		case IS_STRING:
 			smart_str_appendc(str, '\'');
-			smart_str_append_escaped(str, Z_STRVAL_P(arg), MIN(Z_STRLEN_P(arg), PG(throwable_string_param_max_len)));
-			if (Z_STRLEN_P(arg) > PG(throwable_string_param_max_len)) {
+			smart_str_append_escaped(str, Z_STRVAL_P(arg), MIN(Z_STRLEN_P(arg), PG(exception_string_param_max_len)));
+			if (Z_STRLEN_P(arg) > PG(exception_string_param_max_len)) {
 				smart_str_appends(str, "...', ");
 			} else {
 				smart_str_appends(str, "', ");

main/main.c

@@ -268,7 +268,7 @@ static PHP_INI_MH(OnSetThrowableStringParamMaxLen)
 
 	ZEND_ATOL(i, ZSTR_VAL(new_value));
 	if (i >= 0 && i <= 1000000) {
-		PG(throwable_string_param_max_len) = i;
+		PG(exception_string_param_max_len) = i;
 		return SUCCESS;
 	} else {
 		return FAILURE;
@@ -719,7 +719,7 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("register_argc_argv",	"1",		PHP_INI_PERDIR|PHP_INI_SYSTEM,	OnUpdateBool,	register_argc_argv,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("auto_globals_jit",		"1",		PHP_INI_PERDIR|PHP_INI_SYSTEM,	OnUpdateBool,	auto_globals_jit,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("short_open_tag",	DEFAULT_SHORT_OPEN_TAG,	PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			short_tags,				zend_compiler_globals,	compiler_globals)
-	STD_PHP_INI_ENTRY("throwable_string_param_max_len",	"15",	PHP_INI_ALL,	OnSetThrowableStringParamMaxLen,	throwable_string_param_max_len,		php_core_globals,	core_globals)
+	STD_PHP_INI_ENTRY("zend.exception_string_param_max_len",	"15",	PHP_INI_ALL,	OnSetThrowableStringParamMaxLen,	exception_string_param_max_len,		php_core_globals,	core_globals)
 
 	STD_PHP_INI_ENTRY("unserialize_callback_func",	NULL,	PHP_INI_ALL,		OnUpdateString,			unserialize_callback_func,	php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("serialize_precision",	"-1",	PHP_INI_ALL,		OnSetSerializePrecision,			serialize_precision,	php_core_globals,	core_globals)

main/php_globals.h

@@ -169,7 +169,7 @@ struct _php_core_globals {
 	zend_bool have_called_openlog;
 	zend_long syslog_filter;
 
-	zend_long throwable_string_param_max_len;
+	zend_long exception_string_param_max_len;
 };
 
 

php.ini-development

@@ -369,7 +369,7 @@ zend.exception_ignore_args = Off
 ; to a value between 0 and 1000000.
 ; This has no effect when zend.exception_ignore_args is enabled.
 ; Default: 15
-throwable_string_param_max_len = 15
+zend.exception_string_param_max_len = 15
 
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;

php.ini-production

@@ -373,7 +373,7 @@ zend.exception_ignore_args = On
 ; Default: 15
 ; In production, it is recommended to set this to 0 to reduce the output
 ; of sensitive information in stack traces.
-throwable_string_param_max_len = 0
+zend.exception_string_param_max_len = 0
 
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;

run-tests.php

@@ -343,7 +343,7 @@ function main()
         'opcache.jit_hot_side_exit=1',
         'zend.assertions=1',
         'zend.exception_ignore_args=0',
-        'throwable_string_param_max_len=15',
+        'zend.exception_string_param_max_len=15',
         'short_open_tag=0',
     );