diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-30 13:16:37 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-30 13:16:37 +0200 |
| commit | 3940441d94ff617bc11c8780e41d566eb7267a1e (patch) | |
| tree | 67f4ae312917ae1f1940954c98ef2f9162c8bc5b | |
| parent | d88fe24291696b20afa37efb2089cee2adb9aaf1 (diff) | |
https://github.com/php/pecl-web_services-oauth/pull/35
| -rw-r--r-- | 35.patch | 30 | ||||
| -rw-r--r-- | php-pecl-oauth.spec | 6 |
2 files changed, 33 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 1/2] arg_separators.input is an zend_string in 8.5 +Subject: [PATCH 1/3] arg_separators.input is an zend_string in 8.5 --- oauth.c | 4 ++++ @@ -27,7 +27,7 @@ index 1493eb7..a7fd6cc 100644 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 +Subject: [PATCH 2/3] use zend_ce_exception instead of zend_exception_get_default() for 8.5 --- @@ -70,3 +70,29 @@ index f1f8e2a..02025fc 100644 if(zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &exception, ex_ce, &send_headers)==FAILURE) { return; + +From 7e79b4146d55891d1fa40dcc3c4893e4f72b3c1b Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 30 Jul 2025 13:14:45 +0200 +Subject: [PATCH 3/3] use Zend/zend_smart_string.h + +--- + php_oauth.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/php_oauth.h b/php_oauth.h +index 1b7c987..ccea410 100644 +--- a/php_oauth.h ++++ b/php_oauth.h +@@ -35,7 +35,11 @@ + #else + #include "ext/random/php_random.h" + #endif ++#if PHP_VERSION_ID < 70200 + #include "ext/standard/php_smart_string.h" ++#else ++#include "Zend/zend_smart_string.h" ++#endif + #include "ext/standard/info.h" + #include "ext/standard/php_string.h" + #if PHP_VERSION_ID > 80200 diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 7271590..f493332 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: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?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,6 +169,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 2.0.9-5 +- add patch for PHP 8.5.0alpha3 from + https://github.com/php/pecl-web_services-oauth/pull/35 + * 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 |