diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-04 11:01:31 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-04 11:01:31 +0200 |
| commit | 31bd6a12d71424e5a2f15e7f002c72beedc414c1 (patch) | |
| tree | 0e61e2b6a2e13374688cc9b110dde0821d452aea | |
| parent | e40146cbde80a4cd87c1d03324bda81f62bef7db (diff) | |
| -rw-r--r-- | 0001-fix-test-for-php-8.5-194.patch | 27 | ||||
| -rw-r--r-- | php-pecl-opentelemetry.spec | 9 |
2 files changed, 35 insertions, 1 deletions
diff --git a/0001-fix-test-for-php-8.5-194.patch b/0001-fix-test-for-php-8.5-194.patch new file mode 100644 index 0000000..e5bd230 --- /dev/null +++ b/0001-fix-test-for-php-8.5-194.patch @@ -0,0 +1,27 @@ +From 3953640bf49ac099f383d2aa26da5bf1910561c8 Mon Sep 17 00:00:00 2001 +From: Brett McBride <brett.a.mcbride@gmail.com> +Date: Mon, 25 Aug 2025 22:49:36 +1000 +Subject: [PATCH] fix test for php 8.5 (#194) + +Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in /home/runner/work/opentelemetry-php-instrumentation/opentelemetry-php-instrumentation/ext/tests/multiple_hooks_modify_params.php +--- + ext/tests/multiple_hooks_modify_params.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/tests/multiple_hooks_modify_params.phpt b/ext/tests/multiple_hooks_modify_params.phpt +index 136ebe5..90e92f9 100644 +--- a/ext/tests/multiple_hooks_modify_params.phpt ++++ b/ext/tests/multiple_hooks_modify_params.phpt +@@ -11,7 +11,7 @@ function helloWorld($a) { + var_dump($a); + } + +-helloWorld('a'); ++helloWorld(1); + ?> + --EXPECT-- +-string(1) "c" ++int(3) +-- +2.51.0 + diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec index 04b0661..55fef09 100644 --- a/php-pecl-opentelemetry.spec +++ b/php-pecl-opentelemetry.spec @@ -25,11 +25,13 @@ Summary: OpenTelemetry auto-instrumentation support extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz +Patch0: 0001-fix-test-for-php-8.5-194.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -69,6 +71,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p2 + : Sanity check, really often broken extver=$(sed -n '/#define PHP_OPENTELEMETRY_VERSION /{s/.* "//;s/".*$//;p}' php_%{pecl_name}.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -183,6 +187,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog +* Thu Sep 4 2025 Remi Collet <remi@remirepo.net> - 1.2.0-2 +- add upstream patch for PHP 8.5.0beta2 + * Wed Jul 9 2025 Remi Collet <remi@remirepo.net> - 1.2.0-1 - update to 1.2.0 - drop support for PHP 8.0 |