From a25992c4cf636ce321c2fe2126074bfb97d48880 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Mar 2024 10:04:16 +0100 Subject: [PATCH] update to 2.2.0 allow phpunit11 (cherry picked from commit 3199cbe5575edaa3e854713458ebca0a7b827181) --- .gitignore | 1 + php-phpspec-prophecy-phpunit.spec | 21 ++++++++++++++++----- sources | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7884e98..7b89078 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-phpspec-prophecy-phpunit-2.0.1-2d7a9df.tgz /php-phpspec-prophecy-phpunit-2.0.2-9f26c22.tgz /php-phpspec-prophecy-phpunit-2.1.0-29f8114.tgz +/php-phpspec-prophecy-phpunit-2.2.0-16e1247.tgz diff --git a/php-phpspec-prophecy-phpunit.spec b/php-phpspec-prophecy-phpunit.spec index d758d8d..e4c2655 100644 --- a/php-phpspec-prophecy-phpunit.spec +++ b/php-phpspec-prophecy-phpunit.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpspec-prophecy-phpunit # -# Copyright (c) 2020-2023 Remi Collet +# Copyright (c) 2020-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,13 +9,13 @@ %bcond_without tests -%global gh_commit 29f8114c2c319a4308e6b070902211e062efa392 +%global gh_commit 16e1247e139434bce0bac09848bc5c8d882940fc %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.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Integrating the Prophecy mocking library in PHPUnit test cases @@ -37,10 +37,10 @@ BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { # "php": "^7.3 || ^8", # "phpspec/prophecy": "^1.18", -# "phpunit/phpunit":"^9.1" +# "phpunit/phpunit":"^9.1 || ^10.1 || ^11.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) +Requires: (phpunit9 >= 9.1 or phpunit10 >= 10.1 or phpunit11 >= 11.0) # From phpcompatinfo report for version 2.0.1 #none # Autoloader @@ -105,6 +105,13 @@ for cmd in php php81 php82 php83; do %{_bindir}/phpunit10 --no-coverage|| ret=1 fi done +for cmd in php php82 php83; do + if which %{_bindir}/phpunit11 && which $cmd; then + sed -e 's/@PHPUNIT@/PHPUnit11/' 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 @@ -119,6 +126,10 @@ exit $ret %changelog +* Fri Mar 1 2024 Remi Collet - 2.2.0-1 +- update to 2.2.0 +- allow phpunit11 + * Mon Dec 11 2023 Remi Collet - 2.1.0-1 - update to 2.1.0 - raise dependency on phpspec/prophecy 1.18 diff --git a/sources b/sources index 222dc35..77a848b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-phpunit-2.1.0-29f8114.tgz) = 44225dbb00cbc343bb8fe126ab3cc9a3c218d8891c6de9dcab81bb5e68f39d96b51028a989bf143e600a29418bc7dd25fa84af52381c69fb5069fe218e4e85f1 +SHA512 (php-phpspec-prophecy-phpunit-2.2.0-16e1247.tgz) = 4d939319be5199c2b49612f6d4a049cc29da35d59e46a99fa969026a5be5de6c6cbf25a95c07b8bcdc90f26bc42216afaea13c3c04a509effadbfbfe5ce4a688