diff --git a/.gitignore b/.gitignore index 1f7de30..63ff9d6 100644 --- a/.gitignore +++ b/.gitignore @@ -54,13 +54,3 @@ /phpunit9-9.6.16-3767b2c.tgz /phpunit9-9.6.17-1a15698.tgz /phpunit9-9.6.18-32c2c2d.tgz -/phpunit9-9.6.19-a1a54a4.tgz -/phpunit9-9.6.20-49d7820.tgz -/phpunit9-9.6.21-de6abf3.tgz -/phpunit9-9.6.22-f80235c.tgz -/phpunit9-9.6.23-43d2cb1.tgz -/phpunit9-9.6.25-049c011.tgz -/phpunit9-9.6.26-a0139ea.tgz -/phpunit9-9.6.27-0a9aa44.tgz -/phpunit9-9.6.29-9ecfec5.tgz -/phpunit9-9.6.30-b69489b.tgz diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 7e082fe..e9698bf 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-03-21 13:50:22.000000000 +0100 -+++ ./phpunit 2024-03-21 13:59:15.659377103 +0100 +--- ./phpunit.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./phpunit 2024-03-06 10:19:22.109376592 +0100 @@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -49,9 +49,9 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); +} diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php ---- ./src/TextUI/Command.php.rpm 2024-03-21 13:50:22.000000000 +0100 -+++ ./src/TextUI/Command.php 2024-03-21 13:59:59.517211974 +0100 -@@ -601,13 +601,13 @@ class Command +--- ./src/TextUI/Command.php.rpm 2024-03-06 10:19:26.914560422 +0100 ++++ ./src/TextUI/Command.php 2024-03-06 10:19:32.787785106 +0100 +@@ -600,7 +600,7 @@ class Command $this->printVersionString(); $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); @@ -60,32 +60,25 @@ diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php $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; - } -@@ -618,6 +618,7 @@ class Command +@@ -617,6 +617,7 @@ class Command Version::id(), $latestCompatibleVersion, ); -+ printf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); ++ printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); } if ($notLatest) { -@@ -625,6 +626,7 @@ class Command +@@ -624,6 +625,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]); ++ printf('Try to install and use the phpunit%s command.' . PHP_EOL, explode('.', $latestVersion)[0]); } exit(TestRunner::SUCCESS_EXIT); diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2024-03-21 13:50:22.000000000 +0100 -+++ ./src/Util/Xml/SchemaFinder.php 2024-03-21 13:59:15.659377103 +0100 +--- ./src/Util/Xml/SchemaFinder.php.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./src/Util/Xml/SchemaFinder.php 2024-03-06 10:19:22.109376592 +0100 @@ -75,6 +75,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -95,8 +88,8 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2024-03-21 13:50:22.000000000 +0100 -+++ ./tests/bootstrap.php 2024-03-21 13:59:15.659377103 +0100 +--- ./tests/bootstrap.php.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-06 10:19:22.109376592 +0100 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit9.spec b/phpunit9.spec index d0a6635..0cff5be 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,15 +1,16 @@ # remirepo/fedora spec file for phpunit9 # -# 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-2024 Remi Collet +# +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit b69489b312503bf8fa6d75a76916919d7d2fa6d4 -%global gh_date 2025-12-01 +%global gh_commit 32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04 +%global gh_date 2024-03-21 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.30 +%global upstream_version 9.6.18 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -40,26 +41,26 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -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) < 3) +BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.1 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.12.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.31 with php-composer(phpunit/php-code-coverage) < 10) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.6 with php-composer(phpunit/php-file-iterator) < 4) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.13 with php-composer(phpunit/php-code-coverage) < 10) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) -BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-composer(phpunit/php-text-template) < 3) -BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.3 with php-composer(phpunit/php-timer) < 6) -BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0.2 with php-composer(sebastian/cli-parser) < 2) -BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-composer(sebastian/code-unit) < 2) -BuildRequires: (php-composer(sebastian/comparator) >= 4.0.9 with php-composer(sebastian/comparator) < 5) -BuildRequires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) -BuildRequires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/exporter) >= 4.0.8 with php-composer(sebastian/exporter) < 5) -BuildRequires: (php-composer(sebastian/global-state) >= 5.0.8 with php-composer(sebastian/global-state) < 6) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) -BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) -BuildRequires: (php-composer(sebastian/type) >= 3.2.1 with php-composer(sebastian/type) < 4) +BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) +BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) +BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) +BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) +BuildRequires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) +BuildRequires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) +BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) +BuildRequires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) +BuildRequires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) +BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) +BuildRequires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) BuildRequires: php-dom BuildRequires: php-json @@ -78,25 +79,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.5.0 || ^2", -# "myclabs/deep-copy": "^1.13.4", -# "phar-io/manifest": "^2.0.4", -# "phar-io/version": "^3.2.1", -# "phpunit/php-code-coverage": "^9.2.31", -# "phpunit/php-file-iterator": "^3.0.6", +# "doctrine/instantiator": "^1.3.1 || ^2", +# "myclabs/deep-copy": "^1.10.1", +# "phar-io/manifest": "^2.0.3", +# "phar-io/version": "^3.0.2", +# "phpunit/php-code-coverage": "^9.2.28", +# "phpunit/php-file-iterator": "^3.0.5", # "phpunit/php-invoker": "^3.1.1", -# "phpunit/php-text-template": "^2.0.4", -# "phpunit/php-timer": "^5.0.3", -# "sebastian/cli-parser": "^1.0.2", -# "sebastian/code-unit": "^1.0.8", -# "sebastian/comparator": "^4.0.9", -# "sebastian/diff": "^4.0.6", -# "sebastian/environment": "^5.1.5", -# "sebastian/exporter": "^4.0.8", -# "sebastian/global-state": "^5.0.8", -# "sebastian/object-enumerator": "^4.0.4", -# "sebastian/resource-operations": "^3.0.4", -# "sebastian/type": "^3.2.1", +# "phpunit/php-text-template": "^2.0.3", +# "phpunit/php-timer": "^5.0.2", +# "sebastian/cli-parser": "^1.0.1", +# "sebastian/code-unit": "^1.0.6", +# "sebastian/comparator": "^4.0.8", +# "sebastian/diff": "^4.0.3", +# "sebastian/environment": "^5.1.3", +# "sebastian/exporter": "^4.0.5", +# "sebastian/global-state": "^5.0.1", +# "sebastian/object-enumerator": "^4.0.3", +# "sebastian/resource-operations": "^3.0.3", +# "sebastian/type": "^3.2", # "sebastian/version": "^3.0.2" Requires: php(language) >= 7.3 Requires: php-cli @@ -106,26 +107,26 @@ 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) < 3) -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) < 3) +Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 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.12.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.31 with php-composer(phpunit/php-code-coverage) < 10) -Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.6 with php-composer(phpunit/php-file-iterator) < 4) +Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.28 with php-composer(phpunit/php-code-coverage) < 10) +Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) Requires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) -Requires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-composer(phpunit/php-text-template) < 3) -Requires: (php-composer(phpunit/php-timer) >= 5.0.3 with php-composer(phpunit/php-timer) < 6) -Requires: (php-composer(sebastian/cli-parser) >= 1.0.2 with php-composer(sebastian/cli-parser) < 2) -Requires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-composer(sebastian/code-unit) < 2) -Requires: (php-composer(sebastian/comparator) >= 4.0.9 with php-composer(sebastian/comparator) < 5) -Requires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) -Requires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/exporter) >= 4.0.8 with php-composer(sebastian/exporter) < 5) -Requires: (php-composer(sebastian/global-state) >= 5.0.8 with php-composer(sebastian/global-state) < 6) -Requires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) -Requires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) -Requires: (php-composer(sebastian/type) >= 3.2.1 with php-composer(sebastian/type) < 4) +Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) +Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) +Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) +Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) +Requires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) +Requires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) +Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) +Requires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) +Requires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) +Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) +Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) +Requires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { # "ext-soap": "*", @@ -134,19 +135,19 @@ Suggests: php-soap Suggests: php-xdebug # recommends latest versions Recommends: phpunit10 +# Fedora 38+ only until 8.1 EOL +%if 0%{?fedora} >= 38 Recommends: phpunit11 -Recommends: phpunit12 +%endif # 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 @@ -156,7 +157,7 @@ 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 @@ -239,7 +240,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 php81 php82 php83; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -256,70 +257,15 @@ exit $ret %changelog -* Tue Dec 2 2025 Remi Collet - 9.6.30-1 -- update to 9.6.30 (no change) - -* Wed Sep 24 2025 Remi Collet - 9.6.29-1 -- update to 9.6.29 (no change) -- raise dependency on sebastian/exporter 4.0.8 - -* Mon Sep 15 2025 Remi Collet - 9.6.27-1 -- update to 9.6.27 - -* Thu Sep 11 2025 Remi Collet - 9.6.26-1 -- update to 9.6.26 - -* Wed Aug 20 2025 Remi Collet - 9.6.25-1 -- update to 9.6.25 - -* Fri Jul 25 2025 Fedora Release Engineering - 9.6.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun May 4 2025 Remi Collet - 9.6.23-1 -- update to 9.6.23 -- raise dependency on myclabs/deep-copy 1.13.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 9.6.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Dec 5 2024 Remi Collet - 9.6.22-1 -- update to 9.6.22 (no change) -- raise dependency on myclabs/deep-copy 1.12.1 - -* Thu Sep 19 2024 Remi Collet - 9.6.21-1 -- update to 9.6.21 - -* Fri Jul 19 2024 Fedora Release Engineering - 9.6.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jul 11 2024 Remi Collet - 9.6.20-1 -- update to 9.6.20 (no change) -- raise dependencies - -* Fri Apr 5 2024 Remi Collet - 9.6.19-1 -- update to 9.6.19 (no change) - * Thu Mar 21 2024 Remi Collet - 9.6.18-1 - update to 9.6.18 * Mon Feb 26 2024 Remi Collet - 9.6.17-1 - update to 9.6.17 -* Thu Jan 25 2024 Fedora Release Engineering - 9.6.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 9.6.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Fri Jan 19 2024 Remi Collet - 9.6.16-1 - update to 9.6.16 -* Sat Dec 2 2023 Remi Collet - 9.6.15-1 -- update to 9.6.15 - -* Fri Dec 1 2023 Remi Collet - 9.6.14-1 -- update to 9.6.14 (no change) - * Tue Sep 19 2023 Remi Collet - 9.6.13-1 - update to 9.6.13 @@ -330,9 +276,6 @@ exit $ret * Sun Aug 20 2023 Remi Collet - 9.6.11-1 - update to 9.6.11 -* Fri Jul 21 2023 Fedora Release Engineering - 9.6.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Mon Jul 10 2023 Remi Collet - 9.6.10-1 - update to 9.6.10 diff --git a/sources b/sources index 775c187..1e7ea3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.30-b69489b.tgz) = 5609599ea75cb7c455c12137acc26e20e940b81c75d8a9033c32fb6ea7ff6ddeb0bead70f801aa75d7b75033cc9c67f7eeca6be83c672222f0445cc940ab6037 +SHA512 (phpunit9-9.6.18-32c2c2d.tgz) = fd507fcc71ae2a927515dd2c088fe3714ca6d83bf97568d81e9f5334aa1cc2f205a09eeb02da33d6d1f222ab145c472664264bfaf80bbf67eaf555d1294fe529