From b626eb3b6f591ceb34a8e5fa4d6c790c83a296b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Aug 2021 09:35:21 +0200 Subject: [PATCH 1/8] update to 8.5.19 raise dependency on phar-io/manifest 2.0.3 raise dependency on phpunit/php-file-iterator 2.0.4 (cherry picked from commit 3fb51192c08418ca6ed689e6ec7b93002ce8333c) --- .gitignore | 1 + phpunit8-rpm.patch | 57 +++++++++++++++++++++++++++------------------- phpunit8.spec | 21 ++++++++++------- sources | 2 +- 4 files changed, 49 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 24b8a2b..e650502 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /phpunit8-8.5.16-cc66f2f.tgz /phpunit8-8.5.17-7906785.tgz /phpunit8-8.5.18-bd5fc77.tgz +/phpunit8-8.5.19-496281b.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 530819f..12bef82 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-06-07 07:13:03.000000000 +0200 -+++ ./phpunit 2021-06-07 07:13:10.372992677 +0200 -@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { +--- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200 ++++ ./phpunit 2021-08-02 08:34:41.313976887 +0200 +@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -58,4 +45,8 @@ unset($options); +@@ -89,4 +76,8 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2021-06-07 07:13:03.000000000 +0200 -+++ ./src/Util/Configuration.php 2021-06-07 07:13:10.372992677 +0200 +--- ./src/Util/Configuration.php.rpm 2021-08-02 08:27:58.000000000 +0200 ++++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200 @@ -929,7 +929,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { @@ -56,23 +56,34 @@ 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-06-07 07:13:10.372992677 +0200 -+++ ./tests/bootstrap.php 2021-06-07 07:15:29.571502817 +0200 -@@ -8,7 +8,7 @@ - * file that was distributed with this source code. +--- ./tests/bootstrap.php.rpm 2021-08-02 08:27:58.000000000 +0200 ++++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200 +@@ -9,8 +9,8 @@ */ - if (!defined('PHPUNIT_COMPOSER_INSTALL')) { -- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); -+ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); + const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; + +-$composer = file_exists(__DIR__ . '/../vendor/autoload.php'); +-$phar = file_exists(__DIR__ . '/autoload.php'); ++$composer = true; ++$phar = false; + + if ($composer && $phar) { + print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL; +@@ -26,10 +26,15 @@ if (!$composer && !$phar) { + + if ($composer) { + if (!defined('PHPUNIT_COMPOSER_INSTALL')) { +- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); ++ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); + } + +- require_once __DIR__ . '/../vendor/autoload.php'; ++ require_once PHPUNIT_COMPOSER_INSTALL; ++ require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; ++ require_once __DIR__ . '/_files/CoveredFunction.php'; ++ require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; ++ require_once '@PATH@//Framework/Assert/Functions.php'; ++ require_once __DIR__ . '/autoload.php'; } - if (!defined('TEST_FILES_PATH')) { -@@ -19,3 +19,8 @@ ini_set('precision', '14'); - ini_set('serialize_precision', '14'); - - require_once PHPUNIT_COMPOSER_INSTALL; -+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; -+require_once __DIR__ . '/_files/CoveredFunction.php'; -+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; -+require_once '@PATH@/Framework/Assert/Functions.php'; -+require_once __DIR__ . '/autoload.php'; + if ($phar) { diff --git a/phpunit8.spec b/phpunit8.spec index 00864ad..2473c89 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bd5fc77c869e8dd65040dacbad170f074c13796c +%global gh_commit 496281b64ec781856ed0a583483b5923b4033722 #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.18 +%global upstream_version 8.5.19 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -45,11 +45,11 @@ BuildArch: noarch BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) +BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) +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) @@ -81,11 +81,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.3.1", # "myclabs/deep-copy": "^1.10.0", -# "phar-io/manifest": "^2.0.1", +# "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.2", +# "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", @@ -107,11 +107,11 @@ Requires: php-xml Requires: php-xmlwriter Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) Requires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) +Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) +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) @@ -233,6 +233,11 @@ exit $ret %changelog +* Mon Aug 2 2021 Remi Collet - 8.5.19-1 +- update to 8.5.19 +- raise dependency on phar-io/manifest 2.0.3 +- raise dependency on phpunit/php-file-iterator 2.0.4 + * Mon Jul 19 2021 Remi Collet - 8.5.18-1 - update to 8.5.18 diff --git a/sources b/sources index 816424a..071cb90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.18-bd5fc77.tgz) = 284a3b0c5ae2041585230c26ef068323ba5540a1cf817fa50584159c67218b2500c90b664d8254acfd8e00c3e4cd3aefe9e879a6e80693e8b5816ab9bb402423 +SHA512 (phpunit8-8.5.19-496281b.tgz) = 5c0e03be73ce40d347266379dd70d615926ef5a0350bfea013c2952e0deb46aec876cbd24408180a45c0150716495d1394450149b40c7dfe8dc7faa8ba104233 From d524dc2b5c34829e67828406490f035e546f78d9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 15:01:16 +0200 Subject: [PATCH 2/8] v8.5.20 (cherry picked from commit 87c5760237c4995664e025172e44766918ceaed6) --- .gitignore | 1 + phpunit8.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e650502..c4eed13 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /phpunit8-8.5.17-7906785.tgz /phpunit8-8.5.18-bd5fc77.tgz /phpunit8-8.5.19-496281b.tgz +/phpunit8-8.5.20-9deefba.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 2473c89..8d15bf9 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 496281b64ec781856ed0a583483b5923b4033722 +%global gh_commit 9deefba183198398a09b927a6ac6bc1feb0b7b70 #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.19 +%global upstream_version 8.5.20 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -216,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 php72 php73 php74 php80; do +for cmd in php php72 php73 php74 php80 php81; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -233,6 +233,9 @@ exit $ret %changelog +* Wed Sep 1 2021 Remi Collet - 8.5.20-1 +- update to 8.5.20 + * Mon Aug 2 2021 Remi Collet - 8.5.19-1 - update to 8.5.19 - raise dependency on phar-io/manifest 2.0.3 diff --git a/sources b/sources index 071cb90..7254dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.19-496281b.tgz) = 5c0e03be73ce40d347266379dd70d615926ef5a0350bfea013c2952e0deb46aec876cbd24408180a45c0150716495d1394450149b40c7dfe8dc7faa8ba104233 +SHA512 (phpunit8-8.5.20-9deefba.tgz) = 9af814f55440efb2592a509641755cbef83ee03aa783ccad7ff6370c8b3b0d21b9b8da3d01976210c804375ac00d7939863a8426491a28541bd419c41b0b93fc From 16ec8be23264eb70c2dfe5a98ad7da4f24a40d24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Sep 2021 07:02:12 +0200 Subject: [PATCH 3/8] v8.5.21 (cherry picked from commit c425089c0ea0d0b8f494d7c37ac75523756d6ddc) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c4eed13..deadda5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /phpunit8-8.5.18-bd5fc77.tgz /phpunit8-8.5.19-496281b.tgz /phpunit8-8.5.20-9deefba.tgz +/phpunit8-8.5.21-50a58a6.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 8d15bf9..f652c45 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 9deefba183198398a09b927a6ac6bc1feb0b7b70 +%global gh_commit 50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984 #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.20 +%global upstream_version 8.5.21 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Mon Sep 27 2021 Remi Collet - 8.5.21-1 +- update to 8.5.21 + * Wed Sep 1 2021 Remi Collet - 8.5.20-1 - update to 8.5.20 diff --git a/sources b/sources index 7254dae..226fae1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.20-9deefba.tgz) = 9af814f55440efb2592a509641755cbef83ee03aa783ccad7ff6370c8b3b0d21b9b8da3d01976210c804375ac00d7939863a8426491a28541bd419c41b0b93fc +SHA512 (phpunit8-8.5.21-50a58a6.tgz) = 300514111a18da6af56d9e322ad88c1b13992da631078ed468743ba06a7fd2fa60fd85d77b3845e5c521881c1c29579e8f5688835c90719b9ca8bccac73b16ab From 68fd0a87914f2a2d87421793cdc1fd778f693dfd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jan 2022 08:32:33 +0100 Subject: [PATCH 4/8] v8.5.22 (cherry picked from commit ab5d89e43441eb919fe8d42013b435f571c4b29e) --- .gitignore | 1 + phpunit8-rpm.patch | 42 +++++++++++++++++++++--------------------- phpunit8.spec | 9 ++++++--- sources | 2 +- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index deadda5..9e69837 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /phpunit8-8.5.19-496281b.tgz /phpunit8-8.5.20-9deefba.tgz /phpunit8-8.5.21-50a58a6.tgz +/phpunit8-8.5.22-ddd05b9.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 12bef82..2fe8780 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,19 +1,24 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200 -+++ ./phpunit 2021-08-02 08:34:41.313976887 +0200 -@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } +--- ./phpunit.rpm 2021-12-30 08:58:05.000000000 +0100 ++++ ./phpunit 2021-12-30 09:01:08.095425016 +0100 +@@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p + define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); --foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { -- if (file_exists($file)) { -- define('PHPUNIT_COMPOSER_INSTALL', $file); + unset($GLOBALS['_composer_autoload_path']); ++} else if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) { ++ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n"; ++ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php')); + } else { +- foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { +- if (file_exists($file)) { +- define('PHPUNIT_COMPOSER_INSTALL', $file); - -- break; +- break; +- } - } --} - --unset($file); +- unset($file); +-} - -if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( @@ -24,16 +29,11 @@ diff -up ./phpunit.rpm ./phpunit - ); - - die(1); -+// Libraries PATH -+if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) { -+ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n"; -+ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php')); -+} else { + define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit8/autoload.php'); } $options = getopt('', array('prepend:')); -@@ -89,4 +76,8 @@ unset($options); +@@ -95,4 +79,8 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2021-08-02 08:27:58.000000000 +0200 -+++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200 +--- ./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 private function validateConfigurationAgainstSchema(): void { @@ -56,8 +56,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-08-02 08:27:58.000000000 +0200 -+++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200 +--- ./tests/bootstrap.php.rpm 2021-12-30 08:58:05.000000000 +0100 ++++ ./tests/bootstrap.php 2021-12-30 08:58:11.290733945 +0100 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit8.spec b/phpunit8.spec index f652c45..71646c7 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984 +%global gh_commit ddd05b9d844260353895a3b950a9258126c11503 #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.21 +%global upstream_version 8.5.22 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -216,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 php72 php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -233,6 +233,9 @@ exit $ret %changelog +* Thu Dec 30 2021 Remi Collet - 8.5.22-1 +- update to 8.5.22 + * Mon Sep 27 2021 Remi Collet - 8.5.21-1 - update to 8.5.21 diff --git a/sources b/sources index 226fae1..804ac31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.21-50a58a6.tgz) = 300514111a18da6af56d9e322ad88c1b13992da631078ed468743ba06a7fd2fa60fd85d77b3845e5c521881c1c29579e8f5688835c90719b9ca8bccac73b16ab +SHA512 (phpunit8-8.5.22-ddd05b9.tgz) = 8210fa6debe72c8523fa77ea093e50271d7e7f6a2ca75964d29cc0c7a4f04eb6769da845c81e69ae133070d7344d77782aee936c5d4d9ca7549623ece3e2c1de From 27e4ad36c216fa33ea4cf517641b125708b393ee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Jan 2022 08:12:36 +0100 Subject: [PATCH 5/8] v8.5.23 (cherry picked from commit 22035bb168293eaa7d487d0278bcf60eff4f1cbe) --- .gitignore | 1 + phpunit8.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9e69837..d5ac481 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /phpunit8-8.5.20-9deefba.tgz /phpunit8-8.5.21-50a58a6.tgz /phpunit8-8.5.22-ddd05b9.tgz +/phpunit8-8.5.23-efb20ff.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 71646c7..947a5a8 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2021 Remi Collet +# Copyright (c) 2010-2022 Remi Collet # # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit ddd05b9d844260353895a3b950a9258126c11503 +%global gh_commit efb20ff3623b9d09bf190a68fdfe574538a8d496 #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.22 +%global upstream_version 8.5.23 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Remi Collet - 8.5.23-1 +- update to 8.5.23 + * Thu Dec 30 2021 Remi Collet - 8.5.22-1 - update to 8.5.22 diff --git a/sources b/sources index 804ac31..20e561a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.22-ddd05b9.tgz) = 8210fa6debe72c8523fa77ea093e50271d7e7f6a2ca75964d29cc0c7a4f04eb6769da845c81e69ae133070d7344d77782aee936c5d4d9ca7549623ece3e2c1de +SHA512 (phpunit8-8.5.23-efb20ff.tgz) = 5c45b1d330ee84627631d2ce81a36391db9cd285ea3083d193b52d7770938cebe5a80972eae55da3fd71bb25c654cfbcf953663e33e7a8b415da0c5a0f4197c8 From ca6abfbd1b1f4c7b96848387939da8fa6be437ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Mar 2022 09:49:32 +0100 Subject: [PATCH 6/8] update to 8.5.24 #StandWithUkraine (cherry picked from commit 755c9c290fc8e53d7d8c04abe2ca34a1818db04d) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d5ac481..c24aece 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /phpunit8-8.5.21-50a58a6.tgz /phpunit8-8.5.22-ddd05b9.tgz /phpunit8-8.5.23-efb20ff.tgz +/phpunit8-8.5.24-293cb00.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 947a5a8..d3e6d8d 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit efb20ff3623b9d09bf190a68fdfe574538a8d496 +%global gh_commit 293cb0099d75407d971a73f41e51f35b664667ed #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.23 +%global upstream_version 8.5.24 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Sun Mar 6 2022 Remi Collet - 8.5.24-1 +- update to 8.5.24 #StandWithUkraine + * Fri Jan 21 2022 Remi Collet - 8.5.23-1 - update to 8.5.23 diff --git a/sources b/sources index 20e561a..eb79cf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.23-efb20ff.tgz) = 5c45b1d330ee84627631d2ce81a36391db9cd285ea3083d193b52d7770938cebe5a80972eae55da3fd71bb25c654cfbcf953663e33e7a8b415da0c5a0f4197c8 +SHA512 (phpunit8-8.5.24-293cb00.tgz) = d513c45850f0799608a010d62a9a701c3181ced5c7e1ff88debee9e046751559f728d91f1ec6316efc9d568d9fa2261f548079ddb2f005b7fbbd3fa353144bb5 From 4841b496a6222f0eaa45e38b6dcfb20811df8533 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Mar 2022 08:56:15 +0100 Subject: [PATCH 7/8] v8.5.25 (cherry picked from commit 0ef0082455621f72b439c555aa23858876cf5791) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c24aece..51ce9c1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /phpunit8-8.5.22-ddd05b9.tgz /phpunit8-8.5.23-efb20ff.tgz /phpunit8-8.5.24-293cb00.tgz +/phpunit8-8.5.25-9ff23f4.tgz diff --git a/phpunit8.spec b/phpunit8.spec index d3e6d8d..5708d02 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 293cb0099d75407d971a73f41e51f35b664667ed +%global gh_commit 9ff23f4dfde040ccd3b8db876192d1184b934158 #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.24 +%global upstream_version 8.5.25 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Thu Mar 17 2022 Remi Collet - 8.5.25-1 +- update to 8.5.25 + * Sun Mar 6 2022 Remi Collet - 8.5.24-1 - update to 8.5.24 #StandWithUkraine diff --git a/sources b/sources index eb79cf3..b982c74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.24-293cb00.tgz) = d513c45850f0799608a010d62a9a701c3181ced5c7e1ff88debee9e046751559f728d91f1ec6316efc9d568d9fa2261f548079ddb2f005b7fbbd3fa353144bb5 +SHA512 (phpunit8-8.5.25-9ff23f4.tgz) = dd2a986a93108167df5b1f979df5d2b73049f4202e3b70bcb449ebe3d112d942ca55f65d41eb13289b42eb85f185cc2113f532bc42674b2925c3ed360db15ac7 From 0663d0c848c3865408291ed2f30a02e83d53392e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2022 09:15:43 +0200 Subject: [PATCH 8/8] v8.5.26 (cherry picked from commit 965d4b99a096f53b2ec35b3be2ad6b4d865de599) --- .gitignore | 1 + phpunit8.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 51ce9c1..f4bc2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /phpunit8-8.5.23-efb20ff.tgz /phpunit8-8.5.24-293cb00.tgz /phpunit8-8.5.25-9ff23f4.tgz +/phpunit8-8.5.26-ef117c5.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 5708d02..89d5a5b 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 9ff23f4dfde040ccd3b8db876192d1184b934158 +%global gh_commit ef117c59fc4c54a979021b26d08a3373e386606d #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.25 +%global upstream_version 8.5.26 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -196,8 +196,8 @@ cat src/autoload.php --output tests/autoload.php \ --exclude '*/BankAccountTest2.php' \ --exclude '*/regression/Trac/783/OneTest.php' \ - --exclude 'tests/end-to-end/regression/GitHub/3889/Issue3889Test.test.php' \ - --exclude 'tests/end-to-end/regression/GitHub/3904/Issue3904Test.php' \ + --exclude 'tests/end-to-end/regression/3889/Issue3889Test.test.php' \ + --exclude 'tests/end-to-end/regression/3904/Issue3904Test.php' \ tests @@ -233,6 +233,9 @@ exit $ret %changelog +* Mon Apr 4 2022 Remi Collet - 8.5.26-1 +- update to 8.5.26 + * Thu Mar 17 2022 Remi Collet - 8.5.25-1 - update to 8.5.25 diff --git a/sources b/sources index b982c74..6cf2f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.25-9ff23f4.tgz) = dd2a986a93108167df5b1f979df5d2b73049f4202e3b70bcb449ebe3d112d942ca55f65d41eb13289b42eb85f185cc2113f532bc42674b2925c3ed360db15ac7 +SHA512 (phpunit8-8.5.26-ef117c5.tgz) = b8202ef0107a3a9a482a628343aa1fa0af69dc41bd080c64da8159d2fbec2b4e16d3766fee73230d87cfb665ae7983d7a82ba925106112562697cbf7026cb32f