From 90763ffd745b29cd76a889a91b6c3db0d52d279a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Jan 2023 14:45:43 +0100 Subject: [PATCH 1/3] v8.5.32 (cherry picked from commit a5c01da422f96d244dd6b46ef17a4438c6890bf7) --- .gitignore | 1 + phpunit8.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2481253..f497c84 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /phpunit8-8.5.29-e8c563c.tgz /phpunit8-8.5.30-4fd448d.tgz /phpunit8-8.5.31-33c126b.tgz +/phpunit8-8.5.32-3756869.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 4c67d73..9ead523 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2022 Remi Collet +# Copyright (c) 2010-2023 Remi Collet # -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 33c126b09a42de5c99e5e8032b54e8221264a74e +%global gh_commit 375686930d05c9fd7d20f6e5fc38121e8d7a9d55 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.31 +%global upstream_version 8.5.32 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -33,7 +33,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh @@ -232,6 +232,9 @@ exit $ret %changelog +* Thu Jan 26 2023 Remi Collet - 8.5.32-1 +- update to 8.5.32 + * Fri Oct 28 2022 Remi Collet - 8.5.31-1 - update to 8.5.31 diff --git a/sources b/sources index e8b14b5..b644426 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.31-33c126b.tgz) = aa283613dd79b2d972f3c75901b22f32d3261623089f94810ab73ecee23d94b8dc2e8307d91ec5f8eb248207cd6bdd6333bb80d16815248b2d6a018808268acb +SHA512 (phpunit8-8.5.32-3756869.tgz) = 06d531224a027d557c8463ad810f7d44e8b8ab4b79173977cfc5f8118a3260d9bebfe07b8d1a2eb201f5f327968ee8de5ae2d06bc2ab85d7d7505d9acdaeadcc From aaa0dd6555e5d29c4947409af1404c6b344cf4e5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Feb 2023 15:12:38 +0100 Subject: [PATCH 2/3] v8.5.33 (cherry picked from commit 1594f12219963008f50b1c17f9dce5abe3c4dce5) --- .gitignore | 1 + phpunit8-rpm.patch | 13 +++++++++---- phpunit8.spec | 10 ++++++++-- sources | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f497c84..a062d6b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /phpunit8-8.5.30-4fd448d.tgz /phpunit8-8.5.31-33c126b.tgz /phpunit8-8.5.32-3756869.tgz +/phpunit8-8.5.33-7d1ff0e.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 2fe8780..25cd8f0 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -33,15 +33,20 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -95,4 +79,8 @@ unset($options); +@@ -95,4 +79,13 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; -PHPUnit\TextUI\Command::main(); -+if (class_exists('PHPUnit_TextUI_Command')) { -+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older ++if (class_exists('PHPUnit\\TextUI\\Application')) { ++ // PHPUnit v10 or newer ++ exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); ++} else if (class_exists('PHPUnit_TextUI_Command')) { ++ // PHPUnit v5 or older ++ PHPUnit_TextUI_Command::main(); +} else { -+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer ++ // PHPUnit v6 to v9 ++ PHPUnit\TextUI\Command::main(); +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php --- ./src/Util/Configuration.php.rpm 2021-12-30 08:58:05.000000000 +0100 diff --git a/phpunit8.spec b/phpunit8.spec index 9ead523..711ef9d 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 375686930d05c9fd7d20f6e5fc38121e8d7a9d55 +%global gh_commit 7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.32 +%global upstream_version 8.5.33 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -129,6 +129,9 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-c Requires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) Suggests: php-soap Suggests: php-xdebug +# recommends latest versions +Recommends: phpunit9 +Recommends: phpunit10 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -232,6 +235,9 @@ exit $ret %changelog +* Tue Feb 28 2023 Remi Collet - 8.5.33-1 +- update to 8.5.33 + * Thu Jan 26 2023 Remi Collet - 8.5.32-1 - update to 8.5.32 diff --git a/sources b/sources index b644426..22322de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.32-3756869.tgz) = 06d531224a027d557c8463ad810f7d44e8b8ab4b79173977cfc5f8118a3260d9bebfe07b8d1a2eb201f5f327968ee8de5ae2d06bc2ab85d7d7505d9acdaeadcc +SHA512 (phpunit8-8.5.33-7d1ff0e.tgz) = 24d801a3846cd4a49b7ad8ed76c832ca4c9c44ba084a643ac0b0a222a4dee10b44aef23aacb989804c7a8d2331fb8d43dfd0d7bdf264717b849e53c275af00c8 From 935d25adc812511a22234a4152896f8ccc198204 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 12:40:57 +0200 Subject: [PATCH 3/3] v8.5.34 (cherry picked from commit ddfe64f3b9c3491db5a9ad748b6d891d6dc4a99b) (cherry picked from commit ab70fe2108fa7a9d37c17ee383764eff16977052) --- .gitignore | 1 + phpunit8.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a062d6b..8e1a866 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /phpunit8-8.5.31-33c126b.tgz /phpunit8-8.5.32-3756869.tgz /phpunit8-8.5.33-7d1ff0e.tgz +/phpunit8-8.5.34-622d018.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 711ef9d..7ce964b 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -8,10 +8,8 @@ # Please, preserve the changelog entries # -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit 7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e +%global gh_commit 622d0186707f39a4ae71df3bcf42d759bb868854 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +23,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.33 +%global upstream_version 8.5.34 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -155,7 +153,7 @@ Documentation: https://phpunit.readthedocs.io/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm %build @@ -218,7 +216,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit 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 $OPT --verbose || ret=1 fi @@ -235,6 +233,9 @@ exit $ret %changelog +* Tue Sep 19 2023 Remi Collet - 8.5.34-1 +- update to 8.5.34 + * Tue Feb 28 2023 Remi Collet - 8.5.33-1 - update to 8.5.33 diff --git a/sources b/sources index 22322de..d33671f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.33-7d1ff0e.tgz) = 24d801a3846cd4a49b7ad8ed76c832ca4c9c44ba084a643ac0b0a222a4dee10b44aef23aacb989804c7a8d2331fb8d43dfd0d7bdf264717b849e53c275af00c8 +SHA512 (phpunit8-8.5.34-622d018.tgz) = f012d3dbd68bb9e1ac1a8cecfd8d8b03593b423b3e83b2661c30904928e5023fb52760d0a865b88e21c737ffd8c285d99d7640df476b6579e9fa0ea7813e25c8