php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

sapi/cli: Print non-default INI settings for --ini=diff (#17762)

Browse Source 
This is a follow-up for php/php-src#17459, updating the command-line flag to
not modify the behavior of `--ini`.
This commit is contained in:
Tim Düsterhus
2025-03-04 08:42:06 +01:00
committed by GitHub
parent 0df99742c4
commit 057ff3519d
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -3,7 +3,7 @@ PHP NEWS
?? ??? ????, PHP 8.5.0alpha1
- CLI:
. Extended --ini to print INI settings changed from the builtin default.
. Add --ini=diff to print INI settings changed from the builtin default.
(timwolla)
. Drop support for -z CLI/CGI flag. (nielsdos)
. Fixed GH-17956 - development server 404 page does not adapt to mobiles.

3
UPGRADING
View File

@@ -136,7 +136,8 @@ PHP 8.5 UPGRADE NOTES
- CLI:
. Trying to set a process title that is too long with cli_set_process_title()
will now fail instead of silently truncating the given title.
. --ini will now print INI settings changed from the builtin default.
. Added a new --ini=diff option to print INI settings changed from the builtin
default.
========================================
4. Deprecated Functionality

1
sapi/cli/cli.h
View File

@@ -49,6 +49,7 @@ typedef enum php_cli_mode {
PHP_CLI_MODE_REFLECTION_EXT_INFO = 11,
PHP_CLI_MODE_REFLECTION_ZEND_EXTENSION = 12,
PHP_CLI_MODE_SHOW_INI_CONFIG = 13,
PHP_CLI_MODE_SHOW_INI_DIFF = 14,
} php_cli_mode;
typedef struct php_cli_server_context {

18
sapi/cli/php_cli.c
View File

@@ -158,7 +158,7 @@ const opt_struct OPTIONS[] = {
{13, 1, "rzendextension"},
{14, 1, "ri"},
{14, 1, "rextinfo"},
{15, 0, "ini"},
{15, 2, "ini"},
/* Internal testing option -- may be changed or removed without notice,
* including in patch releases. */
{16, 1, "repeat"},
@@ -500,6 +500,7 @@ static void php_cli_usage(char *argv0)
" starts with - or script is read from stdin\n"
"\n"
" --ini Show configuration file names\n"
" --ini=diff Show INI entries that differ from the built-in default\n"
"\n"
" --rf <name> Show information about function <name>.\n"
" --rc <name> Show information about class <name>.\n"
@@ -822,7 +823,15 @@ static int do_cli(int argc, char **argv) /* {{{ */
reflection_what = php_optarg;
break;
case 15:
context.mode = PHP_CLI_MODE_SHOW_INI_CONFIG;
if (php_optarg) {
if (strcmp(php_optarg, "diff") == 0) {
context.mode = PHP_CLI_MODE_SHOW_INI_DIFF;
} else {
param_error = "Unknown argument for --ini\n";
}
} else {
context.mode = PHP_CLI_MODE_SHOW_INI_CONFIG;
}
break;
case 16:
num_repeats = atoi(php_optarg);
@@ -1101,7 +1110,10 @@ do_repeat:
zend_printf("Loaded Configuration File: %s\n", php_ini_opened_path ? php_ini_opened_path : "(none)");
zend_printf("Scan for additional .ini files in: %s\n", php_ini_scanned_path ? php_ini_scanned_path : "(none)");
zend_printf("Additional .ini files parsed: %s\n", php_ini_scanned_files ? php_ini_scanned_files : "(none)");
zend_printf("\n");
break;
}
case PHP_CLI_MODE_SHOW_INI_DIFF:
{
zend_printf("Non-default INI settings:\n");
zend_ini_entry *ini_entry;
HashTable *sorted = zend_array_dup(EG(ini_directives));