diff --git a/.gitignore b/.gitignore index 3ee7c98..a062d6b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,17 +27,3 @@ 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 -/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 -/phpunit8-8.5.41-d843cb5.tgz -/phpunit8-8.5.42-3a68a70.tgz -/phpunit8-8.5.44-e1d7ab6.tgz -/phpunit8-8.5.45-5a69265.tgz -/phpunit8-8.5.46-2da51ff.tgz -/phpunit8-8.5.48-75f469c.tgz -/phpunit8-8.5.49-2605ccb.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 07bbbb6..25cd8f0 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-03-06 09:33:13.000000000 +0100 -+++ ./phpunit 2024-04-05 08:00:14.044636630 +0200 +--- ./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']); @@ -48,45 +48,10 @@ 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 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 +--- ./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 { $original = libxml_use_internal_errors(true); @@ -96,8 +61,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 2024-03-06 09:33:13.000000000 +0100 -+++ ./tests/bootstrap.php 2024-04-05 08:00:14.044636630 +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 5331753..cb5b84d 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,15 +1,18 @@ # remirepo/fedora spec file for phpunit8 # -# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2010-2023 Remi Collet +# +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # +# For compatibility with SCL +%undefine __brp_mangle_shebangs -%global gh_commit 2605ccb4744dbcc20e00a12b7082c86ab3431071 -%global gh_date 2025-12-01 +%global gh_commit 7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e +#global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,7 +25,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.49 +%global upstream_version 8.5.33 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -40,24 +43,24 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.13.4 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) -BuildRequires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) +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.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.17 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.6 with php-composer(phpunit/php-file-iterator) < 3) +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.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.4 with php-composer(phpunit/php-timer) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0.6 with php-composer(sebastian/comparator) < 4) -BuildRequires: (php-composer(sebastian/diff) >= 3.0.6 with php-composer(sebastian/diff) < 4) -BuildRequires: (php-composer(sebastian/environment) >= 4.2.5 with php-composer(sebastian/environment) < 5) -BuildRequires: (php-composer(sebastian/exporter) >= 3.1.8 with php-composer(sebastian/exporter) < 4) -BuildRequires: (php-composer(sebastian/global-state) >= 3.0.6 with php-composer(sebastian/global-state) < 4) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.5 with php-composer(sebastian/object-enumerator) < 4) -BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.3 with php-composer(sebastian/resource-operations) < 3) +BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) +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.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) BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) +BuildRequires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) BuildRequires: php-dom BuildRequires: php-json @@ -76,21 +79,21 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.5.0", -# "myclabs/deep-copy": "^1.13.4", -# "phar-io/manifest": "^2.0.4", -# "phar-io/version": "^3.2.1", -# "phpunit/php-code-coverage": "^7.0.17", -# "phpunit/php-file-iterator": "^2.0.6", +# "doctrine/instantiator": "^1.3.1", +# "myclabs/deep-copy": "^1.10.0", +# "phar-io/manifest": "^2.0.3", +# "phar-io/version": "^3.0.2", +# "phpunit/php-code-coverage": "^7.0.10", +# "phpunit/php-file-iterator": "^2.0.4", # "phpunit/php-text-template": "^1.2.1", -# "phpunit/php-timer": "^2.1.4", -# "sebastian/comparator": "^3.0.6", -# "sebastian/diff": "^3.0.6", -# "sebastian/environment": "^4.2.5", -# "sebastian/exporter": "^3.1.8", -# "sebastian/global-state": "^3.0.6", -# "sebastian/object-enumerator": "^3.0.5", -# "sebastian/resource-operations": "^2.0.3", +# "phpunit/php-timer": "^2.1.2", +# "sebastian/comparator": "^3.0.5", +# "sebastian/diff": "^3.0.2", +# "sebastian/environment": "^4.2.3", +# "sebastian/exporter": "^3.1.5", +# "sebastian/global-state": "^3.0.0", +# "sebastian/object-enumerator": "^3.0.3", +# "sebastian/resource-operations": "^2.0.1", # "sebastian/type": "^1.1.3", # "sebastian/version": "^2.0.1", Requires: php(language) >= 7.2 @@ -101,23 +104,23 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) -Requires: (php-composer(myclabs/deep-copy) >= 1.13.4 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) -Requires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) +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.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.17 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.6 with php-composer(phpunit/php-file-iterator) < 3) +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.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.4 with php-composer(phpunit/php-timer) < 3) -Requires: (php-composer(sebastian/comparator) >= 3.0.6 with php-composer(sebastian/comparator) < 4) -Requires: (php-composer(sebastian/diff) >= 3.0.6 with php-composer(sebastian/diff) < 4) -Requires: (php-composer(sebastian/environment) >= 4.2.5 with php-composer(sebastian/environment) < 5) -Requires: (php-composer(sebastian/exporter) >= 3.1.8 with php-composer(sebastian/exporter) < 4) -Requires: (php-composer(sebastian/global-state) >= 3.0.6 with php-composer(sebastian/global-state) < 4) -Requires: (php-composer(sebastian/object-enumerator) >= 3.0.5 with php-composer(sebastian/object-enumerator) < 4) -Requires: (php-composer(sebastian/resource-operations) >= 2.0.3 with php-composer(sebastian/resource-operations) < 3) -Requires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) +Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) +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.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) +Requires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) # From composer.json, "suggest": { # "phpunit/php-invoker": "^2.0.0", @@ -129,19 +132,15 @@ Suggests: php-xdebug # recommends latest versions Recommends: phpunit9 Recommends: phpunit10 -Recommends: phpunit11 -Recommends: phpunit12 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 +Requires: php-reflection Requires: php-openssl Requires: php-pcntl +Requires: php-pcre Requires: php-phar - -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 -Provides: php-composer(phpunit/phpunit) = %{version} -Provides: phpunit = %{version}-%{release} -%endif +Requires: php-spl %description @@ -151,14 +150,12 @@ It is an instance of the xUnit architecture for unit testing frameworks. This package provides the version %{ver_major} of PHPUnit, available using the %{name} command. -Documentation: https://phpunit.de/documentation.html +Documentation: https://phpunit.readthedocs.io/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p0 -b .rpm - -find . -name \*.rpm -delete -print +%patch0 -p0 -b .rpm %build @@ -174,6 +171,7 @@ 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', @@ -188,8 +186,6 @@ 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( @@ -222,7 +218,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 php81 php82 php83 php84 php85; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -239,79 +235,12 @@ exit $ret %changelog -* Tue Dec 2 2025 Remi Collet - 8.5.49-1 -- update to 8.5.49 (no change) - -* Wed Sep 24 2025 Remi Collet - 8.5.48-1 -- update to 8.5.48 (no change) -- raise dependency on sebastian/exporter 3.1.8 - -* Mon Sep 15 2025 Remi Collet - 8.5.46-1 -- update to 8.5.46 - -* Thu Sep 11 2025 Remi Collet - 8.5.45-1 -- update to 8.5.45 - -* Wed Aug 20 2025 Remi Collet - 8.5.44-1 -- update to 8.5.44 - -* Fri Jul 25 2025 Fedora Release Engineering - 8.5.42-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun May 4 2025 Remi Collet - 8.5.42-1 -- update to 8.5.42 -- raise dependency on myclabs/deep-copy 1.13.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 8.5.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Dec 5 2024 Remi Collet - 8.5.41-1 -- update to 8.5.41 (no change) -- raise dependency on myclabs/deep-copy 1.12.1 - -* Thu Sep 19 2024 Remi Collet - 8.5.40-1 -- update to 8.5.40 - -* Fri Jul 19 2024 Fedora Release Engineering - 8.5.39-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jul 11 2024 Remi Collet - 8.5.39-1 -- update to 8.5.39 (no change) -- raise dependencies - -* Fri Apr 5 2024 Remi Collet - 8.5.38-1 -- update to 8.5.38 (no change) - -* Wed Mar 6 2024 Remi Collet - 8.5.37-1 -- update to 8.5.37 - -* Thu Jan 25 2024 Fedora Release Engineering - 8.5.36-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 8.5.36-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Dec 2 2023 Remi Collet - 8.5.36-1 -- update to 8.5.36 (no change) - -* Fri Dec 1 2023 Remi Collet - 8.5.35-1 -- update to 8.5.35 (no change) - -* Tue Sep 19 2023 Remi Collet - 8.5.34-1 -- update to 8.5.34 - -* Fri Jul 21 2023 Fedora Release Engineering - 8.5.33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * 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 -* Fri Jan 20 2023 Fedora Release Engineering - 8.5.31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Fri Oct 28 2022 Remi Collet - 8.5.31-1 - update to 8.5.31 @@ -327,9 +256,6 @@ exit $ret * Fri Jul 29 2022 Remi Collet - 8.5.28-1 - update to 8.5.28 -* Fri Jul 22 2022 Fedora Release Engineering - 8.5.27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - * Mon Jun 20 2022 Remi Collet - 8.5.27-1 - update to 8.5.27 diff --git a/sources b/sources index 9d0ff0f..22322de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.49-2605ccb.tgz) = 0d9e36ffdabe03bd2ad71719c1e1e7efb5a93e537965f9377bf211929d147cd4466ed892212ac30ed2d9c310d775eb9cd0f297d169e081da9dd01f62ac3e5959 +SHA512 (phpunit8-8.5.33-7d1ff0e.tgz) = 24d801a3846cd4a49b7ad8ed76c832ca4c9c44ba084a643ac0b0a222a4dee10b44aef23aacb989804c7a8d2331fb8d43dfd0d7bdf264717b849e53c275af00c8