From 6cd9fe675abf5dea39361048fd8b38b930d438fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Feb 2021 14:27:30 +0100 Subject: update to 1.2.0 open https://github.com/scoutapp/scout-apm-php-ext/issues/67 test failure with PHP 8.0 and TS build --- .gitignore | 2 ++ PHPINFO | 2 +- REFLECTION | 8 +++++++- php-pecl-scoutapm.spec | 29 +++++++++++++---------------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 1ab5c4f..01f0400 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/PHPINFO b/PHPINFO index a47b1b8..fda2ab6 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ scoutapm scoutapm support => enabled -Version => 1.1.1 +Version => 1.2.0 curl functions => Yes file functions => Yes pdo functions => Yes diff --git a/REFLECTION b/REFLECTION index 5ec359e..9a2028b 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,9 +1,15 @@ -Extension [ extension #112 scoutapm version 1.1.1 ] { +Extension [ extension #119 scoutapm version 1.2.0 ] { - Functions { Function [ function scoutapm_get_calls ] { + + - Parameters [0] { + } } Function [ function scoutapm_list_instrumented_functions ] { + + - Parameters [0] { + } } } } diff --git a/php-pecl-scoutapm.spec b/php-pecl-scoutapm.spec index f48c8e6..5b44f72 100644 --- a/php-pecl-scoutapm.spec +++ b/php-pecl-scoutapm.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-scoutapm # -# Copyright (c) 2019-2020 Remi Collet +# Copyright (c) 2019-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -17,14 +17,15 @@ Summary: Native Extension Component for ScoutAPM's PHP Agent Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.1.1 +Version: 1.2.0 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} +BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel > 7.1 +BuildRequires: %{?scl_prefix}php-devel >= 7.1 BuildRequires: %{?scl_prefix}php-pear # Only for tests BuildRequires: %{?scl_prefix}php-curl @@ -45,26 +46,17 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{rele Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} %endif @@ -195,7 +187,7 @@ TEST_PHP_EXECUTABLE=%{__php} \ : Upstream test suite for ZTS extension cd ../ZTS TEST_PHP_ARGS="-n -d extension=curl.so -d extension=pdo.so -d extension=pdo_sqlite.so -d zend_extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ +REPORT_EXIT_STATUS=0 \ NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %{__ztsphp} -n run-tests.php --show-diff @@ -217,6 +209,11 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Thu Feb 4 2021 Remi Collet - 1.2.0-1 +- update to 1.2.0 +- open https://github.com/scoutapp/scout-apm-php-ext/issues/67 + test failure with PHP 8.0 and TS build + * Wed Feb 19 2020 Remi Collet - 1.1.1-1 - update to 1.1.1 (no change) - drop patch merged upstream -- cgit