Rename to error_include_args

Avoid a negative which is harder to reason about; matches RFC change

Author: NattyNarwhal

Zend/tests/display_error_function_args.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Displaying function arguments in errors
 --INI--
-error_ignore_args=Off
+error_include_args=On
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ unlink('/');
 // XXX: May be better to provide a new zend_test func?
 password_hash("test", PASSWORD_BCRYPT, array("salt" => "123456789012345678901" . chr(0)));
 
-ini_set("error_ignore_args", "On");
+ini_set("error_include_args", "Off");
 
 unlink('/');
 password_hash("test", PASSWORD_BCRYPT, array("salt" => "123456789012345678901" . chr(0)));

ext/openssl/tests/ServerClientTestCase.inc

@@ -101,7 +101,7 @@ class ServerClientTestCase
             $cmd = sprintf(
                 '%s %s "%s" %s',
                 // XXX: TEST_PHP_EXTRA_ARGS for run-test values won't work here?
-                PHP_BINARY, $ini ? "-n -c $ini -d error_ignore_args=1" : "",
+                PHP_BINARY, $ini ? "-n -c $ini -d error_include_args=0" : "",
                 __FILE__,
                 WORKER_ARGV_VALUE
             );

main/main.c

@@ -804,7 +804,7 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY_EX("display_errors",		"1",		PHP_INI_ALL,		OnUpdateDisplayErrors,	display_errors,			php_core_globals,	core_globals, display_errors_mode)
 	STD_PHP_INI_BOOLEAN("display_startup_errors",	"1",	PHP_INI_ALL,		OnUpdateBool,			display_startup_errors,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("enable_dl",			"1",		PHP_INI_SYSTEM,		OnUpdateBool,			enable_dl,				php_core_globals,	core_globals)
-	STD_PHP_INI_BOOLEAN("error_ignore_args",	"0",	PHP_INI_ALL,		OnUpdateBool,			error_ignore_args,	php_core_globals,	core_globals)
+	STD_PHP_INI_BOOLEAN("error_include_args",	"1",	PHP_INI_ALL,		OnUpdateBool,			error_include_args,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("expose_php",			"1",		PHP_INI_SYSTEM,		OnUpdateBool,			expose_php,				php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("docref_root", 			"", 		PHP_INI_ALL,		OnUpdateString,			docref_root,			php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("docref_ext",				"",			PHP_INI_ALL,		OnUpdateString,			docref_ext,				php_core_globals,	core_globals)
@@ -1137,7 +1137,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
 	/* if we still have memory then format the origin */
 	if (is_function) {
 		zend_string *dynamic_params = NULL;
-		if (PG(error_ignore_args) == false) {
+		if (PG(error_include_args)) {
 			dynamic_params = zend_trace_current_function_args_string();
 		}
 		origin_len = spprintf(&origin, 0, "%s%s%s(%s)", class_name, space, function, dynamic_params ? ZSTR_VAL(dynamic_params) : params);

main/php_globals.h

@@ -61,7 +61,7 @@ struct _php_core_globals {
 
 	uint8_t display_errors;
 	bool display_startup_errors;
-	bool error_ignore_args;
+	bool error_include_args;
 	bool log_errors;
 	bool ignore_repeated_errors;
 	bool ignore_repeated_source;

php.ini-development

@@ -612,13 +612,13 @@ ignore_repeated_source = Off
 ;fatal_error_backtraces = On
 
 ; This directive controls whether PHP will print the actual arguments of a
-; function upon an error. If this is on (or there was an error fetching the
+; function upon an error. If this is off (or there was an error fetching the
 ; arguments), the function providing the error may optionally provide some
 ; additional information after the problem function's name.
 ; Default Value: Off
 ; Development Value: Off
 ; Production Value: Off
-;error_ignore_args = Off
+;error_include_args = Off
 
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;

php.ini-production

@@ -614,13 +614,13 @@ ignore_repeated_source = Off
 ;fatal_error_backtraces = On
 
 ; This directive controls whether PHP will print the actual arguments of a
-; function upon an error. If this is on (or there was an error fetching the
+; function upon an error. If this is off (or there was an error fetching the
 ; arguments), the function providing the error may optionally provide some
 ; additional information after the problem function's name.
 ; Default Value: Off
 ; Development Value: Off
 ; Production Value: Off
-;error_ignore_args = Off
+;error_include_args = Off
 
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;

run-tests.php

@@ -275,7 +275,7 @@ function main(): void
         'fatal_error_backtraces=Off',
         'display_errors=1',
         'display_startup_errors=1',
-        'error_ignore_args=1',
+        'error_include_args=0',
         'log_errors=0',
         'html_errors=0',
         'track_errors=0',

sapi/cli/tests/php_cli_server.inc

@@ -25,7 +25,7 @@ function php_cli_server_start(
     }
 
     // XXX: This should ideally use the same INI overrides as run-tests
-    $cmd = [$php_executable, '-d', 'error_ignore_args=1', '-t', $doc_root, '-n', ...$cmd_args, '-S', 'localhost:0'];
+    $cmd = [$php_executable, '-d', 'error_include_args=0', '-t', $doc_root, '-n', ...$cmd_args, '-S', 'localhost:0'];
     if (!is_null($router)) {
         $cmd[] = $router;
     }