Merge branch 'PHP-7.2' into PHP-7.3

Author: nikic

ext/sodium/libsodium.c

@@ -37,9 +37,8 @@ static zend_class_entry *sodium_exception_ce;
 ZEND_BEGIN_ARG_INFO_EX(AI_None, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(AI_FirstArgByReferenceSecondLength, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(AI_FirstArgByReference, 0, 0, 1)
 	ZEND_ARG_INFO(1, reference)
-	ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(AI_String, 0, 0, 1)
@@ -339,7 +338,7 @@ static const zend_function_entry sodium_functions[] = {
 	PHP_FE(sodium_compare, AI_TwoStrings)
 	PHP_FE(sodium_increment, AI_StringRef)
 	PHP_FE(sodium_memcmp, AI_TwoStrings)
-	PHP_FE(sodium_memzero, AI_FirstArgByReferenceSecondLength)
+	PHP_FE(sodium_memzero, AI_FirstArgByReference)
 	PHP_FE(sodium_pad, AI_StringAndLength)
 	PHP_FE(sodium_unpad, AI_StringAndLength)