Merge branch 'PHP-7.4'

diff --cc ext/opcache/Optimizer/zend_func_info.c
index ec521ea586cd25a04b46e79249918160c7be8d1a,d9ff58e75e3f848523865bdb54768af8e7fecb7d..f13bd0ce78c8845233809c4d4fc1e306fc438657
--- 1/ext/opcache/Optimizer/zend_func_info.c
--- 2/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@@ -552,19 -682,19 +552,19 @@@ static const func_info_t func_infos[] 
        F0("stream_wrapper_restore",       MAY_BE_FALSE | MAY_BE_TRUE),
        F1("stream_get_wrappers",          MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
        F1("stream_get_transports",        MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
 -      F1("stream_resolve_include_path",  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
 +      F1("stream_resolve_include_path",  MAY_BE_FALSE | MAY_BE_STRING),
        F0("stream_is_local",              MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("get_headers",                  MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
 -      F1("get_headers",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
++      F1("get_headers",                  MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
  #if HAVE_SYS_TIME_H || defined(PHP_WIN32)
 -      F0("stream_set_timeout",           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 -      F0("socket_set_timeout",           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 +      F0("stream_set_timeout",           MAY_BE_FALSE | MAY_BE_TRUE),
 +      F0("socket_set_timeout",           MAY_BE_FALSE | MAY_BE_TRUE),
  #endif
 -      F1("socket_get_status",            MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
 +      F1("socket_get_status",            MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
  #if HAVE_REALPATH || defined(ZTS)
 -      F1("realpath",                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
 +      F1("realpath",                     MAY_BE_FALSE | MAY_BE_STRING),
  #endif
  #ifdef HAVE_FNMATCH
 -      F0("fnmatch",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 +      F0("fnmatch",                      MAY_BE_FALSE | MAY_BE_TRUE),
  #endif
        F1("fsockopen",                    MAY_BE_FALSE | MAY_BE_RESOURCE),
        FN("pfsockopen",                   MAY_BE_FALSE | MAY_BE_RESOURCE),