Skip to content

Commit 3f0b586

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix a few func info
2 parents e4c23fa + cdf0550 commit 3f0b586

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Zend/Optimizer/zend_func_info.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,9 @@ static const func_info_t old_func_infos[] = {
9696
F1("base64_decode", MAY_BE_FALSE | MAY_BE_STRING),
9797
F1("base64_encode", MAY_BE_STRING),
9898
F1("password_hash", MAY_BE_STRING),
99-
F1("password_get_info", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
99+
F1("password_get_info", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
100100
F1("convert_uuencode", MAY_BE_STRING),
101101
F1("convert_uudecode", MAY_BE_FALSE | MAY_BE_STRING),
102-
F1("pow", MAY_BE_LONG | MAY_BE_DOUBLE | MAY_BE_OBJECT),
103102
F1("decbin", MAY_BE_STRING),
104103
F1("decoct", MAY_BE_STRING),
105104
F1("dechex", MAY_BE_STRING),
@@ -143,7 +142,6 @@ static const func_info_t old_func_infos[] = {
143142
F1("highlight_string", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
144143
F1("php_strip_whitespace", MAY_BE_STRING),
145144
F1("ini_get_all", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
146-
F1("ini_alter", MAY_BE_FALSE | MAY_BE_STRING),
147145
F1("get_include_path", MAY_BE_FALSE | MAY_BE_STRING),
148146
F1("set_include_path", MAY_BE_FALSE | MAY_BE_STRING),
149147
F1("headers_list", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
@@ -166,7 +164,6 @@ static const func_info_t old_func_infos[] = {
166164
F1("file_get_contents", MAY_BE_FALSE | MAY_BE_STRING),
167165
F1("stream_context_get_params", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
168166
FN("stream_context_get_options", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
169-
F1("stream_socket_get_name", MAY_BE_FALSE | MAY_BE_STRING),
170167
F1("stream_socket_recvfrom", MAY_BE_FALSE | MAY_BE_STRING),
171168
#if HAVE_SOCKETPAIR
172169
F1("stream_socket_pair", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_RESOURCE),

0 commit comments

Comments
 (0)