From: Nikita Popov Date: Tue, 3 Sep 2019 07:53:51 +0000 (+0200) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d440a3cddbd20e55025b017b1ebd4ffce0166d26;p=php Merge branch 'PHP-7.4' --- d440a3cddbd20e55025b017b1ebd4ffce0166d26 diff --cc ext/opcache/Optimizer/zend_func_info.c index bf6e332a02,a06ac05b6b..abdc2f4595 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@@ -1063,12 -1207,15 +1063,15 @@@ static const func_info_t func_infos[] /* ext/hash */ F1("hash", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F0("hash_equals", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("hash_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("hash_hmac", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("hash_hmac_algos", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("hash_hmac_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("hash_hkdf", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("hash_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), F0("hash_update", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F0("hash_update_stream", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("hash_update_stream", MAY_BE_NULL | MAY_BE_LONG), F0("hash_update_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("hash_final", MAY_BE_NULL | MAY_BE_STRING), F1("hash_copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),