From f22c7ee935014552552b320f99c4346145a5794a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Oct 2023 09:52:28 +0200 Subject: switch to phpunit9 --- php-swaggest-json-diff.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec index 7f1b805..1b5aa80 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-swaggest-json-diff # -# Copyright (c) 2019-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2019-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 3.10.4 -Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Release: 4%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: JSON diff/rearrange/patch/pointer library for PHP License: MIT @@ -37,8 +37,8 @@ BuildArch: noarch BuildRequires: php-json # For tests, from composer.json "require-dev": { # "phpunit/phpunit": "4.8.37" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8.37 -%global phpunit %{_bindir}/phpunit +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 BuildRequires: php-filter BuildRequires: php-pcre # For autoloader @@ -86,12 +86,19 @@ cat << 'EOF' | tee vendor/autoload.php expectException($e); + $this->expectExceptionMessage($m); + } +} EOF ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php80 php81 php82 php83; do if which $cmd; then - $cmd %{phpunit} --no-coverage --verbose || ret=1 + $cmd %{phpunit} --no-coverage || ret=1 fi done exit $ret @@ -112,6 +119,9 @@ exit $ret %changelog +* Fri Oct 6 2023 Remi Collet - 3.10.4-4 +- switch to phpunit9 + * Thu Nov 10 2022 Remi Collet - 3.10.4-1 - update to 3.10.4 -- cgit