diff options
| author | Remi Collet <remi@remirepo.net> | 2025-05-26 08:23:56 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-05-26 08:23:56 +0200 |
| commit | 3b953c35a71a8b3fdfe61cf256af6a9194e0002a (patch) | |
| tree | c63b8addc76348aa762c69ad44a6ee73e5895c27 | |
| parent | aa2cc7d343fd7362e38927f2f55f34c792b0818d (diff) | |
allow phpunit12
re-license spec file to CECILL-2.1
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpspec-prophecy-phpunit.spec | 29 |
2 files changed, 22 insertions, 9 deletions
diff --git a/composer.json b/composer.json index a8e0cbd..d57b8c1 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require": { "php": "^7.3 || ^8", "phpspec/prophecy": "^1.18", - "phpunit/phpunit":"^9.1 || ^10.1 || ^11.0" + "phpunit/phpunit":"^9.1 || ^10.1 || ^11.0 || ^12.0" }, "autoload": { "psr-4": { diff --git a/php-phpspec-prophecy-phpunit.spec b/php-phpspec-prophecy-phpunit.spec index f0c5f72..0fa4f45 100644 --- a/php-phpspec-prophecy-phpunit.spec +++ b/php-phpspec-prophecy-phpunit.spec @@ -1,21 +1,21 @@ # remirepo/fedora spec file for php-phpspec-prophecy-phpunit # -# Copyright (c) 2020-2024 Remi Collet -# License: CC-BY-SA-4.0 -# 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 8819516c1b489ecee4c60db5f5432fac1ea8ac6f +%global gh_commit d3c28041d9390c9bca325a08c5b2993ac855bded %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy-phpunit Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.0 +Version: 2.4.0 Release: 1%{?dist} Summary: Integrating the Prophecy mocking library in PHPUnit test cases @@ -28,8 +28,9 @@ BuildArch: noarch BuildRequires: php(language) >= 7.3 %if %{with tests} BuildRequires: (php-composer(phpspec/prophecy) >= 1.18 with php-composer(phpspec/prophecy) < 2) -# remirepo:3 +# remirepo:4 %if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 +BuildRequires: phpunit12 >= 12.0 BuildRequires: phpunit11 >= 11.0 %endif BuildRequires: phpunit10 >= 10.1 @@ -41,10 +42,10 @@ BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { # "php": "^7.3 || ^8", # "phpspec/prophecy": "^1.18", -# "phpunit/phpunit":"^9.1 || ^10.1 || ^11.0" +# "phpunit/phpunit":"^9.1 || ^10.1 || ^11.0 || ^12.0" Requires: php(language) >= 7.3 Requires: (php-composer(phpspec/prophecy) >= 1.18 with php-composer(phpspec/prophecy) < 2) -Requires: (phpunit9 >= 9.1 or phpunit10 >= 10.1 or phpunit11 >= 11.0) +Requires: (phpunit9 >= 9.1 or phpunit10 >= 10.1 or phpunit11 >= 11.0 or phpunit12 >= 12.0) # From phpcompatinfo report for version 2.0.1 #none # Autoloader @@ -116,6 +117,13 @@ for cmd in php php82 php83 php84; do %{_bindir}/phpunit11 --no-coverage|| ret=1 fi done +for cmd in php php83 php84; do + if which %{_bindir}/phpunit12 && which $cmd; then + sed -e 's/@PHPUNIT@/PHPUnit12/' vendor/autoload.php.in > vendor/autoload.php + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit11 --no-coverage|| ret=1 + fi +done exit $ret %else : Test suite disabled @@ -130,6 +138,11 @@ exit $ret %changelog +* Mon May 26 2025 Remi Collet <remi@remirepo.net> - 2.4.0-1 +- update to 2.4.0 (no change) +- allow phpunit12 +- re-license spec file to CECILL-2.1 + * Thu Nov 21 2024 Remi Collet <remi@remirepo.net> - 2.3.0-1 - update to 2.3.0 |