diff --git a/.gitignore b/.gitignore index 24b8a2b..f4bc2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,11 @@ 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 +/phpunit8-8.5.20-9deefba.tgz +/phpunit8-8.5.21-50a58a6.tgz +/phpunit8-8.5.22-ddd05b9.tgz +/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-rpm.patch b/phpunit8-rpm.patch index 530819f..2fe8780 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,19 +1,24 @@ 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')) { - 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:')); -@@ -58,4 +45,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-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-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,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-12-30 08:58:05.000000000 +0100 ++++ ./tests/bootstrap.php 2021-12-30 08:58:11.290733945 +0100 +@@ -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..89d5a5b 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 bd5fc77c869e8dd65040dacbad170f074c13796c +%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.18 +%global upstream_version 8.5.26 #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) @@ -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 @@ -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 php74 php80 php81; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -233,6 +233,32 @@ 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 + +* 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 + +* 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 + +* 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 +- 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..6cf2f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.18-bd5fc77.tgz) = 284a3b0c5ae2041585230c26ef068323ba5540a1cf817fa50584159c67218b2500c90b664d8254acfd8e00c3e4cd3aefe9e879a6e80693e8b5816ab9bb402423 +SHA512 (phpunit8-8.5.26-ef117c5.tgz) = b8202ef0107a3a9a482a628343aa1fa0af69dc41bd080c64da8159d2fbec2b4e16d3766fee73230d87cfb665ae7983d7a82ba925106112562697cbf7026cb32f