diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-sanmai-phpunit-legacy-adapter.spec | 64 |
2 files changed, 46 insertions, 22 deletions
diff --git a/composer.json b/composer.json index 80676db..ae7a5c5 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,10 @@ } ], "require": { - "phpunit/phpunit": "^7 || ^8 || ^9" + "phpunit/phpunit": "^7 || ^8 || ^9 || ^10" }, "require-dev": { - "phpunit/phpunit": "^7.5.20 || ^8.5.9 || ^9.4.3", + "phpunit/phpunit": "^7.5.20 || ^8.5.29 || ^9.5.24 || ^10.1.2", "friendsofphp/php-cs-fixer": "^2.16" }, "config": { diff --git a/php-sanmai-phpunit-legacy-adapter.spec b/php-sanmai-phpunit-legacy-adapter.spec index 385cbe0..1acd930 100644 --- a/php-sanmai-phpunit-legacy-adapter.spec +++ b/php-sanmai-phpunit-legacy-adapter.spec @@ -1,15 +1,15 @@ # remirepo/fedora spec file for php-sanmai-phpunit-legacy-adapter # -# Copyright (c) 2020 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2020-2025 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 -%global gh_commit 3db58a31847d803f76cab3da14e334a2d090c067 +%global gh_commit aa08b49eac291a49f50e9a094f23b267cc5a9bec %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_date 20150618 %global gh_owner sanmai @@ -17,21 +17,24 @@ %global ns_project LegacyPHPUnit Name: php-%{gh_owner}-%{gh_project} -Version: 8.2.1 -Release: 1%{?dist} +Version: 8.2.2 +Release: 7%{?dist} Summary: PHPUnit Legacy Versions Adapter -Group: Development/Libraries -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz BuildArch: noarch %if %{with tests} -BuildRequires: phpunit7 BuildRequires: phpunit8 -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 BuildRequires: phpunit9 +BuildRequires: phpunit10 +# remirepo:1 +%if 0%{?fedora} || 0%{?rhel} >= 10 +BuildRequires: phpunit11 +BuildRequires: phpunit12 +# remirepo:1 %endif %endif BuildRequires: php-fedora-autoloader-devel @@ -50,7 +53,7 @@ Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} %description PHPUnit Legacy Versions Adapter. -This version is compatible with phpunit version 7, 8 and 9. +This version is compatible with phpunit version 7, 8, 9 and 10. Autoloader: %{_datadir}/php/%{ns_project}/autoload.php @@ -84,23 +87,39 @@ EOF : run upstream test suite with all php and phpunit versions ret=0 -for cmd in php php71 php72 php73 php74 php80 +for cmd in php80 php81 php82 php83 php84 do if which $cmd; then - $cmd %{_bindir}/phpunit7 --verbose || ret=1 + $cmd %{_bindir}/phpunit8 --verbose || ret=1 fi done -for cmd in php php72 php73 php74 php80 +for cmd in php80 php81 php82 php83 php84 do if which $cmd; then - $cmd %{_bindir}/phpunit8 --verbose || ret=1 + $cmd %{_bindir}/phpunit9 --verbose || ret=1 fi done -if [ -x %{_bindir}/phpunit9 ]; then - for cmd in php php73 php74 php80 +if [ -x %{_bindir}/phpunit10 ]; then + for cmd in php81 php82 php83 php84 + do + if which $cmd; then + $cmd %{_bindir}/phpunit10 || ret=1 + fi + done +fi +if [ -x %{_bindir}/phpunit11 ]; then + for cmd in php82 php83 php84 do if which $cmd; then - $cmd %{_bindir}/phpunit9 --verbose || ret=1 + $cmd %{_bindir}/phpunit11 || ret=1 + fi + done +fi +if [ -x %{_bindir}/phpunit12 ]; then + for cmd in php83 php84 + do + if which $cmd; then + $cmd %{_bindir}/phpunit12 || ret=1 fi done fi @@ -111,8 +130,6 @@ exit $ret %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -120,5 +137,12 @@ exit $ret %changelog +* Thu Jun 26 2025 Remi Collet <remi@remirepo.net> - 8.2.2-7 +- tests: remove phpunit7, add phpunit11 and phpunit12 +- re-license spec file to CECILL-2.1 + +* Tue May 30 2023 Remi Collet <remi@remirepo.net> - 8.2.2-1 +- update to 8.2.2 (no change) + * Tue Dec 22 2020 Remi Collet <remi@fedoraproject.org> - 8.2.1-1 - initial package |