1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 3f159064025dbde3aa0a4004cc4777a8032092b0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 17 Jul 2025 14:50:00 +0200
Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default()
for 8.5
---
gnupg.c | 4 ++--
gnupg_keylistiterator.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnupg.c b/gnupg.c
index 2693539..475d16e 100644
--- a/gnupg.c
+++ b/gnupg.c
@@ -64,7 +64,7 @@ PHPC_OBJ_DEFINE_HANDLER_VAR(gnupg);
break; \
case 2: \
zend_throw_exception(\
- zend_exception_get_default(TSRMLS_C), \
+ zend_ce_exception, \
(char*) error, \
0 TSRMLS_CC \
); \
@@ -169,7 +169,7 @@ static void php_gnupg_this_make(PHPC_THIS_DECLARE(gnupg), zval *options TSRMLS_D
if (gpgme_ctx_set_engine_info(
ctx, GPGME_PROTOCOL_OpenPGP, file_name, home_dir) != GPG_ERR_NO_ERROR) {
zend_throw_exception(
- zend_exception_get_default(TSRMLS_C),
+ zend_ce_exception,
(char*) "Setting engine info failed",
0 TSRMLS_CC
);
diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c
index 9b285ee..020e941 100644
--- a/gnupg_keylistiterator.c
+++ b/gnupg_keylistiterator.c
@@ -201,7 +201,7 @@ PHP_METHOD(gnupg_keylistiterator, rewind)
if ((PHPC_THIS->err = gpgme_op_keylist_start(
PHPC_THIS->ctx, PHPC_THIS->pattern ? PHPC_THIS->pattern : "", 0)) != GPG_ERR_NO_ERROR){
- zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char *)gpg_strerror(PHPC_THIS->err), 1 TSRMLS_CC);
+ zend_throw_exception(zend_ce_exception, (char *)gpg_strerror(PHPC_THIS->err), 1 TSRMLS_CC);
}
if ((PHPC_THIS->err = gpgme_op_keylist_next(PHPC_THIS->ctx, &PHPC_THIS->gpgkey)) != GPG_ERR_NO_ERROR){
RETURN_FALSE;
|
