From 7791784bc9229433f03b0529a61c8e843a30c8ea Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 28 May 2019 13:14:58 +0200 Subject: [PATCH] Revert accidental changes These MAY_BE_FALSE should not have been dropped... --- ext/opcache/Optimizer/zend_func_info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index ae33da0022..eee98b3137 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -209,7 +209,7 @@ static const func_info_t func_infos[] = { F0("strcoll", MAY_BE_LONG), #endif #ifdef HAVE_STRFMON - F1("money_format", MAY_BE_STRING), + F1("money_format", MAY_BE_FALSE | MAY_BE_STRING), #endif FN("substr", MAY_BE_FALSE | MAY_BE_STRING), FN("substr_replace", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), @@ -246,7 +246,7 @@ static const func_info_t func_infos[] = { F1("str_getcsv", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING), F1("str_pad", MAY_BE_NULL | MAY_BE_STRING), F1("chop", MAY_BE_NULL | MAY_BE_STRING), - F1("strchr", MAY_BE_STRING), + F1("strchr", MAY_BE_FALSE | MAY_BE_STRING), F1("sprintf", MAY_BE_FALSE | MAY_BE_STRING), F0("printf", MAY_BE_FALSE | MAY_BE_LONG), F0("vprintf", MAY_BE_FALSE | MAY_BE_LONG), -- 2.40.0