Skip to content

Commit 616ec2d

Browse files
TysonAndrenikic
TysonAndre
authored and
nikic
committed
Update/fix remaining opcache zend_func_info.c signatures
See UPGRADING: > . The GD extension now uses objects as the underlying data structure for > images, rather than resources. These objects are completely opaque, i.e. > they don't have any methods. Remove types which are no longer in Reflection due to throwing instead of emitting warnings. Remove entries where reference counts are 0 and types are duplicated. Closes GH-4967.
1 parent af301be commit 616ec2d

File tree

1 file changed

+26
-46
lines changed

1 file changed

+26
-46
lines changed

‎ext/opcache/Optimizer/zend_func_info.c

Lines changed: 26 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,6 @@ static const func_info_t func_infos[] = {
422422
F1("get_browser", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
423423
F1("crypt", MAY_BE_STRING),
424424
FN("opendir", MAY_BE_FALSE | MAY_BE_RESOURCE),
425-
#if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC
426-
F0("chroot", MAY_BE_FALSE | MAY_BE_TRUE),
427-
#endif
428425
F1("getcwd", MAY_BE_FALSE | MAY_BE_STRING),
429426
F1("readdir", MAY_BE_FALSE | MAY_BE_STRING),
430427
F1("dir", MAY_BE_FALSE | MAY_BE_OBJECT),
@@ -435,7 +432,6 @@ static const func_info_t func_infos[] = {
435432
F1("filetype", MAY_BE_FALSE | MAY_BE_STRING),
436433
F1("stat", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
437434
F1("lstat", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
438-
F0("realpath_cache_size", MAY_BE_LONG),
439435
F1("realpath_cache_get", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY),
440436
#ifdef HAVE_SYSLOG_H
441437
F0("syslog", MAY_BE_TRUE),
@@ -566,7 +562,6 @@ static const func_info_t func_infos[] = {
566562
F1("date_sun_info", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG),
567563

568564
/* ext/preg */
569-
F0("preg_match_all", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
570565
FN("preg_replace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
571566
FN("preg_replace_callback", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
572567
F1("preg_filter", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
@@ -736,10 +731,7 @@ static const func_info_t func_infos[] = {
736731
/* ext/iconv */
737732
F1("iconv", MAY_BE_FALSE | MAY_BE_STRING),
738733
F1("iconv_get_encoding", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
739-
F0("iconv_strlen", MAY_BE_FALSE | MAY_BE_LONG),
740734
F1("iconv_substr", MAY_BE_FALSE | MAY_BE_STRING),
741-
F0("iconv_strpos", MAY_BE_FALSE | MAY_BE_LONG),
742-
F0("iconv_strrpos", MAY_BE_FALSE | MAY_BE_LONG),
743735
F1("iconv_mime_encode", MAY_BE_FALSE | MAY_BE_STRING),
744736
F1("iconv_mime_decode", MAY_BE_FALSE | MAY_BE_STRING),
745737
F1("iconv_mime_decode_headers", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
@@ -1016,61 +1008,49 @@ static const func_info_t func_infos[] = {
10161008

10171009
/* ext/gd */
10181010
F1("gd_info", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE),
1019-
F0("imageloadfont", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1020-
F1("imagecreatetruecolor", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1021-
F0("imagecolorallocatealpha", MAY_BE_FALSE | MAY_BE_LONG),
1022-
F0("imagecolorresolvealpha", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1023-
F0("imagecolorclosestalpha", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1024-
F0("imagecolorexactalpha", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1011+
F1("imagecreatetruecolor", MAY_BE_FALSE | MAY_BE_OBJECT),
10251012
#ifdef PHP_WIN32
1026-
F1("imagegrabwindow", MAY_BE_FALSE | MAY_BE_RESOURCE),
1027-
F1("imagegrabscreen", MAY_BE_FALSE | MAY_BE_RESOURCE),
1013+
F1("imagegrabwindow", MAY_BE_FALSE | MAY_BE_OBJECT),
1014+
F1("imagegrabscreen", MAY_BE_FALSE | MAY_BE_OBJECT),
10281015
#endif
1029-
F1("imagerotate", MAY_BE_FALSE | MAY_BE_RESOURCE),
1030-
F1("imagecreate", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1031-
F1("imagecreatefromstring", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1032-
F1("imagecreatefromgif", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1016+
F1("imagerotate", MAY_BE_FALSE | MAY_BE_OBJECT),
1017+
F1("imagecreate", MAY_BE_FALSE | MAY_BE_OBJECT),
1018+
F1("imagecreatefromstring", MAY_BE_FALSE | MAY_BE_OBJECT),
1019+
F1("imagecreatefromgif", MAY_BE_FALSE | MAY_BE_OBJECT),
10331020
#ifdef HAVE_GD_JPG
1034-
F1("imagecreatefromjpeg", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1021+
F1("imagecreatefromjpeg", MAY_BE_FALSE | MAY_BE_OBJECT),
10351022
#endif
10361023
#ifdef HAVE_GD_PNG
1037-
F1("imagecreatefrompng", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1024+
F1("imagecreatefrompng", MAY_BE_FALSE | MAY_BE_OBJECT),
10381025
#endif
10391026
#ifdef HAVE_GD_WEBP
1040-
F1("imagecreatefromwebp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1041-
F0("imagewebp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
1027+
F1("imagecreatefromwebp", MAY_BE_FALSE | MAY_BE_OBJECT),
10421028
#endif
1043-
F1("imagecreatefromxbm", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1029+
F1("imagecreatefromxbm", MAY_BE_FALSE | MAY_BE_OBJECT),
10441030
#if defined(HAVE_GD_XPM)
1045-
F1("imagecreatefromxpm", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1031+
F1("imagecreatefromxpm", MAY_BE_FALSE | MAY_BE_OBJECT),
10461032
#endif
1047-
F1("imagecreatefromwbmp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1048-
F1("imagecreatefromgd", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1049-
F1("imagecreatefromgd2", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1050-
F1("imagecreatefromgd2part", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1033+
F1("imagecreatefromwbmp", MAY_BE_FALSE | MAY_BE_OBJECT),
1034+
F1("imagecreatefromgd", MAY_BE_FALSE | MAY_BE_OBJECT),
1035+
F1("imagecreatefromgd2", MAY_BE_FALSE | MAY_BE_OBJECT),
1036+
F1("imagecreatefromgd2part", MAY_BE_FALSE | MAY_BE_OBJECT),
10511037
#if defined(HAVE_GD_BMP)
1052-
F1("imagecreatefrombmp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1038+
F1("imagecreatefrombmp", MAY_BE_FALSE | MAY_BE_OBJECT),
10531039
#endif
1054-
F0("imagecolorallocate", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1055-
F0("imagecolorat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1056-
F0("imagecolorclosest", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1057-
F0("imagecolorclosesthwb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1058-
F0("imagecolorresolve", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1059-
F0("imagecolorexact", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
10601040
F0("imagecolorset", MAY_BE_NULL | MAY_BE_FALSE),
1061-
F1("imagecolorsforindex", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG),
1041+
F1("imagecolorsforindex", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG),
10621042
F1("imagegetclip", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
1063-
F1("imageftbbox", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
1043+
F1("imageftbbox", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
10641044
F1("imagefttext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
10651045
F1("imagettfbbox", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
10661046
F1("imagettftext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
1067-
F1("imagecrop", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1068-
F1("imagecropauto", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1069-
F1("imagescale", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1070-
F1("imageaffine", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
1071-
F1("imageaffinematrixget", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_DOUBLE),
1072-
F1("imageaffinematrixconcat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_DOUBLE),
1073-
F1("imageresolution", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
1047+
F1("imagecrop", MAY_BE_FALSE | MAY_BE_OBJECT),
1048+
F1("imagecropauto", MAY_BE_FALSE | MAY_BE_OBJECT),
1049+
F1("imagescale", MAY_BE_FALSE | MAY_BE_OBJECT),
1050+
F1("imageaffine", MAY_BE_FALSE | MAY_BE_OBJECT),
1051+
F1("imageaffinematrixget", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_DOUBLE),
1052+
F1("imageaffinematrixconcat", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_DOUBLE),
1053+
F1("imageresolution", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
10741054

10751055
/* ext/spl */
10761056
F1("class_implements", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),

0 commit comments

Comments
 (0)