From e520120d4a9fd7e02be4d60b4e58d57249a7844f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Oct 2020 15:08:29 +0200 Subject: [PATCH] v9.4.2 (cherry picked from commit 0c9acbb9394a07a4c0443337a1e8c475385b7d9c) --- .gitignore | 1 + phpunit9.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0943f5c..8b4a6ed 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /phpunit9-9.3.11-f7316ea.tgz /phpunit9-9.4.0-ef53346.tgz /phpunit9-9.4.1-1f09a12.tgz +/phpunit9-9.4.2-3866b2e.tgz diff --git a/phpunit9.spec b/phpunit9.spec index fb924a7..958ae73 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1f09a12726593737e8a228ebb1c8647305d07c41 +%global gh_commit 3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -27,7 +27,7 @@ %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 9.4.1 +Version: 9.4.2 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} @@ -232,8 +232,6 @@ sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i php ret=0 for cmd in php php73 php74 php80; do if which $cmd; then - VER=$($cmd -r 'echo PHP_VERSION_ID;') - [ $VER -ge 80000 ] && OPT="$OPT --filter '^((?!(testStaticReturnTypeIsDoubledCorrectly|testNullableStaticReturnTypeIsDoubledCorrectly|testUnionReturnTypeWithStaticIsDoubledCorrectly)).)*$'" $cmd ./phpunit $OPT --verbose || ret=1 fi done @@ -249,6 +247,9 @@ exit $ret %changelog +* Mon Oct 19 2020 Remi Collet - 9.4.2-1 +- update to 9.4.2 + * Mon Oct 12 2020 Remi Collet - 9.4.1-1 - update to 9.4.1 diff --git a/sources b/sources index 6ca99d8..67d3865 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.4.1-1f09a12.tgz) = d99da9181b57795123edf494adcfcb8ea6638a13b6f6ec10c12c2c95bd977b8725db942235e61c3f132de5bfe07d6a8cbb77e4eef001bab9aecdcc0810a41d11 +SHA512 (phpunit9-9.4.2-3866b2e.tgz) = 3459c06e2cc193804a47a645704e14964c8b426f85037aab0174a945e3062883a6f6e2fb0a11ad7017fb0824a1ae1e866f6ad0477ef79de12401d4d0220ef2fe