Fix arginfos and tests for PHP 8

This commit is contained in:
Jakub Zelenka 2021-02-14 19:18:00 +00:00
parent 542d121eca
commit 100a19ce40
5 changed files with 15 additions and 7 deletions

View file

@ -1,5 +1,5 @@
--TEST--
get keyinfo
get engineinfo
--SKIPIF--
<?php if(!class_exists("gnupg")) die("skip"); ?>
--FILE--
@ -8,7 +8,7 @@ require_once "gnupgt.inc";
gnupgt::import_key();
$gpg = new gnupg();
$ret = $gpg->getengineinfo($fingerprint);
$ret = $gpg->getengineinfo();
var_dump($ret);
?>
--EXPECTF--

View file

@ -9,7 +9,7 @@ gnupgt::import_key();
$gpg = gnupg_init();
gnupg_seterrormode($gpg, GNUPG_ERROR_WARNING);
$ret = gnupg_deletekey($gpg, $fingerprint,true);
$ret = gnupg_deletekey($gpg, $fingerprint, true);
var_dump($ret);
?>
--EXPECT--

View file

@ -1,5 +1,5 @@
--TEST--
get keyinfo
get engineinfo
--SKIPIF--
<?php if(!class_exists("gnupg")) die("skip"); ?>
--FILE--

View file

@ -183,7 +183,8 @@ class gnupgt {
self::check_array(true, $ret, 0, 'subkeys', 0, 'can_certify');
self::check_array(false, $ret, 0, 'subkeys', 0, 'can_authenticate');
self::check_array(false, $ret, 0, 'subkeys', 0, 'is_qualified');
self::check_array_from_version('1.9.0', false, $ret, 0, 'subkeys', 0, 'is_de_vs');
// TODO: The is_de_vs seems to differ between gpg2 (true) and gpg1 (false) - differenatiate the test
//self::check_array_from_version('1.9.0', true, $ret, 0, 'subkeys', 0, 'is_de_vs');
self::check_array(GNUPG_PK_RSA, $ret, 0, 'subkeys', 0, 'pubkey_algo');
self::check_array(2048, $ret, 0, 'subkeys', 0, 'length');
self::check_array_from_version('1.7.0', false, $ret, 0, 'subkeys', 0, 'is_cardkey');
@ -201,7 +202,8 @@ class gnupgt {
self::check_array(false, $ret, 0, 'subkeys', 1, 'can_certify');
self::check_array(false, $ret, 0, 'subkeys', 1, 'can_authenticate');
self::check_array(false, $ret, 0, 'subkeys', 1, 'is_qualified');
self::check_array_from_version('1.9.0', false, $ret, 0, 'subkeys', 1, 'is_de_vs');
// TODO: The is_de_vs seems to differ between gpg2 (true) and gpg1 (false) - differenatiate the test
// self::check_array_from_version('1.9.0', true, $ret, 0, 'subkeys', 1, 'is_de_vs');
self::check_array(GNUPG_PK_RSA, $ret, 0, 'subkeys', 1, 'pubkey_algo');
self::check_array(2048, $ret, 0, 'subkeys', 1, 'length');
self::check_array_from_version('1.7.0', false, $ret, 0, 'subkeys', 1, 'is_cardkey');