diff options
| author | Sara Golemon <pollita@php.net> | 2018-09-25 12:10:21 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-09-25 12:10:21 -0400 |
| commit | 913c20e61fa3f74f87a7040e97ea0af3b7a58e68 (patch) | |
| tree | 7b41a4edc91e261f45acd22d21c890eebe59ebbd | |
| parent | 36092b23548403a7b9f1af1425ead3471689e604 (diff) | |
| parent | 4baf4964ad2cd30fbb9173bd4263e6d6eb9e649f (diff) | |
| download | php-git-913c20e61fa3f74f87a7040e97ea0af3b7a58e68.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76918 Repeated parameter name in arg info
| -rw-r--r-- | ext/hash/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 6bd52e2596..4d7f4958ca 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1362,7 +1362,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_file, 0, 0, 2) ZEND_ARG_INFO(0, context) ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, stream_context) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_final, 0, 0, 1) |