From 0d4c16e24699c144ca310afb45ca3ea580939e8e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Mar 2024 09:36:37 +0100 Subject: [PATCH 1/3] v8.5.37 (cherry picked from commit 155da8372a2b802b724c1a2ccf5c752c29e3d9ad) --- .gitignore | 3 +++ phpunit8.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8e1a866..7148b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ clog /phpunit8-8.5.32-3756869.tgz /phpunit8-8.5.33-7d1ff0e.tgz /phpunit8-8.5.34-622d018.tgz +/phpunit8-8.5.35-c14b7dc.tgz +/phpunit8-8.5.36-9652df5.tgz +/phpunit8-8.5.37-fce30f3.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 66434a7..52fb6d8 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2023 Remi Collet +# Copyright (c) 2010-2024 Remi Collet # # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ @@ -9,7 +9,7 @@ # -%global gh_commit 622d0186707f39a4ae71df3bcf42d759bb868854 +%global gh_commit fce30f306cee78be33ba00c8f9a853f41db0491b #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,7 +23,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.34 +%global upstream_version 8.5.37 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -130,6 +130,7 @@ Suggests: php-xdebug # recommends latest versions Recommends: phpunit9 Recommends: phpunit10 +Recommends: phpunit11 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -169,7 +170,6 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Text/Template/Autoload.php', '%{php_home}/SebastianBergmann/CodeCoverage7/autoload.php', '%{php_home}/SebastianBergmann/Timer/autoload.php', - '%{php_home}/Prophecy/autoload.php', '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2 '%{php_home}/SebastianBergmann/Comparator3/autoload.php', '%{php_home}/SebastianBergmann/Environment4/autoload.php', @@ -184,6 +184,8 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/Invoker/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', + // May load Comparator/RecursionContext bad version + '%{php_home}/Prophecy/autoload.php', ]); // Extensions \Fedora\Autoloader\Dependencies::optional( @@ -233,6 +235,9 @@ exit $ret %changelog +* Wed Mar 6 2024 Remi Collet - 8.5.37-1 +- update to 8.5.37 + * Tue Sep 19 2023 Remi Collet - 8.5.34-1 - update to 8.5.34 diff --git a/sources b/sources index d33671f..ac79f5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.34-622d018.tgz) = f012d3dbd68bb9e1ac1a8cecfd8d8b03593b423b3e83b2661c30904928e5023fb52760d0a865b88e21c737ffd8c285d99d7640df476b6579e9fa0ea7813e25c8 +SHA512 (phpunit8-8.5.37-fce30f3.tgz) = 87e2b29d1d775329138ec8619d8b37c57fdc39af284a6b54c5fcec571477461ce4857b1aad4161be31369a6bd2fc65c31381b4e88f302fd3acc21637df036b31 From 46ef3d97fd4e8b04942bb8de43757be54a8ee6e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Sep 2024 14:58:19 +0200 Subject: [PATCH 2/3] v8.5.40 (cherry picked from commit 2b22bd3e64bba8c9e597eb57c76eb58c7ac4c7a5) (cherry picked from commit a9e279838bb4bb216e7f47f6376ef76c8971a5b7) --- .gitignore | 3 +++ phpunit8.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7148b6b..0dc0ae9 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ clog /phpunit8-8.5.35-c14b7dc.tgz /phpunit8-8.5.36-9652df5.tgz /phpunit8-8.5.37-fce30f3.tgz +/phpunit8-8.5.38-1ecad67.tgz +/phpunit8-8.5.39-172ba97.tgz +/phpunit8-8.5.40-48ed828.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 52fb6d8..a18b029 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -9,8 +9,8 @@ # -%global gh_commit fce30f306cee78be33ba00c8f9a853f41db0491b -#global gh_date 20150927 +%global gh_commit 48ed828b72c35b38cdddcd9059339734cb06b3a7 +%global gh_date 2024-09-19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,7 +23,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.37 +%global upstream_version 8.5.40 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -156,6 +156,8 @@ Documentation: https://phpunit.readthedocs.io/ %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p0 -b .rpm +find . -name \*.rpm -delete -print + %build %{_bindir}/phpab \ @@ -218,7 +220,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 php80 php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -235,6 +237,9 @@ exit $ret %changelog +* Thu Sep 19 2024 Remi Collet - 8.5.40-1 +- update to 8.5.40 + * Wed Mar 6 2024 Remi Collet - 8.5.37-1 - update to 8.5.37 diff --git a/sources b/sources index ac79f5b..8d7603d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.37-fce30f3.tgz) = 87e2b29d1d775329138ec8619d8b37c57fdc39af284a6b54c5fcec571477461ce4857b1aad4161be31369a6bd2fc65c31381b4e88f302fd3acc21637df036b31 +SHA512 (phpunit8-8.5.40-48ed828.tgz) = 5bd3de27ccc2ae5c7727af70700de7f5322832ffc624e27a9f59588f86c80290bed67cc9cffb08896f62c26186e9cfce95b062c9361c1fc2f825e11d53236f61 From c1bcfbd5783cf57dca1c8a75ae1af07dd034d005 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Sep 2024 15:03:17 +0200 Subject: [PATCH 3/3] update patch --- phpunit8-rpm.patch | 49 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 25cd8f0..07bbbb6 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-12-30 08:58:05.000000000 +0100 -+++ ./phpunit 2021-12-30 09:01:08.095425016 +0100 +--- ./phpunit.rpm 2024-03-06 09:33:13.000000000 +0100 ++++ ./phpunit 2024-04-05 08:00:14.044636630 +0200 @@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -48,10 +48,45 @@ diff -up ./phpunit.rpm ./phpunit + // PHPUnit v6 to v9 + PHPUnit\TextUI\Command::main(); +} +diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php +--- ./src/TextUI/Command.php.rpm 2024-03-06 09:33:13.000000000 +0100 ++++ ./src/TextUI/Command.php 2024-04-05 08:01:23.626251144 +0200 +@@ -1144,13 +1144,13 @@ class Command + $this->printVersionString(); + + $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); +- $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . explode('.', Version::series())[0]); ++ $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=explode('.', Version::series())[0]); + + $notLatest = version_compare($latestVersion, Version::id(), '>'); + $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); + + if ($notLatest || $notLatestCompatible) { +- print 'You are not using the latest version of PHPUnit.' . PHP_EOL; ++ print 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL; + } else { + print 'You are using the latest version of PHPUnit.' . PHP_EOL; + } +@@ -1161,6 +1161,7 @@ class Command + Version::id(), + $latestCompatibleVersion + ); ++ printf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); + } + + if ($notLatest) { +@@ -1168,6 +1169,7 @@ class Command + 'The latest version is PHPUnit %s.' . PHP_EOL, + $latestVersion + ); ++ printf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); + } + + exit(TestRunner::SUCCESS_EXIT); diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2021-12-30 08:58:05.000000000 +0100 -+++ ./src/Util/Configuration.php 2021-12-30 08:58:11.290733945 +0100 -@@ -929,7 +929,7 @@ final class Configuration +--- ./src/Util/Configuration.php.rpm 2024-03-06 09:33:13.000000000 +0100 ++++ ./src/Util/Configuration.php 2024-04-05 08:00:14.044636630 +0200 +@@ -932,7 +932,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { $original = libxml_use_internal_errors(true); @@ -61,8 +96,8 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php if (defined('__PHPUNIT_PHAR_ROOT__')) { $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-12-30 08:58:05.000000000 +0100 -+++ ./tests/bootstrap.php 2021-12-30 08:58:11.290733945 +0100 +--- ./tests/bootstrap.php.rpm 2024-03-06 09:33:13.000000000 +0100 ++++ ./tests/bootstrap.php 2024-04-05 08:00:14.044636630 +0200 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;