diff options
| -rw-r--r-- | composer.json | 21 | ||||
| -rwxr-xr-x | makesrc.sh | 33 | ||||
| -rw-r--r-- | phpcov.spec | 219 |
3 files changed, 174 insertions, 99 deletions
diff --git a/composer.json b/composer.json index 63bd210..69e9a25 100644 --- a/composer.json +++ b/composer.json @@ -15,20 +15,22 @@ }, "config": { "platform": { - "php": "7.3.0" + "php": "8.4.1" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": "^7.3", - "phpunit/phpunit": "^9.3", - "phpunit/php-code-coverage": "^9.1.11", - "phpunit/php-file-iterator": "^3.0", - "sebastian/cli-parser": "^1.0", - "sebastian/diff": "^4.0", - "sebastian/version": "^3.0" + "php": ">=8.4", + "phpunit/php-code-coverage": "^14.1.3", + "phpunit/php-file-iterator": "^7.0.0", + "sebastian/cli-parser": "^5.0.0", + "sebastian/diff": "^8.1.0", + "sebastian/version": "^7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^13.1.6" }, "autoload": { "classmap": [ @@ -40,8 +42,7 @@ ], "extra": { "branch-alias": { - "dev-master": "8.1-dev" + "dev-main": "13.0-dev" } } } - @@ -1,28 +1,27 @@ #!/bin/bash NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" +if [ -f $NAME-$VERSION.tgz ]; then + echo "$NAME-$VERSION.tgz already there" +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION \n" -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + echo "Cloning..." + rm -rf $PROJECT-$VERSION + git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $VERSION $PROJECT-$VERSION || exit 1 -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Getting composer..." + cp $PROJECT-$VERSION/composer.json composer.json -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION.tgz --exclude-vcs --exclude tools $PROJECT-$VERSION -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Cleaning..." + rm -rf $PROJECT-$VERSION -echo "Done." + echo "Done." +fi diff --git a/phpcov.spec b/phpcov.spec index e48c50f..be1dc55 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -1,19 +1,18 @@ # fedora/remirepo spec file for phpcov # -# Copyright (c) 2013-2020 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests +# remirepo:2 # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 6983b308deef400c747d8d04b055a7a9caff1c6c -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcov %global php_home %{_datadir}/php @@ -26,77 +25,50 @@ Name: %{pk_project} -Version: 8.1.2 +Version: 13.0.1 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{version}.tgz Source1: makesrc.sh # Fix autoload for RPM Patch0: %{gh_project}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.4.1 BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: phpunit9 >= 9.3 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.1.11 with php-composer(phpunit/php-code-coverage) < 10) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) -BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) -BuildRequires: (php-composer(sebastian/diff) >= 4 with php-composer(sebastian/diff) < 5) -BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -# remirepo:7 -%else -BuildRequires: php-phpunit-php-code-coverage9 >= 9.1.11 -BuildRequires: php-phpunit-php-file-iterator3 -BuildRequires: php-sebastian-cli-parser -BuildRequires: php-sebastian-diff4 -BuildRequires: php-sebastian-version3 -%endif -BuildRequires: php-pecl(Xdebug) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 14.1.3 with php-composer(phpunit/php-code-coverage) < 15) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 7.0.0 with php-composer(phpunit/php-file-iterator) < 8) +BuildRequires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6) +BuildRequires: (php-composer(sebastian/diff) >= 8.1.0 with php-composer(sebastian/diff) < 9) +BuildRequires: (php-composer(sebastian/version) >= 7.0.0 with php-composer(sebastian/version) < 8) +BuildRequires: php-pecl(Xdebug) >= 3 +# from composer.json, require-dev +BuildRequires: phpunit13 >= 13.1.6 %endif # from composer.json -# "php": "^7.3", -# "phpunit/phpunit": "^9.0", -# "phpunit/php-code-coverage": "^8.0", -# "phpunit/php-file-iterator": "^3.0", -# "sebastian/cli-parser": "^1.0", -# "sebastian/diff": "^4.0", -# "sebastian/version": "^3.0" -Requires: php(language) >= 7.3 -Requires: phpunit9 >= 9.3 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpunit/php-code-coverage) >= 9.1.11 with php-composer(phpunit/php-code-coverage) < 10) -Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) -Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) -Requires: (php-composer(sebastian/diff) >= 4 with php-composer(sebastian/diff) < 5) -Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -# remirepo:7 -%else -Requires: php-phpunit-php-code-coverage9 >= 9.1.11 -Requires: php-phpunit-php-file-iterator3 -Requires: php-sebastian-cli-parser -Requires: php-sebastian-diff4 -Requires: php-sebastian-version3 -%endif +# "php": ">=8.4", +# "phpunit/php-code-coverage": "^14.1.3", +# "phpunit/php-file-iterator": "^7.0.0", +# "sebastian/cli-parser": "^5.0.0", +# "sebastian/diff": "^8.1.0", +# "sebastian/version": "^7.0.0" +Requires: php(language) >= 8.4 +Requires: (php-composer(phpunit/php-code-coverage) >= 14.1.3 with php-composer(phpunit/php-code-coverage) < 15) +Requires: (php-composer(phpunit/php-file-iterator) >= 7.0.0 with php-composer(phpunit/php-file-iterator) < 8) +Requires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6) +Requires: (php-composer(sebastian/diff) >= 8.1.0 with php-composer(sebastian/diff) < 9) +Requires: (php-composer(sebastian/version) >= 7.0.0 with php-composer(sebastian/version) < 8) # 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} @@ -105,9 +77,9 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{version} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm %build @@ -119,12 +91,12 @@ phpab \ cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/PHPUnit9/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage9/autoload.php', - '%{php_home}/%{ns_vendor}/FileIterator3/autoload.php', - '%{php_home}/%{ns_vendor}/CliParser/autoload.php', - '%{php_home}/%{ns_vendor}/Diff4/autoload.php', - '%{php_home}/%{ns_vendor}/Version3/autoload.php', + '%{php_home}/PHPUnit13/autoload.php', + '%{php_home}/%{ns_vendor}/CodeCoverage14/autoload.php', + '%{php_home}/%{ns_vendor}/FileIterator7/autoload.php', + '%{php_home}/%{ns_vendor}/CliParser5/autoload.php', + '%{php_home}/%{ns_vendor}/Diff8/autoload.php', + '%{php_home}/%{ns_vendor}/Version7/autoload.php', ]); EOF @@ -146,15 +118,19 @@ then EXT="-d zend_extension=xdebug.so" fi # test with hardcoded path in data -rm tests/end-to-end/execute/valid-script-argument-with-cli-include-with-text-report.phpt -rm tests/end-to-end/merge/valid-directory-with-text-report.phpt -rm tests/end-to-end/merge/valid-directory-with-text-report-stdout.phpt +rm tests/end-to-end/composer/merge/mismatching-code-coverage-driver-do-not-require.phpt +rm tests/end-to-end/composer/merge/mismatching-git-information-do-not-require.phpt +rm tests/end-to-end/composer/merge/valid-directory-with-text-report.phpt +rm tests/end-to-end/composer/patch-coverage/no-errors-with-only-not-covered-changed-lines.phpt +rm tests/end-to-end/composer/merge/mismatching-php-version-do-not-require.phpt +rm tests/end-to-end/composer/merge/valid-directory-with-text-report-stdout.phpt +rm tests/end-to-end/composer/patch-coverage/valid-arguments-with-valid-path-prefix.phpt +rm tests/end-to-end/composer/patch-coverage/valid-arguments-all-covered.phpt -# TODO php80 when xdebug will be available ret=0 -for cmd in php php73 php74; do +for cmd in php php84 php85; do if which $cmd; then - $cmd $EXT %{_bindir}/phpunit9 --verbose || ret=1 + $cmd $EXT -d xdebug.mode=coverage %{_bindir}/phpunit13 --testsuite end-to-end || ret=1 fi done exit $ret; @@ -164,8 +140,6 @@ exit $ret; %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md %doc composer.json @@ -174,6 +148,107 @@ exit $ret; %changelog +* Sun Apr 19 2026 Remi Collet <remi@remirepo.net> - 13.0.1-1 +- update to 13.0.1 +- raise dependency on phpunit/php-code-coverage 14.1.3 +- raise dependency on sebastian/diff 8.1.0 + +* Fri Apr 3 2026 Remi Collet <remi@remirepo.net> - 13.0.0-1 +- update to 13.0.0 +- raise dependency on phpunit/php-code-coverage 14 +- drop runtime dependency on phpunit13 + +* Fri Feb 6 2026 Remi Collet <remi@remirepo.net> - 12.0.0-1 +- update to 12.0.0 +- raise dependency on PHP 8.4 +- raise dependency on phpunit/phpunit 13 +- raise dependency on phpunit/php-code-coverage 13 +- raise dependency on phpunit/php-file-iterator 7 +- raise dependency on sebastian/cli-parser 5 +- raise dependency on sebastian/diff 8 +- raise dependency on sebastian/version 7 + +* Fri Feb 6 2026 Remi Collet <remi@remirepo.net> - 11.0.4-1 +- update to 11.0.4 +- raise dependency on phpunit/phpunit 12.5.9 +- raise dependency on phpunit/php-code-coverage 12.5.3 +- raise dependency on phpunit/php-file-iterator 6.0.1 + +* Tue Dec 2 2025 Remi Collet <remi@remirepo.net> - 11.0.3-1 +- update to 11.0.3 (no change) +- raise dependency on phpunit/phpunit 12.4.4 +- raise dependency on phpunit/php-code-coverage 12.5.0 +- raise dependency on sebastian/cli-parser 4.2 + +* Tue Sep 2 2025 Remi Collet <remi@remirepo.net> - 11.0.2-1 +- update to 11.0.2 (no change) +- raise dependency on phpunit/phpunit 12.3.7 +- raise dependency on phpunit/php-code-coverage 12.3.6 + +* Wed Jun 18 2025 Remi Collet <remi@remirepo.net> - 11.0.1-1 +- update to 11.0.1 (no change) +- raise dependency on phpunit/phpunit 12.1.6 +- raise dependency on phpunit/php-code-coverage 12.3 + +* Fri Feb 7 2025 Remi Collet <remi@remirepo.net> - 11.0.0-1 +- update to 11.0.0 +- raise dependency on phpunit/phpunit 12.0 +- raise dependency on phpunit/php-code-coverage 12 +- raise dependency on phpunit/php-file-iterator 6 +- raise dependency on sebastian/cli-parser 4 +- raise dependency on sebastian/diff 7 +- raise dependency on sebastian/version 6 + +* 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 +- raise dependency on phpunit/phpunit 11 +- raise dependency on phpunit/php-code-coverage 11 +- raise dependency on phpunit/php-file-iterator 5 +- raise dependency on sebastian/cli-parser 3 +- raise dependency on sebastian/diff 6 +- raise dependency on sebastian/version 5 + +* Wed Sep 13 2023 Remi Collet <remi@remirepo.net> - 9.0.2-1 +- update to 9.0.2 +- raise dependency on phpunit/php-code-coverage 10.1.5 + +* Mon Sep 11 2023 Remi Collet <remi@remirepo.net> - 9.0.1-1 +- update to 9.0.1 + +* Mon Feb 13 2023 Remi Collet <remi@remirepo.net> - 9.0.0-1 +- update to 9.0.0 +- raise dependency on PHP 8.1 +- raise dependency on phpunit/phpunit 10 +- raise dependency on phpunit/php-code-coverage 10 +- raise dependency on phpunit/php-file-iterator 4 +- raise dependency on sebastian/cli-parser 2 +- raise dependency on sebastian/diff 5 +- raise dependency on sebastian/version 4 + +* Thu Mar 24 2022 Remi Collet <remi@remirepo.net> - 8.2.1-1 +- update to 8.2.1 + +* 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 + +* Fri Oct 2 2020 Remi Collet <remi@remirepo.net> - 8.2.0-1 +- update to 8.2.0 +- raise dependency on phpunit/php-code-coverage 9.2 + * Wed Sep 23 2020 Remi Collet <remi@remirepo.net> - 8.1.2-1 - update to 8.1.2 (no change) - raise dependency on phpunit/php-code-coverage 9.1.11 |