summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpcov-pr116.patch23
-rw-r--r--phpcov.spec13
2 files changed, 33 insertions, 3 deletions
diff --git a/phpcov-pr116.patch b/phpcov-pr116.patch
new file mode 100644
index 0000000..16afc70
--- /dev/null
+++ b/phpcov-pr116.patch
@@ -0,0 +1,23 @@
+From 80a2778c39ffe8ad251e238ea49e98e827bad3a4 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 22 Mar 2022 15:13:26 +0100
+Subject: [PATCH] Fix namespace
+
+Have been renamed in 9.2.12...
+---
+ src/cli/PatchCoverageCommand.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cli/PatchCoverageCommand.php b/src/cli/PatchCoverageCommand.php
+index 41bdcab..f2a0e71 100644
+--- a/src/cli/PatchCoverageCommand.php
++++ b/src/cli/PatchCoverageCommand.php
+@@ -12,7 +12,7 @@
+ use const PHP_EOL;
+ use function is_file;
+ use function printf;
+-use SebastianBergmann\CodeCoverage\Percentage;
++use SebastianBergmann\CodeCoverage\Util\Percentage;
+
+ final class PatchCoverageCommand extends Command
+ {
diff --git a/phpcov.spec b/phpcov.spec
index b3c3200..6c4080b 100644
--- a/phpcov.spec
+++ b/phpcov.spec
@@ -1,6 +1,6 @@
# fedora/remirepo spec file for phpcov
#
-# Copyright (c) 2013-2021 Remi Collet
+# Copyright (c) 2013-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -27,7 +27,7 @@
Name: %{pk_project}
Version: 8.2.0
-Release: 2%{?dist}
+Release: 5%{?dist}
Summary: CLI frontend for PHP_CodeCoverage
License: BSD
@@ -37,6 +37,8 @@ Source1: makesrc.sh
# Fix autoload for RPM
Patch0: %{gh_project}-rpm.patch
+# https://github.com/sebastianbergmann/phpcov/pull/116
+Patch1: %{gh_project}-pr116.patch
BuildArch: noarch
BuildRequires: php(language) >= 7.3
@@ -108,6 +110,7 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version}
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p0 -b .rpm
+%patch1 -p1
%build
@@ -159,7 +162,7 @@ find tests -name \*.phpt \
-exec sed -e '/xdebug.overload_var_dump/d' -i {} \;
ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php74 php80 php81; do
if which $cmd; then
$cmd $EXT %{_bindir}/phpunit9 --testsuite end-to-end --verbose || ret=1
fi
@@ -181,6 +184,10 @@ exit $ret;
%changelog
+* Tue Mar 22 2022 Remi Collet <remi@remirepo.net> - 8.2.0-5
+- fix for phpunit/php-code-coverage 9.2.13
+ from https://github.com/sebastianbergmann/phpcov/pull/116
+
* Fri Jan 29 2021 Remi Collet <remi@remirepo.net> - 8.2.0-2
- fix test suite and FTBFS