Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  phpGH-21754: sapi/cli: avoid deprecation messages with `--rf` and methods (php#21758)

Author: DanielEScherzer

NEWS

@@ -15,6 +15,10 @@ PHP                                                                        NEWS
     self::/parent::/static:: callables if the error handler throws). (macoaure)
   . Fixed bug GH-21603 (Missing addref for __unset). (ilutov)
 
+- CLI:
+  . Fixed bug GH-21754 (`--rf` command line option with a method triggers
+    ext/reflection deprecation warnings). (DanielEScherzer)
+
 - Curl:
   . Add support for brotli and zstd on Windows. (Shivam Mathur)
 

sapi/cli/php_cli.c

@@ -1058,13 +1058,25 @@ static int do_cli(int argc, char **argv) /* {{{ */
 				}
 
 				ZVAL_STRING(&arg, reflection_what);
-				object_init_ex(&ref, pce);
 
 				memset(&execute_data, 0, sizeof(zend_execute_data));
 				execute_data.func = (zend_function *) &zend_pass_function;
 				EG(current_execute_data) = &execute_data;
-				zend_call_known_instance_method_with_1_params(
-					pce->constructor, Z_OBJ(ref), NULL, &arg);
+				// Avoid deprecation warnings from ReflectionMethod::__construct()
+				// with one argument
+				if (pce == reflection_method_ptr) {
+					zend_function *create_from_method = zend_hash_str_find_ptr(
+						&(pce->function_table),
+						"createfrommethodname",
+						strlen( "createFromMethodName" )
+					);
+					zend_call_known_function(
+						create_from_method, NULL, pce, &ref, 1, &arg, NULL);
+				} else {
+					object_init_ex(&ref, pce);
+					zend_call_known_instance_method_with_1_params(
+						pce->constructor, Z_OBJ(ref), NULL, &arg);
+				}
 
 				if (EG(exception)) {
 					zval rv;

sapi/cli/tests/004.phpt

@@ -12,6 +12,9 @@ $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
 var_dump(shell_exec("$php -n --rf unknown"));
 var_dump(shell_exec("$php -n --rf echo"));
 var_dump(shell_exec("$php -n --rf phpinfo"));
+// Regression tests for https://github.com/php/php-src/issues/21754
+var_dump(shell_exec("$php -n --rf ReflectionMethod::__construct"));
+var_dump(shell_exec("$php -n --rf ReflectionMethod::missing"));
 
 echo "Done\n";
 ?>
@@ -28,5 +31,16 @@ string(155) "Function [ <internal:standard> function phpinfo ] {
   - Return [ true ]
 }
 
+"
+string(213) "Method [ <internal:Reflection, ctor> public method __construct ] {
+
+  - Parameters [2] {
+    Parameter #0 [ <required> object|string $objectOrMethod ]
+    Parameter #1 [ <optional> ?string $method = null ]
+  }
+}
+
+"
+string(61) "Exception: Method ReflectionMethod::missing() does not exist
 "
 Done