type hints for secp256k1_ec_pubkey_combine

Author: Thomas Kerin

secp256k1/secp256k1.c

@@ -228,7 +228,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_secp256k1_context_randomize, IS_LON
     ZEND_ARG_TYPE_INFO(0, seed32, IS_STRING, 1)
 ZEND_END_ARG_INFO();
 
-ZEND_BEGIN_ARG_INFO(arginfo_secp256k1_ec_pubkey_combine, 0)
+#if (PHP_VERSION_ID >= 70000 && PHP_VERSION_ID <= 70200)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_secp256k1_ec_pubkey_combine, IS_LONG, NULL, 0)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_secp256k1_ec_pubkey_combine, IS_LONG, 0)
+#endif
     ZEND_ARG_TYPE_INFO(0, context, IS_RESOURCE, 0)
     ZEND_ARG_TYPE_INFO(1, combinedEcPublicKey, IS_RESOURCE, 1)
     ZEND_ARG_TYPE_INFO(0, publicKeys, IS_ARRAY, 0)
@@ -1174,11 +1178,11 @@ PHP_FUNCTION(secp256k1_ec_pubkey_combine)
     size_t array_count;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/a", &zCtx, &zPubkeyCombined, &arr) == FAILURE) {
-        RETURN_FALSE;
+        RETURN_LONG(result);
     }
 
     if ((ctx = php_get_secp256k1_context(zCtx)) == NULL) {
-        RETURN_FALSE;
+        RETURN_LONG(result);
     }
 
     arr_hash = Z_ARRVAL_P(arr);
@@ -1187,7 +1191,7 @@ PHP_FUNCTION(secp256k1_ec_pubkey_combine)
 
     ZEND_HASH_FOREACH_KEY_VAL(arr_hash, i, arrayKeyStr, arrayPubKey) {
         if ((ptr = php_get_secp256k1_pubkey(arrayPubKey)) == NULL) {
-            RETURN_FALSE;
+            RETURN_LONG(result);
         }
 
         pubkeys[i++] = ptr;

secp256k1/tests/secp256k1_ec_pubkey_combine_error1.phpt

@@ -10,11 +10,9 @@ if (!extension_loaded("secp256k1")) print "skip extension not loaded";
 set_error_handler(function($code, $str) { echo $str . PHP_EOL; });
 
 $result = secp256k1_ec_pubkey_combine();
-echo gettype($result) . PHP_EOL;
-echo ($result ? "true" : "false") . PHP_EOL;
+echo $result . PHP_EOL;
 
 ?>
 --EXPECT--
 secp256k1_ec_pubkey_combine() expects exactly 3 parameters, 0 given
-boolean
-false
+0

secp256k1/tests/secp256k1_ec_pubkey_combine_error2.phpt

@@ -12,11 +12,9 @@ set_error_handler(function($code, $str) { echo $str . PHP_EOL; });
 $combinedPubKey = null;
 $badCtx = tmpfile();
 $result = secp256k1_ec_pubkey_combine($badCtx, $combinedPubKey, []);
-echo gettype($result) . PHP_EOL;
-echo ($result ? "true" : "false") . PHP_EOL;
+echo $result . PHP_EOL;
 
 ?>
 --EXPECT--
 secp256k1_ec_pubkey_combine(): supplied resource is not a valid secp256k1_context resource
-boolean
-false
+0

secp256k1/tests/secp256k1_ec_pubkey_combine_error3.phpt

@@ -15,11 +15,9 @@ $pubKeys = [tmpfile()];
 
 $combinedPubKey = null;
 $result = secp256k1_ec_pubkey_combine($ctx, $combinedPubKey, $pubKeys);
-echo gettype($result) . PHP_EOL;
-echo ($result ? "true" : "false") . PHP_EOL;
+echo $result . PHP_EOL;
 
 ?>
 --EXPECT--
 secp256k1_ec_pubkey_combine(): supplied resource is not a valid secp256k1_pubkey resource
-boolean
-false
+0