diff --git a/UPGRADING b/UPGRADING index 708303b32594c..29a2b2f88f12f 100644 --- a/UPGRADING +++ b/UPGRADING @@ -358,9 +358,13 @@ PHP 8.5 UPGRADE NOTES ======================================== - Core: - The high resolution timer (`hrtime()`) on macOS now uses the recommended - `clock_gettime_nsec_np(CLOCK_UPTIME_RAW)` API instead of - `mach_absolute_time()`. + . The high resolution timer (`hrtime()`) on macOS now uses the recommended + `clock_gettime_nsec_np(CLOCK_UPTIME_RAW)` API instead of + `mach_absolute_time()`. + +- CLI/CGI: + . The `-z` or `--zend-extension` option has been removed as it was + non-functional. Use `-d zend_extension=` instead. ======================================== 14. Performance Improvements diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 5ede45e766674..392a95d25ea3b 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -158,7 +158,6 @@ static const opt_struct OPTIONS[] = { {'w', 0, "strip"}, {'?', 0, "usage"},/* help alias (both '?' and 'usage') */ {'v', 0, "version"}, - {'z', 1, "zend-extension"}, {'T', 1, "timing"}, {'-', 0, NULL} /* end of args */ }; @@ -1042,7 +1041,6 @@ static void php_cgi_usage(char *argv0) " -s Display colour syntax highlighted source.\n" " -v Version number\n" " -w Display source with stripped comments and whitespace.\n" - " -z Load Zend extension .\n" " -T Measure execution time of script repeated times.\n", prog, prog); } @@ -2383,10 +2381,6 @@ consult the installation file that came with this distribution, or visit \n\ behavior = PHP_MODE_STRIP; break; - case 'z': /* load extension file */ - zend_load_extension(php_optarg); - break; - default: break; } diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index e8ac382402d23..797ef3242b6a3 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -303,13 +303,6 @@ Version number .PD 1 .B \-w Output source with stripped comments and whitespace -.TP -.PD 0 -.B \-\-zend\-extension \fIfile\fP -.TP -.PD 1 -.B \-z \fIfile\fP -Load Zend extension .IR file .TP .IR args.\|.\|. diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index ad2c8d1572715..55246cf96c91d 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -148,7 +148,6 @@ const opt_struct OPTIONS[] = { {'w', 0, "strip"}, {'?', 0, "usage"},/* help alias (both '?' and 'usage') */ {'v', 0, "version"}, - {'z', 1, "zend-extension"}, {10, 1, "rf"}, {10, 1, "rfunction"}, {11, 1, "rc"}, @@ -496,7 +495,6 @@ static void php_cli_usage(char *argv0) " -s Output HTML syntax highlighted source.\n" " -v Version number\n" " -w Output source with stripped comments and whitespace.\n" - " -z Load Zend extension .\n" "\n" " args... Arguments passed to script. Use -- args when first argument\n" " starts with - or script is read from stdin\n" @@ -800,9 +798,6 @@ static int do_cli(int argc, char **argv) /* {{{ */ context.mode = PHP_CLI_MODE_STRIP; break; - case 'z': /* load extension file */ - zend_load_extension(php_optarg); - break; case 'H': hide_argv = true; break;