Implement suggestions by Tim Düsterhus

Author: sebastianbergmann

UPGRADING

@@ -269,10 +269,10 @@ PHP 8.6 UPGRADE NOTES
     constants).
 
 - Standard:
-  . ini_get_all() now includes a "default_value" element for each directive
-    when $details is true. It holds the compiled-in default value of the
-    directive (or null if it has none), independent of values set in php.ini,
-    on the command line, or at runtime.
+  . ini_get_all() now includes a "builtin_default_value" element for each
+    directive when $details is true. It holds the built-in default value of
+    the directive (or null if it has none), independent of values set in
+    php.ini, on the command line, or at runtime.
 
 ========================================
 6. New Functions

ext/standard/basic_functions.c

@@ -1956,9 +1956,9 @@ PHP_FUNCTION(ini_get_all)
 				}
 
 				if (ini_entry->def->value) {
-					add_assoc_stringl(&option, "default_value", ini_entry->def->value, ini_entry->def->value_length);
+					add_assoc_stringl(&option, "builtin_default_value", ini_entry->def->value, ini_entry->def->value_length);
 				} else {
-					add_assoc_null(&option, "default_value");
+					add_assoc_null(&option, "builtin_default_value");
 				}
 
 				add_assoc_long(&option, "access", ini_entry->modifiable);

ext/standard/tests/general_functions/ini_get_all.phpt

@@ -38,7 +38,7 @@ array(3) {
     string(7) "1000000"
     ["local_value"]=>
     string(7) "1000000"
-    ["default_value"]=>
+    ["builtin_default_value"]=>
     string(7) "1000000"
     ["access"]=>
     int(7)
@@ -49,7 +49,7 @@ array(3) {
     string(1) "1"
     ["local_value"]=>
     string(1) "1"
-    ["default_value"]=>
+    ["builtin_default_value"]=>
     string(1) "1"
     ["access"]=>
     int(7)
@@ -60,7 +60,7 @@ array(3) {
     string(6) "100000"
     ["local_value"]=>
     string(6) "100000"
-    ["default_value"]=>
+    ["builtin_default_value"]=>
     string(6) "100000"
     ["access"]=>
     int(7)

…functions/ini_get_all_default_value.phpt …s/ini_get_all_builtin_default_value.phptext/standard/tests/general_functions/ini_get_all_default_value.phpt renamed to ext/standard/tests/general_functions/ini_get_all_builtin_default_value.phpt ext/standard/tests/general_functions/ini_get_all_default_value.phpt renamed to ext/standard/tests/general_functions/ini_get_all_builtin_default_value.phpt

@@ -1,5 +1,5 @@
 --TEST--
-ini_get_all() exposes the compiled-in default_value independent of configuration and runtime changes
+ini_get_all() exposes the built-in default value independent of configuration and runtime changes
 --INI--
 precision=8
 --FILE--
@@ -10,16 +10,16 @@ $all = ini_get_all(null, true);
 
 var_dump($all["precision"]["global_value"]);
 var_dump($all["precision"]["local_value"]);
-var_dump($all["precision"]["default_value"]);
+var_dump($all["precision"]["builtin_default_value"]);
 
-// A runtime change must not affect default_value.
+// A runtime change must not affect builtin_default_value.
 ini_set("precision", "3");
 
 $all = ini_get_all(null, true);
 
 var_dump($all["precision"]["global_value"]);
 var_dump($all["precision"]["local_value"]);
-var_dump($all["precision"]["default_value"]);
+var_dump($all["precision"]["builtin_default_value"]);
 
 echo "Done\n";
 ?>

…ions/ini_get_all_default_value_null.phpt …_get_all_builtin_default_value_null.phptext/standard/tests/general_functions/ini_get_all_default_value_null.phpt renamed to ext/standard/tests/general_functions/ini_get_all_builtin_default_value_null.phpt ext/standard/tests/general_functions/ini_get_all_default_value_null.phpt renamed to ext/standard/tests/general_functions/ini_get_all_builtin_default_value_null.phpt

@@ -1,25 +1,25 @@
 --TEST--
-ini_get_all() reports a null default_value for a directive that has no compiled-in default
+ini_get_all() reports a null built-in default value for a directive that has no compiled-in default
 --INI--
 error_append_string=FOO
 --FILE--
 <?php
 
 // error_append_string is configured above, but it has no compiled-in default,
-// so default_value must be null regardless of configuration or runtime changes.
+// so builtin_default_value must be null regardless of configuration or runtime changes.
 $all = ini_get_all(null, true);
 
 var_dump($all["error_append_string"]["global_value"]);
 var_dump($all["error_append_string"]["local_value"]);
-var_dump($all["error_append_string"]["default_value"]);
+var_dump($all["error_append_string"]["builtin_default_value"]);
 
 ini_set("error_append_string", "BAR");
 
 $all = ini_get_all(null, true);
 
 var_dump($all["error_append_string"]["global_value"]);
 var_dump($all["error_append_string"]["local_value"]);
-var_dump($all["error_append_string"]["default_value"]);
+var_dump($all["error_append_string"]["builtin_default_value"]);
 
 echo "Done\n";
 ?>