Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: the second parameter of sodium_hex2bin() is optional
  ext/sodium: AI_StringRef_And_String -> AI_StringRefAndString for consistency
  ext/sodium: sort functions list

Author: jedisct1

ext/sodium/libsodium.c

@@ -54,7 +54,13 @@ ZEND_BEGIN_ARG_INFO_EX(AI_TwoStrings, 0, 0, 2)
 	ZEND_ARG_INFO(0, string_2)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(AI_StringRef_And_String, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(AI_StringAndMaybeString, 0, 0, 1)
+	ZEND_ARG_INFO(0, string_1)
+	/* optional */
+	ZEND_ARG_INFO(0, string_2)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(AI_StringRefAndString, 0, 0, 2)
 	ZEND_ARG_INFO(1, string_1)
 	ZEND_ARG_INFO(0, string_2)
 ZEND_END_ARG_INFO()
@@ -264,9 +270,9 @@ const zend_function_entry sodium_functions[] = {
 	(SODIUM_LIBRARY_VERSION_MAJOR == 7 && SODIUM_LIBRARY_VERSION_MINOR >= 6)
 	PHP_FE(sodium_compare, AI_TwoStrings)
 #endif
-	PHP_FE(sodium_hex2bin, AI_TwoStrings)
+	PHP_FE(sodium_hex2bin, AI_AI_StringAndMaybeString)
 	PHP_FE(sodium_increment, AI_StringRef)
-	PHP_FE(sodium_add, AI_StringRef_And_String)
+	PHP_FE(sodium_add, AI_StringRefAndString)
 	PHP_FE(sodium_memcmp, AI_TwoStrings)
 	PHP_FE(sodium_memzero, AI_FirstArgByReferenceSecondLength)
 

ext/sodium/php_libsodium.h

@@ -43,10 +43,10 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_is_available);
 PHP_FUNCTION(sodium_crypto_aead_aes256gcm_keygen);
 PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_decrypt);
 PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_encrypt);
-PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_keygen);
 PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_decrypt);
 PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_encrypt);
 PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_keygen);
+PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_keygen);
 PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt);
 PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt);
 PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_keygen);