GH-21754: sapi/cli: avoid deprecation messages with --rf and methods

Author: DanielEScherzer

sapi/cli/php_cli.c

@@ -1042,13 +1042,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

@@ -32,9 +32,7 @@ string(155) "Function [ <internal:standard> function phpinfo ] {
 }
 
 "
-string(371) "
-Deprecated: Calling ReflectionMethod::__construct() with 1 argument is deprecated, use ReflectionMethod::createFromMethodName() instead in Unknown on line 0
-Method [ <internal:Reflection, ctor> public method __construct ] {
+string(213) "Method [ <internal:Reflection, ctor> public method __construct ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> object|string $objectOrMethod ]
@@ -43,8 +41,6 @@ Method [ <internal:Reflection, ctor> public method __construct ] {
 }
 
 "
-string(219) "
-Deprecated: Calling ReflectionMethod::__construct() with 1 argument is deprecated, use ReflectionMethod::createFromMethodName() instead in Unknown on line 0
-Exception: Method ReflectionMethod::missing() does not exist
+string(61) "Exception: Method ReflectionMethod::missing() does not exist
 "
 Done