From 4fb92779908103f110b48ced22660447cefd17b1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 May 2025 08:25:46 +0200 Subject: [PATCH] update to 2.4.0 (no change) allow phpunit12 re-license spec file to CECILL-2.1 (cherry picked from commit 14f003e35d809a676ab868cf96fb5a814e00abdd) --- .gitignore | 1 + php-phpspec-prophecy-phpunit.spec | 28 +++++++++++++++++++++------- sources | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9f247db..1bf71ba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-phpspec-prophecy-phpunit-2.1.0-29f8114.tgz /php-phpspec-prophecy-phpunit-2.2.0-16e1247.tgz /php-phpspec-prophecy-phpunit-2.3.0-8819516.tgz +/php-phpspec-prophecy-phpunit-2.4.0-d3c2804.tgz diff --git a/php-phpspec-prophecy-phpunit.spec b/php-phpspec-prophecy-phpunit.spec index 40cb6d0..0a4c836 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,6 +28,8 @@ BuildArch: noarch BuildRequires: php(language) >= 7.3 %if %{with tests} BuildRequires: (php-composer(phpspec/prophecy) >= 1.18 with php-composer(phpspec/prophecy) < 2) +BuildRequires: phpunit12 >= 12.0 +BuildRequires: phpunit11 >= 11.0 BuildRequires: phpunit10 >= 10.1 BuildRequires: phpunit9 >= 9.1 %endif @@ -37,10 +39,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 @@ -112,6 +114,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 @@ -126,6 +135,11 @@ exit $ret %changelog +* Mon May 26 2025 Remi Collet - 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 - 2.3.0-1 - update to 2.3.0 diff --git a/sources b/sources index 8dc09b9..e8e393d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-phpunit-2.3.0-8819516.tgz) = 507435b361f9b3b4398ca994f7098a076755887fae6e50a099fd6bc07f94473e619cf2171e314c899b35cad0171a0cdc3e9b8d2ef1b6b6aad8e1ee2d285fba40 +SHA512 (php-phpspec-prophecy-phpunit-2.4.0-d3c2804.tgz) = 5075b397ef393ef4da8246eeb7087c6b6f3c4c654ff27e11396f58f8e75b1ec4562f114c07aaaa9b4dcf5718b4b337235bcf864236f9fb734dd7bf605b1f3069