summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-12-20 11:35:52 +0100
committerRemi Collet <remi@php.net>2024-12-20 11:35:52 +0100
commit09e1b3ee11960104a9639705d19b7dcae78079f2 (patch)
tree0517dea3d4ae86f9e5d506abe9d4eabac8493e1a
parentb59bb0a78fc6189257cb4accde98c534caa7692a (diff)
update to 10.0.1HEADmaster
raise dependency on phpunit/phpunit 11.5.1 raise dependency on phpunit/php-code-coverage 11.0.8 raise dependency on phpunit/php-file-iterator 5.1 raise dependency on sebastian/cli-parser 3.0.2 raise dependency on sebastian/diff 6.0.2 raise dependency on sebastian/version 5.0.2
-rw-r--r--composer.json13
-rw-r--r--phpcov.spec85
2 files changed, 39 insertions, 59 deletions
diff --git a/composer.json b/composer.json
index 7c66663..e9d91d6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,12 +23,12 @@
"prefer-stable": true,
"require": {
"php": ">=8.2",
- "phpunit/phpunit": "^11.0",
- "phpunit/php-code-coverage": "^11.0",
- "phpunit/php-file-iterator": "^5.0",
- "sebastian/cli-parser": "^3.0",
- "sebastian/diff": "^6.0",
- "sebastian/version": "^5.0"
+ "phpunit/phpunit": "^11.5.1",
+ "phpunit/php-code-coverage": "^11.0.8",
+ "phpunit/php-file-iterator": "^5.1",
+ "sebastian/cli-parser": "^3.0.2",
+ "sebastian/diff": "^6.0.2",
+ "sebastian/version": "^5.0.2"
},
"autoload": {
"classmap": [
@@ -44,4 +44,3 @@
}
}
}
-
diff --git a/phpcov.spec b/phpcov.spec
index 6ceb08a..981a130 100644
--- a/phpcov.spec
+++ b/phpcov.spec
@@ -1,8 +1,8 @@
# fedora/remirepo spec file for phpcov
#
-# Copyright (c) 2013-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2013-2024 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -13,7 +13,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 31489ab0ca527e873806a095891e848a27ce98d2
+%global gh_commit a6029f35b6aa4934f3acfe520e60aa7a0285e845
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcov
@@ -27,7 +27,7 @@
Name: %{pk_project}
-Version: 10.0.0
+Version: 10.0.1
Release: 1%{?dist}
Summary: CLI frontend for PHP_CodeCoverage
@@ -43,61 +43,35 @@ BuildArch: noarch
BuildRequires: php(language) >= 8.2
BuildRequires: php-fedora-autoloader-devel
%if %{with tests}
-BuildRequires: phpunit11
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(phpunit/php-code-coverage) >= 11.0 with php-composer(phpunit/php-code-coverage) < 12)
-BuildRequires: (php-composer(phpunit/php-file-iterator) >= 5.0 with php-composer(phpunit/php-file-iterator) < 6)
-BuildRequires: (php-composer(sebastian/cli-parser) >= 3.0 with php-composer(sebastian/cli-parser) < 4)
-BuildRequires: (php-composer(sebastian/diff) >= 6.0 with php-composer(sebastian/diff) < 7)
-BuildRequires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6)
-# remirepo:7
-%else
-BuildRequires: php-phpunit-php-code-coverage11
-BuildRequires: php-phpunit-php-file-iterator5
-BuildRequires: php-sebastian-cli-parser3
-BuildRequires: php-sebastian-diff6
-BuildRequires: php-sebastian-version5
-%endif
+BuildRequires: phpunit11 >= 11.5.1
+BuildRequires: (php-composer(phpunit/php-code-coverage) >= 11.0.8 with php-composer(phpunit/php-code-coverage) < 12)
+BuildRequires: (php-composer(phpunit/php-file-iterator) >= 5.1 with php-composer(phpunit/php-file-iterator) < 6)
+BuildRequires: (php-composer(sebastian/cli-parser) >= 3.0.2 with php-composer(sebastian/cli-parser) < 4)
+BuildRequires: (php-composer(sebastian/diff) >= 6.0.2 with php-composer(sebastian/diff) < 7)
+BuildRequires: (php-composer(sebastian/version) >= 5.0.2 with php-composer(sebastian/version) < 6)
BuildRequires: php-pecl(Xdebug) >= 3
%endif
# from composer.json
# "php": ">=8.2",
-# "phpunit/phpunit": "^11.0",
-# "phpunit/php-code-coverage": "^11.0",
-# "phpunit/php-file-iterator": "^5.0",
-# "sebastian/cli-parser": "^3.0",
-# "sebastian/diff": "^6.0",
-# "sebastian/version": "^5.0"
+# "phpunit/phpunit": "^11.5.1",
+# "phpunit/php-code-coverage": "^11.0.8",
+# "phpunit/php-file-iterator": "^5.1",
+# "sebastian/cli-parser": "^3.0.2",
+# "sebastian/diff": "^6.0.2",
+# "sebastian/version": "^5.0.2"
Requires: php(language) >= 8.2
-Requires: phpunit11
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(phpunit/php-code-coverage) >= 11.0 with php-composer(phpunit/php-code-coverage) < 12)
-Requires: (php-composer(phpunit/php-file-iterator) >= 5.0 with php-composer(phpunit/php-file-iterator) < 6)
-Requires: (php-composer(sebastian/cli-parser) >= 3.0 with php-composer(sebastian/cli-parser) < 4)
-Requires: (php-composer(sebastian/diff) >= 6.0 with php-composer(sebastian/diff) < 7)
-Requires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6)
-# remirepo:7
-%else
-Requires: php-phpunit-php-code-coverage11
-Requires: php-phpunit-php-file-iterator5
-Requires: php-sebastian-cli-parser3
-Requires: php-sebastian-diff6
-Requires: php-sebastian-version5
-%endif
+Requires: phpunit11 >= 11.5.1
+Requires: (php-composer(phpunit/php-code-coverage) >= 11.0.8 with php-composer(phpunit/php-code-coverage) < 12)
+Requires: (php-composer(phpunit/php-file-iterator) >= 5.1 with php-composer(phpunit/php-file-iterator) < 6)
+Requires: (php-composer(sebastian/cli-parser) >= 3.0.2 with php-composer(sebastian/cli-parser) < 4)
+Requires: (php-composer(sebastian/diff) >= 6.0.2 with php-composer(sebastian/diff) < 7)
+Requires: (php-composer(sebastian/version) >= 5.0.2 with php-composer(sebastian/version) < 6)
# from phpcompatinfo report for version 4.0.0
# none
-# remirepo:1
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
Obsoletes: php-phpunit-phpcov < 4
Provides: php-phpunit-phpcov = %{version}
-# remirepo:3
-%else
-Conflicts: php-phpunit-phpcov < 4
-%endif
Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version}
@@ -153,7 +127,7 @@ rm tests/end-to-end/merge/valid-directory-with-text-report-stdout.phpt
rm tests/end-to-end/patch-coverage/valid-arguments-with-valid-path-prefix.phpt
ret=0
-for cmd in php php82 php83; do
+for cmd in php php82 php83 php84; do
if which $cmd; then
$cmd $EXT -d xdebug.mode=coverage %{_bindir}/phpunit11 --testsuite end-to-end || ret=1
fi
@@ -165,8 +139,6 @@ exit $ret;
%files
-# remirepo:1
-%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc README.md
%doc composer.json
@@ -175,6 +147,15 @@ exit $ret;
%changelog
+* Fri Dec 20 2024 Remi Collet <remi@remirepo.net> - 10.0.1-1
+- update to 10.0.1
+- raise dependency on phpunit/phpunit 11.5.1
+- raise dependency on phpunit/php-code-coverage 11.0.8
+- raise dependency on phpunit/php-file-iterator 5.1
+- raise dependency on sebastian/cli-parser 3.0.2
+- raise dependency on sebastian/diff 6.0.2
+- raise dependency on sebastian/version 5.0.2
+
* Mon Feb 5 2024 Remi Collet <remi@remirepo.net> - 10.0.0-1
- update to 10.0.0
- raise dependency on PHP 8.2