Commit 1c6c7bc9dad for php.net

commit 1c6c7bc9dad738c68b35a012a63d4284950ae4a2
Merge: be9f26dbf49 fbd30175115
Author: Daniel Scherzer <daniel.e.scherzer@gmail.com>
Date:   Wed Apr 15 08:53:01 2026 -0700

    Merge branch 'PHP-8.4' into PHP-8.5

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

diff --cc sapi/cli/tests/004.phpt
index c88b85480bd,69dc46b5b90..b6e0e74fa6f
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@@ -9,9 -9,12 +9,12 @@@ include "skipif.inc"

  $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');

 -var_dump(`$php -n --rf unknown`);
 -var_dump(`$php -n --rf echo`);
 -var_dump(`$php -n --rf phpinfo`);
 +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(`$php -n --rf ReflectionMethod::__construct`);
 -var_dump(`$php -n --rf ReflectionMethod::missing`);
++var_dump(shell_exec("$php -n --rf ReflectionMethod::__construct"));
++var_dump(shell_exec("$php -n --rf ReflectionMethod::missing"));

  echo "Done\n";
  ?>