Merge branch 'PHP-8.5'

* PHP-8.5:
  Fix stale getopt() optional value in CLI

Author: iluuu1994

main/getopt.c

@@ -57,6 +57,9 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
 	static char **prev_optarg = NULL;
 
 	php_optidx = -1;
+	if (optarg) {
+		*optarg = NULL;
+	}
 
 	if(prev_optarg && prev_optarg != optarg) {
 		/* reset the state */

sapi/cli/tests/gh21901.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Stale getopt() optional value in CLI
+--FILE--
+<?php
+$php_escaped = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
+$cmd = $php_escaped . ' -n -d foo=bar --ini';
+echo shell_exec($cmd);
+?>
+--EXPECTF--
+Configuration File (php.ini) Path: "%S"
+Loaded Configuration File:         "%S"
+Scan for additional .ini files in: %s
+Additional .ini files parsed:      %s