From 248224595bf1c426eecebf5836e590e041fc8ea7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Jul 2022 14:06:17 +0200 Subject: [PATCH 1/6] v8.5.28 (cherry picked from commit 11cef361c301ff4f065c49627b7196bdd0005519) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3cbe09c..69cdbc4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /phpunit8-8.5.25-9ff23f4.tgz /phpunit8-8.5.26-ef117c5.tgz /phpunit8-8.5.27-df70070.tgz +/phpunit8-8.5.28-8f2d1c9.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 45ab136..7a7d99f 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit df70070f2711b8fe8dcca0797c1239ede8c94be6 +%global gh_commit 8f2d1c9c7b30382459c871467853da1a6e44fbd4 #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.27 +%global upstream_version 8.5.28 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Fri Jul 29 2022 Remi Collet - 8.5.28-1 +- update to 8.5.28 + * Mon Jun 20 2022 Remi Collet - 8.5.27-1 - update to 8.5.27 diff --git a/sources b/sources index 67937a0..e2aed9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.27-df70070.tgz) = d1279f6316aee7b91224e1236edbbf9f665db2d2f3ae7371c2a8dc9af4e6596dbcd23a19f1881f28e0aa17856ac0070c2ea18a472285d397ff055ed8ef984584 +SHA512 (phpunit8-8.5.28-8f2d1c9.tgz) = 4866deb0881f56b0c128eb09a2a53e4c817533b6ea1a5b2f75cef597f4a072fb9768663afa29515230ff5c676e91f5c95681868d9f5ab956f2929bf4bee6baf9 From c979111643033750ca87964f20860928c9a56b9c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2022 11:36:36 +0200 Subject: [PATCH 2/6] update to 8.5.29 keep dependency on phpspec/prophecy (optional) (cherry picked from commit 109317cc3a8a6b48bab729c17a49b4ce18c0a733) --- .gitignore | 1 + phpunit8.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 69cdbc4..755c4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /phpunit8-8.5.26-ef117c5.tgz /phpunit8-8.5.27-df70070.tgz /phpunit8-8.5.28-8f2d1c9.tgz +/phpunit8-8.5.29-e8c563c.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 7a7d99f..545b061 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 8f2d1c9c7b30382459c871467853da1a6e44fbd4 +%global gh_commit e8c563c47a9a303662955518ca532b022b337f4d #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.28 +%global upstream_version 8.5.29 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -83,7 +83,6 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "myclabs/deep-copy": "^1.10.0", # "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpspec/prophecy": "^1.10.3", # "phpunit/php-code-coverage": "^7.0.10", # "phpunit/php-file-iterator": "^2.0.4", # "phpunit/php-text-template": "^1.2.1", @@ -216,7 +215,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; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -233,6 +232,10 @@ exit $ret %changelog +* Tue Aug 30 2022 Remi Collet - 8.5.29-1 +- update to 8.5.29 +- keep dependency on phpspec/prophecy (optional) + * Fri Jul 29 2022 Remi Collet - 8.5.28-1 - update to 8.5.28 diff --git a/sources b/sources index e2aed9a..491e67b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.28-8f2d1c9.tgz) = 4866deb0881f56b0c128eb09a2a53e4c817533b6ea1a5b2f75cef597f4a072fb9768663afa29515230ff5c676e91f5c95681868d9f5ab956f2929bf4bee6baf9 +SHA512 (phpunit8-8.5.29-e8c563c.tgz) = 0d83d79757038d8cd3b6be3fb811daf5a200b93e590aaaee17f8be20ad3a313a765eb3c844f9e829c1dcfd13d55266c832a40911c17f6ec1de74052737aaaa18 From a96cfa7fe3b687e951cd74021d0d4a2bb2167381 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Sep 2022 09:02:30 +0200 Subject: [PATCH 3/6] update to 8.5.30 raise dependency on sebastian/comparator 3.0.2 raise dependency on sebastian/exporter 3.1.5 (cherry picked from commit dcf88a488ec1f94b0395e07cfae4c460a5aa7a1b) --- .gitignore | 1 + phpunit8.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 755c4ff..840f5df 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /phpunit8-8.5.27-df70070.tgz /phpunit8-8.5.28-8f2d1c9.tgz /phpunit8-8.5.29-e8c563c.tgz +/phpunit8-8.5.30-4fd448d.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 545b061..a6a43df 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e8c563c47a9a303662955518ca532b022b337f4d +%global gh_commit 4fd448df9affda65a5faa58f8b93087d415216ce #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.29 +%global upstream_version 8.5.30 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -52,10 +52,10 @@ BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-c BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) +BuildRequires: (php-composer(sebastian/comparator) >= 3.0.5 with php-composer(sebastian/comparator) < 4) BuildRequires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) BuildRequires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5) -BuildRequires: (php-composer(sebastian/exporter) >= 3.1.2 with php-composer(sebastian/exporter) < 4) +BuildRequires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4) BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) @@ -87,10 +87,10 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-file-iterator": "^2.0.4", # "phpunit/php-text-template": "^1.2.1", # "phpunit/php-timer": "^2.1.2", -# "sebastian/comparator": "^3.0.2", +# "sebastian/comparator": "^3.0.5", # "sebastian/diff": "^3.0.2", # "sebastian/environment": "^4.2.3", -# "sebastian/exporter": "^3.1.2", +# "sebastian/exporter": "^3.1.5", # "sebastian/global-state": "^3.0.0", # "sebastian/object-enumerator": "^3.0.3", # "sebastian/resource-operations": "^2.0.1", @@ -113,10 +113,10 @@ Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-c Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) -Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) +Requires: (php-composer(sebastian/comparator) >= 3.0.5 with php-composer(sebastian/comparator) < 4) Requires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) Requires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5) -Requires: (php-composer(sebastian/exporter) >= 3.1.2 with php-composer(sebastian/exporter) < 4) +Requires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4) Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) @@ -232,6 +232,11 @@ exit $ret %changelog +* Sun Sep 25 2022 Remi Collet - 8.5.30-1 +- update to 8.5.30 +- raise dependency on sebastian/comparator 3.0.2 +- raise dependency on sebastian/exporter 3.1.5 + * Tue Aug 30 2022 Remi Collet - 8.5.29-1 - update to 8.5.29 - keep dependency on phpspec/prophecy (optional) diff --git a/sources b/sources index 491e67b..c8e2c33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.29-e8c563c.tgz) = 0d83d79757038d8cd3b6be3fb811daf5a200b93e590aaaee17f8be20ad3a313a765eb3c844f9e829c1dcfd13d55266c832a40911c17f6ec1de74052737aaaa18 +SHA512 (phpunit8-8.5.30-4fd448d.tgz) = d7e96c2b7c4c6e0b6c6af7a94a32132707c567493747adaf8c10246715d5c17971352fc8c907af400c6120c4064a1a9e996cca263710bdf48959f787e9699c0b From 08bfb901cfc21fce13bc18bf54f4b70bd799bd44 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Oct 2022 08:26:52 +0200 Subject: [PATCH 4/6] v8.5.31 (cherry picked from commit 98ac28703aa35d07844b41425862b5d42863e42d) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 840f5df..2481253 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /phpunit8-8.5.28-8f2d1c9.tgz /phpunit8-8.5.29-e8c563c.tgz /phpunit8-8.5.30-4fd448d.tgz +/phpunit8-8.5.31-33c126b.tgz diff --git a/phpunit8.spec b/phpunit8.spec index a6a43df..ac629f1 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 4fd448df9affda65a5faa58f8b93087d415216ce +%global gh_commit 33c126b09a42de5c99e5e8032b54e8221264a74e #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.30 +%global upstream_version 8.5.31 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -232,6 +232,9 @@ exit $ret %changelog +* Fri Oct 28 2022 Remi Collet - 8.5.31-1 +- update to 8.5.31 + * Sun Sep 25 2022 Remi Collet - 8.5.30-1 - update to 8.5.30 - raise dependency on sebastian/comparator 3.0.2 diff --git a/sources b/sources index c8e2c33..e8b14b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.30-4fd448d.tgz) = d7e96c2b7c4c6e0b6c6af7a94a32132707c567493747adaf8c10246715d5c17971352fc8c907af400c6120c4064a1a9e996cca263710bdf48959f787e9699c0b +SHA512 (phpunit8-8.5.31-33c126b.tgz) = aa283613dd79b2d972f3c75901b22f32d3261623089f94810ab73ecee23d94b8dc2e8307d91ec5f8eb248207cd6bdd6333bb80d16815248b2d6a018808268acb From 263e0b51e9e5f715de1c5bf7b07b6f402901ba83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Jan 2023 14:45:43 +0100 Subject: [PATCH 5/6] v8.5.32 (cherry picked from commit a5c01da422f96d244dd6b46ef17a4438c6890bf7) (cherry picked from commit 90763ffd745b29cd76a889a91b6c3db0d52d279a) --- .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 ac629f1..a0025ca 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 084ab6f1a0c455c5dad1abf00690fbd997c6c886 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Feb 2023 15:12:38 +0100 Subject: [PATCH 6/6] 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 a0025ca..cb5b84d 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