summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION16
-rw-r--r--php-pecl-pcov.spec141
3 files changed, 78 insertions, 81 deletions
diff --git a/PHPINFO b/PHPINFO
index aaa1d40..2980007 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
pcov
PCOV support => Disabled
-PCOV version => 1.0.6
+PCOV version => 1.0.11
pcov.directory => auto
pcov.exclude => none
pcov.initial.memory => 65336 bytes
diff --git a/REFLECTION b/REFLECTION
index 52080ba..11e0352 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #129 pcov version 1.0.6 ] {
+Extension [ <persistent> extension #89 pcov version 1.0.11 ] {
- Dependencies {
Dependency [ pcre (Required) ]
@@ -23,10 +23,10 @@ Extension [ <persistent> extension #129 pcov version 1.0.6 ] {
}
- Constants [4] {
- Constant [ integer pcov\all ] { 0 }
- Constant [ integer pcov\inclusive ] { 1 }
- Constant [ integer pcov\exclusive ] { 2 }
- Constant [ string pcov\version ] { 1.0.6 }
+ Constant [ int pcov\all ] { 0 }
+ Constant [ int pcov\inclusive ] { 1 }
+ Constant [ int pcov\exclusive ] { 2 }
+ Constant [ string pcov\version ] { 1.0.11 }
}
- Functions {
@@ -43,14 +43,14 @@ Extension [ <persistent> extension #129 pcov version 1.0.6 ] {
Function [ <internal:pcov> function pcov\collect ] {
- Parameters [2] {
- Parameter #0 [ <optional> integer $type ]
- Parameter #1 [ <optional> array $filter ]
+ Parameter #0 [ <optional> int $type = <default> ]
+ Parameter #1 [ <optional> array $filter = <default> ]
}
}
Function [ <internal:pcov> function pcov\clear ] {
- Parameters [1] {
- Parameter #0 [ <optional> boolean $files ]
+ Parameter #0 [ <optional> bool $files = <default> ]
}
}
Function [ <internal:pcov> function pcov\waiting ] {
diff --git a/php-pecl-pcov.spec b/php-pecl-pcov.spec
index 39e5657..3e6d84e 100644
--- a/php-pecl-pcov.spec
+++ b/php-pecl-pcov.spec
@@ -1,86 +1,56 @@
# remirepo spec file for php-pecl-pcov
#
-# Copyright (c) 2019 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2019-2023 Remi Collet
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%{?scl: %scl_package php-pecl-pcov}
+%{?scl:%scl_package php-pecl-pcov}
-%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name pcov
-%global ini_name 40-%{pecl_name}.ini
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
+%global pecl_name pcov
+%global ini_name 40-%{pecl_name}.ini
+%global sources %{pecl_name}-%{version}
+%global _configure ../%{sources}/configure
Summary: Code coverage driver
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 1.0.6
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License: PHP
-URL: http://pecl.php.net/package/%{pecl_name}
-Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-
-BuildRequires: gcc
-BuildRequires: %{?scl_prefix}php-devel > 7.1
+Version: 1.0.11
+Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+License: PHP-3.01
+URL: https://pecl.php.net/package/%{pecl_name}
+Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+
+BuildRequires: make
+BuildRequires: %{?dtsprefix}gcc
+BuildRequires: %{?scl_prefix}php-devel >= 7.1
BuildRequires: %{?scl_prefix}php-pear
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-%endif
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
-%endif
-%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
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter private shared object
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
%description
-A self contained php-code-coverage compatible driver for PHP7.
+A self contained php-code-coverage compatible driver for PHP.
Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
%prep
%setup -q -c
-mv %{pecl_name}-%{version} NTS
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
%{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
-i package.xml
-cd NTS
-
+cd %{sources}
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_PCOV_VERSION/{s/.* "//;s/".*$//;p}' php_pcov.h)
if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -89,9 +59,9 @@ if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
fi
cd ..
+mkdir NTS
%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
+mkdir ZTS
%endif
# Create configuration file
@@ -116,22 +86,23 @@ EOF
%build
%{?dtsenable}
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+
+cd ../NTS
%configure \
--enable-pcov \
--with-libdir=%{_lib} \
- --with-php-config=%{_bindir}/php-config
+ --with-php-config=%{__phpconfig}
make %{?_smp_mflags}
%if %{with_zts}
cd ../ZTS
-%{_bindir}/zts-phpize
%configure \
--enable-pcov \
--with-libdir=%{_lib} \
- --with-php-config=%{_bindir}/zts-php-config
+ --with-php-config=%{__ztsphpconfig}
make %{?_smp_mflags}
%endif
@@ -155,7 +126,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
# Documentation
-cd NTS
+cd %{sources}
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
@@ -182,38 +153,34 @@ fi
%check
+cd %{sources}
+
: Minimal load test for NTS extension
-cd NTS
%{_bindir}/php --no-php-ini \
- --define extension=modules/%{pecl_name}.so \
- --modules | grep %{pecl_name}
+ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
+ --modules | grep '^%{pecl_name}$'
: Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
+TEST_PHP_ARGS="-n -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \
REPORT_EXIT_STATUS=1 \
-%{_bindir}/php -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q -P --show-diff
%if %{with_zts}
: Minimal load test for ZTS extension
-cd ../ZTS
%{__ztsphp} --no-php-ini \
- --define extension=modules/%{pecl_name}.so \
- --modules | grep %{pecl_name}
+ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
+ --modules | grep '^%{pecl_name}$'
: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
+TEST_PHP_ARGS="-n -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \
REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php --show-diff
+%{__ztsphp} -n run-tests.php -q -P --show-diff
%endif
%files
-%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license %{sources}/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -227,6 +194,36 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 1.0.11-3
+- rebuild for PHP 8.3.0RC1
+
+* Tue Jul 18 2023 Remi Collet <remi@remirepo.net> - 1.0.11-2
+- build out of sources tree
+
+* Mon Dec 20 2021 Remi Collet <remi@remirepo.net> - 1.0.11-1
+- update to 1.0.11
+
+* Wed Nov 24 2021 Remi Collet <remi@remirepo.net> - 1.0.10-1
+- update to 1.0.10
+
+* Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 1.0.9-2
+- rebuild for 8.1.0RC1
+
+* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 1.0.9-1
+- update to 1.0.9
+
+* Mon Mar 22 2021 Remi Collet <remi@remirepo.net> - 1.0.8-1
+- update to 1.0.8 (no change)
+
+* Fri Mar 19 2021 Remi Collet <remi@remirepo.net> - 1.0.7-1
+- update to 1.0.7
+
+* Thu Nov 26 2020 Remi Collet <remi@remirepo.net> - 1.0.6-4
+- add upstream patch for test suite with PHP 8
+
+* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.0.6-2
+- rebuild for 7.4.0RC1
+
* Thu Jun 13 2019 Remi Collet <remi@remirepo.net> - 1.0.6-1
- update to 1.0.6