diff options
| -rw-r--r-- | 35.patch | 49 | ||||
| -rw-r--r-- | php-pecl-oauth.spec | 8 |
2 files changed, 54 insertions, 3 deletions
@@ -1,7 +1,7 @@ From 633d0a55cd23d17c6a2e964d7671348b682af761 Mon Sep 17 00:00:00 2001 From: Remi Collet <remi@remirepo.net> Date: Fri, 4 Jul 2025 14:45:20 +0200 -Subject: [PATCH] arg_separators.input is an zend_string in 8.5 +Subject: [PATCH 1/2] arg_separators.input is an zend_string in 8.5 --- oauth.c | 4 ++++ @@ -23,3 +23,50 @@ index 1493eb7..a7fd6cc 100644 var = php_strtok_r(res, separator, &strtok_buf); while (var) { val = strchr(var, '='); + +From aab3ebf39558954b5e84f3fc7f3cc5fb19e963a2 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 17 Jul 2025 11:30:54 +0200 +Subject: [PATCH 2/2] use zend_ce_exception instead of + zend_exception_get_default() for 8.5 + +--- + oauth.c | 4 ++-- + provider.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/oauth.c b/oauth.c +index a7fd6cc..a424097 100644 +--- a/oauth.c ++++ b/oauth.c +@@ -179,7 +179,7 @@ static void so_object_free_storage(zend_object *obj) /* {{{ */ + void soo_handle_error(php_so_object *soo, long errorCode, char *msg, char *response, char *additional_info) /* {{{ */ + { + zval ex; +- zend_class_entry *dex = zend_exception_get_default(), *soox = soo_exception_ce; ++ zend_class_entry *dex = zend_ce_exception, *soox = soo_exception_ce; + + object_init_ex(&ex, soox); + +@@ -2790,7 +2790,7 @@ PHP_MINIT_FUNCTION(oauth) + + INIT_CLASS_ENTRY(soo_ex_ce, "OAuthException", NULL); + +- soo_exception_ce = zend_register_internal_class_ex(&soo_ex_ce, zend_exception_get_default()); ++ soo_exception_ce = zend_register_internal_class_ex(&soo_ex_ce, zend_ce_exception); + #if PHP_VERSION_ID >= 80200 + soo_exception_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; + zend_string *attribute_name_AllowDynamicProperties_class_OAuthException = zend_string_init_interned("AllowDynamicProperties", sizeof("AllowDynamicProperties") - 1, 1); +diff --git a/provider.c b/provider.c +index f1f8e2a..02025fc 100644 +--- a/provider.c ++++ b/provider.c +@@ -981,7 +981,7 @@ SOP_METHOD(reportProblem) + sapi_header_line ctr = {0}; + zend_bool send_headers = 1; + +- ex_ce = zend_exception_get_default(); ++ ex_ce = zend_ce_exception; + + if(zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &exception, ex_ce, &send_headers)==FAILURE) { + return; diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 17fea30..7271590 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -21,7 +21,7 @@ Name: %{?scl_prefix}php-pecl-oauth Version: 2.0.9 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP OAuth consumer extension License: BSD-3-Clause URL: https://pecl.php.net/package/oauth @@ -169,8 +169,12 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 2.0.9-4 +- add patch for PHP 8.5.0alpha2 from + https://github.com/php/pecl-web_services-oauth/pull/35 + * Fri Jul 4 2025 Remi Collet <remi@remirepo.net> - 2.0.9-3 -- add patch for PHP 8.5 from +- add patch for PHP 8.5.0alpha1 from https://github.com/php/pecl-web_services-oauth/pull/35 * Mon Nov 18 2024 Remi Collet <remi@remirepo.net> - 2.0.9-2 |