diff options
| -rw-r--r-- | 399.patch | 55 | ||||
| -rw-r--r-- | php-pecl-igbinary.spec | 16 |
2 files changed, 70 insertions, 1 deletions
diff --git a/399.patch b/399.patch new file mode 100644 index 0000000..d9ed571 --- /dev/null +++ b/399.patch @@ -0,0 +1,55 @@ +From d28f7e6e5a2e7f73225bdf9b619920a7986ff885 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 1 Sep 2025 14:59:55 +0200 +Subject: [PATCH] fix tests for 8.5.0beta2 + +--- + tests/igbinary_026_php8.phpt | 2 -- + tests/igbinary_026b_php8.phpt | 4 +--- + tests/igbinary_057.phpt | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/tests/igbinary_026_php8.phpt b/tests/igbinary_026_php8.phpt +index 91313d16..9a5aad4e 100644 +--- a/tests/igbinary_026_php8.phpt ++++ b/tests/igbinary_026_php8.phpt +@@ -1,7 +1,5 @@ + --TEST-- + Cyclic array test +---INI-- +-report_memleaks=0 + --SKIPIF-- + <?php + if (!extension_loaded('igbinary')) { +diff --git a/tests/igbinary_026b_php8.phpt b/tests/igbinary_026b_php8.phpt +index b5ffa9cd..7489d539 100644 +--- a/tests/igbinary_026b_php8.phpt ++++ b/tests/igbinary_026b_php8.phpt +@@ -1,7 +1,5 @@ + --TEST-- + Cyclic array test 2 +---INI-- +-report_memleaks=0 + --SKIPIF-- + <?php + if (!extension_loaded('igbinary')) { +@@ -83,4 +81,4 @@ array(1) { + } + } + +-OK +\ No newline at end of file ++OK +diff --git a/tests/igbinary_057.phpt b/tests/igbinary_057.phpt +index 7df8ab5b..7d86d134 100644 +--- a/tests/igbinary_057.phpt ++++ b/tests/igbinary_057.phpt +@@ -6,7 +6,7 @@ Test serializing more strings than the capacity of the initial strings table. + function main() { + $array = array(); + for ($i = 0; $i < 2; $i++) { +- for ($c = 'a'; $c < 'z'; $c++) { ++ for ($c = 'a'; $c < 'z'; $c = chr(ord($c)+1)) { + $array[] = $c; + } + } diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec index 7240fde..36e939f 100644 --- a/php-pecl-igbinary.spec +++ b/php-pecl-igbinary.spec @@ -27,13 +27,14 @@ Summary: Replacement for the standard PHP serializer Name: %{?scl_prefix}php-pecl-igbinary Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD-3-Clause URL: https://pecl.php.net/package/igbinary Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: 393.patch Patch1: 398.patch +Patch2: 399.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -96,6 +97,7 @@ sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml pushd %{sources} %patch -P0 -p1 -b .pr393 %patch -P1 -p1 -b .pr398 +%patch -P2 -p1 -b .pr399 # Check version subdir=php7 @@ -201,7 +203,11 @@ OPTS="-q -P --show-diff" : upstream NTS test suite TEST_PHP_ARGS="-n $MOD -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +%if "%{php_version}" > "8.5" +REPORT_EXIT_STATUS=0 \ +%else REPORT_EXIT_STATUS=1 \ +%endif %{__php} -n run-tests.php $OPTS %endif @@ -237,6 +243,14 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 3.2.16-6 +- rebuild for PHP 8.5.0RC1 +- disable test suite with PHP 8.5 + +* Mon Sep 1 2025 Remi Collet <remi@remirepo.net> - 3.2.16-5 +- fix for PHP 8.5.0beta2 using patch from + https://github.com/igbinary/igbinary/pull/399 + * Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 3.2.16-4 - fix for PHP 8.5.0alpha3 using patch from https://github.com/igbinary/igbinary/pull/398 |