]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 3 Sep 2019 07:53:51 +0000 (09:53 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 3 Sep 2019 07:53:51 +0000 (09:53 +0200)
1  2 
ext/opcache/Optimizer/zend_func_info.c

index bf6e332a026dad861f5afa7d0e579184121483a8,a06ac05b6b7114800207233e75eacac996b801b8..abdc2f45951ddffebe6484c4151ed33f333d2d3a
@@@ -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),