From 8dd70ebe7c781915b3382477b56488096e18386f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 30 Sep 2024 08:09:01 +0200
Subject: fix test suite with PHP 8.4 using patch from

  https://github.com/igbinary/igbinary/pull/393
---
 393.patch              | 29 +++++++++++++++++++++++++++++
 php-pecl-igbinary.spec | 13 +++++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 393.patch

diff --git a/393.patch b/393.patch
new file mode 100644
index 0000000..6b47045
--- /dev/null
+++ b/393.patch
@@ -0,0 +1,29 @@
+From f5d5ce34a0f7ef60a7321fd79a1477b32fc1e03b Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 30 Sep 2024 08:05:42 +0200
+Subject: [PATCH] E_STRICT is deprecated in 8.4
+
+---
+ tests/igbinary_009b_php8.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/igbinary_009b_php8.phpt b/tests/igbinary_009b_php8.phpt
+index 483576aa..33d24518 100644
+--- a/tests/igbinary_009b_php8.phpt
++++ b/tests/igbinary_009b_php8.phpt
+@@ -12,7 +12,7 @@ if (PHP_MAJOR_VERSION < 8) {
+ pcre.jit=0
+ --FILE--
+ <?php
+-error_reporting(E_ALL|E_STRICT);
++error_reporting(PHP_VERSION_ID < 80400 ?E_ALL|E_STRICT : E_ALL);
+ // Verify that $type[0] is the same zval as $type[0][0][0], but different from $type[0]
+ function test_cyclic2($type, $variable) {
+ 	$serialized = igbinary_serialize($variable);
+@@ -111,4 +111,4 @@ array(1) {
+   }
+ }
+ 
+-(Was normalized)
+\ No newline at end of file
++(Was normalized)
diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec
index a61273f..ba25715 100644
--- a/php-pecl-igbinary.spec
+++ b/php-pecl-igbinary.spec
@@ -28,11 +28,13 @@
 Summary:        Replacement for the standard PHP serializer
 Name:           %{?scl_prefix}php-pecl-igbinary
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        3%{?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
+
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-pear
@@ -92,6 +94,8 @@ These are the files needed to compile programs using Igbinary
 sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml
 
 pushd %{sources}
+%patch -P0 -p1
+
 # Check version
 subdir=php7
 extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' src/$subdir/igbinary.h)
@@ -169,9 +173,6 @@ done
 
 %check
 cd %{sources}
-# PHP 8.4.0RC1
-rm tests/igbinary_009b_php8.phpt
-
 MOD=""
 # drop extension load from phpt
 sed -e '/^extension=/d' -i tests/*phpt
@@ -242,6 +243,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Sep 30 2024 Remi Collet <remi@remirepo.net> - 3.2.16-3
+- fix test suite with PHP 8.4 using patch from
+  https://github.com/igbinary/igbinary/pull/393
+
 * Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 3.2.16-2
 - rebuild for 8.4.0RC1
 
-- 
cgit