From 297b1f8335ddec0423dc651e599ec1e9f6db6dc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Tue, 17 Dec 2019 22:17:17 +0100 Subject: [PATCH] Fix return type of strval() GH-5024 --- ext/standard/basic_functions.stub.php | 2 +- ext/standard/basic_functions_arginfo.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index d20f9c0bb7..246e9be833 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -1329,7 +1329,7 @@ function floatval($value): float {} function boolval($value): bool {} /** @param mixed $value */ -function strval($value): float {} +function strval($value): string {} /** @param mixed $value */ function is_null($value): bool {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index c0d7f2a45f..e67de5024f 100755 --- a/ext/standard/basic_functions_arginfo.h +++ b/ext/standard/basic_functions_arginfo.h @@ -2028,7 +2028,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_boolval, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define arginfo_strval arginfo_floatval +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_strval, 0, 1, IS_STRING, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() #define arginfo_is_null arginfo_boolval @@ -2138,9 +2140,7 @@ ZEND_END_ARG_INFO() #define arginfo_debug_zval_dump arginfo_var_dump -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_serialize, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() +#define arginfo_serialize arginfo_strval ZEND_BEGIN_ARG_INFO_EX(arginfo_unserialize, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) -- 2.50.1