Merge branch 'PHP-8.4'

* PHP-8.4:
  ext/standard: Sync parameter names for fpow() to be identical to pow()
This commit is contained in:
Gina Peter Banyard 2024-11-11 13:07:02 +00:00
commit 573ad05a8d
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
2 changed files with 6 additions and 3 deletions

View file

@ -3276,7 +3276,7 @@ function fdiv(float $num1, float $num2): float {}
/**
* @compile-time-eval
*/
function fpow(float $num1, float $num2): float {}
function fpow(float $num, float $exponent): float {}
/* microtime.c */

View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 583e2f348efe048b71eb313ca2a4b8bbb8fc7a9a */
* Stub hash: e277d3a5699db6aeedb08642720be841dc37d683 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@ -1724,7 +1724,10 @@ ZEND_END_ARG_INFO()
#define arginfo_fdiv arginfo_fmod
#define arginfo_fpow arginfo_fmod
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_fpow, 0, 2, IS_DOUBLE, 0)
ZEND_ARG_TYPE_INFO(0, num, IS_DOUBLE, 0)
ZEND_ARG_TYPE_INFO(0, exponent, IS_DOUBLE, 0)
ZEND_END_ARG_INFO()
#if defined(HAVE_GETTIMEOFDAY)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_microtime, 0, 0, MAY_BE_STRING|MAY_BE_DOUBLE)