mirror of
https://github.com/php-gnupg/php-gnupg.git
synced 2024-12-23 02:11:40 +00:00
Fix missing and incorrect arginfos
This commit is contained in:
Jakub Zelenka
parent
89eb4447df
commit
e4ab851f1f
2 changed files with 63 additions and 22 deletions
59
gnupg.c
59
gnupg.c
|
|
@ -216,6 +216,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_init, 0, 0, 0)
|
|||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg void methods */
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_void_method, 0, 0, 0)
|
||||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg method with armor parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_armor_method, 0)
|
||||
ZEND_ARG_INFO(0, armor)
|
||||
|
|
@ -240,6 +245,20 @@ ZEND_BEGIN_ARG_INFO(arginfo_gnupg_key_method, 0)
|
|||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg methods with adddecryptkey parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_key_passphrase_method, 0)
|
||||
ZEND_ARG_INFO(0, kye)
|
||||
ZEND_ARG_INFO(0, passphrase)
|
||||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg methods with deletekey parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_deletekey_method, 0)
|
||||
ZEND_ARG_INFO(0, kye)
|
||||
ZEND_ARG_INFO(0, allow_secret)
|
||||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg methods with key parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_keyid_method, 0)
|
||||
ZEND_ARG_INFO(0, kyeid)
|
||||
|
|
@ -294,25 +313,25 @@ phpc_function_entry gnupg_methods[] = {
|
|||
PHP_ME(gnupg, __construct, arginfo_gnupg_init, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
|
||||
PHP_GNUPG_FALIAS(keyinfo, arginfo_gnupg_keyinfo_method)
|
||||
PHP_GNUPG_FALIAS(verify, arginfo_gnupg_verify_method)
|
||||
PHP_GNUPG_FALIAS(getengineinfo, NULL)
|
||||
PHP_GNUPG_FALIAS(geterror, NULL)
|
||||
PHP_GNUPG_FALIAS(clearsignkeys, NULL)
|
||||
PHP_GNUPG_FALIAS(clearencryptkeys, NULL)
|
||||
PHP_GNUPG_FALIAS(cleardecryptkeys, NULL)
|
||||
PHP_GNUPG_FALIAS(getengineinfo, arginfo_gnupg_void_method)
|
||||
PHP_GNUPG_FALIAS(geterror, arginfo_gnupg_void_method)
|
||||
PHP_GNUPG_FALIAS(clearsignkeys, arginfo_gnupg_void_method)
|
||||
PHP_GNUPG_FALIAS(clearencryptkeys, arginfo_gnupg_void_method)
|
||||
PHP_GNUPG_FALIAS(cleardecryptkeys, arginfo_gnupg_void_method)
|
||||
PHP_GNUPG_FALIAS(setarmor, arginfo_gnupg_armor_method)
|
||||
PHP_GNUPG_FALIAS(encrypt, arginfo_gnupg_text_method)
|
||||
PHP_GNUPG_FALIAS(decrypt, arginfo_gnupg_enctext_method)
|
||||
PHP_GNUPG_FALIAS(export, arginfo_gnupg_pattern_method)
|
||||
PHP_GNUPG_FALIAS(import, arginfo_gnupg_key_method)
|
||||
PHP_GNUPG_FALIAS(getprotocol, NULL)
|
||||
PHP_GNUPG_FALIAS(getprotocol, arginfo_gnupg_void_method)
|
||||
PHP_GNUPG_FALIAS(setsignmode, arginfo_gnupg_signmode_method)
|
||||
PHP_GNUPG_FALIAS(sign, arginfo_gnupg_text_method)
|
||||
PHP_GNUPG_FALIAS(encryptsign, arginfo_gnupg_text_method)
|
||||
PHP_GNUPG_FALIAS(decryptverify, arginfo_gnupg_decryptverify_method)
|
||||
PHP_GNUPG_FALIAS(addsignkey, arginfo_gnupg_key_method)
|
||||
PHP_GNUPG_FALIAS(addsignkey, arginfo_gnupg_key_passphrase_method)
|
||||
PHP_GNUPG_FALIAS(addencryptkey, arginfo_gnupg_key_method)
|
||||
PHP_GNUPG_FALIAS(adddecryptkey, arginfo_gnupg_key_method)
|
||||
PHP_GNUPG_FALIAS(deletekey, arginfo_gnupg_key_method)
|
||||
PHP_GNUPG_FALIAS(adddecryptkey, arginfo_gnupg_key_passphrase_method)
|
||||
PHP_GNUPG_FALIAS(deletekey, arginfo_gnupg_deletekey_method)
|
||||
PHP_GNUPG_FALIAS(gettrustlist, arginfo_gnupg_pattern_method)
|
||||
PHP_GNUPG_FALIAS(listsignatures, arginfo_gnupg_keyid_method)
|
||||
PHP_GNUPG_FALIAS(seterrormode, arginfo_gnupg_errmode_method)
|
||||
|
|
@ -355,6 +374,22 @@ ZEND_BEGIN_ARG_INFO(arginfo_gnupg_key_function, 0)
|
|||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg functions with deletekey parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_deletekey_function, 0)
|
||||
ZEND_ARG_INFO(0, res)
|
||||
ZEND_ARG_INFO(0, kye)
|
||||
ZEND_ARG_INFO(0, allow_secret)
|
||||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg functions with adddecryptkey parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_key_passphrase_function, 0)
|
||||
ZEND_ARG_INFO(0, res)
|
||||
ZEND_ARG_INFO(0, kye)
|
||||
ZEND_ARG_INFO(0, passphrase)
|
||||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ arginfo for gnupg functions with key parameter */
|
||||
ZEND_BEGIN_ARG_INFO(arginfo_gnupg_keyid_function, 0)
|
||||
ZEND_ARG_INFO(0, res)
|
||||
|
|
@ -428,10 +463,10 @@ static zend_function_entry gnupg_functions[] = {
|
|||
PHP_FE(gnupg_encryptsign, arginfo_gnupg_text_function)
|
||||
PHP_FE(gnupg_decryptverify, arginfo_gnupg_decryptverify_function)
|
||||
PHP_FE(gnupg_geterror, arginfo_gnupg_void_function)
|
||||
PHP_FE(gnupg_addsignkey, arginfo_gnupg_key_function)
|
||||
PHP_FE(gnupg_addsignkey, arginfo_gnupg_key_passphrase_function)
|
||||
PHP_FE(gnupg_addencryptkey, arginfo_gnupg_key_function)
|
||||
PHP_FE(gnupg_adddecryptkey, arginfo_gnupg_key_function)
|
||||
PHP_FE(gnupg_deletekey, arginfo_gnupg_key_function)
|
||||
PHP_FE(gnupg_adddecryptkey, arginfo_gnupg_key_passphrase_function)
|
||||
PHP_FE(gnupg_deletekey, arginfo_gnupg_deletekey_function)
|
||||
PHP_FE(gnupg_gettrustlist, arginfo_gnupg_pattern_function)
|
||||
PHP_FE(gnupg_listsignatures, arginfo_gnupg_keyid_function)
|
||||
PHP_FE(gnupg_seterrormode, arginfo_gnupg_errmode_function)
|
||||
|
|
|
|||
|
|
@ -84,14 +84,20 @@ PHPC_OBJ_HANDLER_CREATE(gnupg_keylistiterator)
|
|||
PHPC_OBJ_HANDLER_CREATE_RETURN(gnupg_keylistiterator);
|
||||
}
|
||||
|
||||
|
||||
/* {{{ arginfo for gnupg void iterator method */
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_void_iterator_method, 0, 0, 0)
|
||||
ZEND_END_ARG_INFO()
|
||||
/* }}} */
|
||||
|
||||
/* {{{ method list gnupg_keylistiterator */
|
||||
static zend_function_entry gnupg_keylistiterator_methods[] = {
|
||||
PHP_ME(gnupg_keylistiterator, __construct, NULL, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, current, NULL, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, key, NULL, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, next, NULL, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, rewind, NULL, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, valid, NULL, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, __construct, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
|
||||
PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
|
||||
PHPC_FE_END
|
||||
};
|
||||
/* }}} */
|
||||
|
|
@ -140,7 +146,7 @@ PHP_METHOD(gnupg_keylistiterator, __construct)
|
|||
/* }}} */
|
||||
|
||||
/* {{{ proto string current() */
|
||||
PHP_METHOD(gnupg_keylistiterator,current)
|
||||
PHP_METHOD(gnupg_keylistiterator, current)
|
||||
{
|
||||
GNUPG_GET_ITERATOR();
|
||||
|
||||
|
|
@ -149,7 +155,7 @@ PHP_METHOD(gnupg_keylistiterator,current)
|
|||
/* }}} */
|
||||
|
||||
/* {{{ proto string key() */
|
||||
PHP_METHOD(gnupg_keylistiterator,key)
|
||||
PHP_METHOD(gnupg_keylistiterator, key)
|
||||
{
|
||||
GNUPG_GET_ITERATOR();
|
||||
|
||||
|
|
@ -158,7 +164,7 @@ PHP_METHOD(gnupg_keylistiterator,key)
|
|||
/* }}} */
|
||||
|
||||
/* {{{ proto bool next() */
|
||||
PHP_METHOD(gnupg_keylistiterator,next)
|
||||
PHP_METHOD(gnupg_keylistiterator, next)
|
||||
{
|
||||
GNUPG_GET_ITERATOR();
|
||||
|
||||
|
|
@ -175,7 +181,7 @@ PHP_METHOD(gnupg_keylistiterator,next)
|
|||
/* }}} */
|
||||
|
||||
/* {{{ proto bool rewind() */
|
||||
PHP_METHOD(gnupg_keylistiterator,rewind)
|
||||
PHP_METHOD(gnupg_keylistiterator, rewind)
|
||||
{
|
||||
GNUPG_GET_ITERATOR();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue