diff --git a/.gitignore b/.gitignore index ab552b3..bd46005 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,60 @@ /phpunit10-10.2.7-a215d9e.tgz /phpunit10-10.3.0-c87ae28.tgz /phpunit10-10.3.1-d442ce7.tgz +/phpunit10-10.3.2-0dafb11.tgz +/phpunit10-10.3.3-241ed4d.tgz +/phpunit10-10.3.4-b8d5947.tgz +/phpunit10-10.3.5-747c3b2.tgz +/phpunit10-10.4.0-9784e87.tgz +/phpunit10-10.4.1-62bd7af.tgz +/phpunit10-10.4.2-cacd8b9.tgz +/phpunit10-10.5.0-80cab18.tgz +/phpunit10-10.5.1-d5d9dca.tgz +/phpunit10-10.5.2-5aedff4.tgz +/phpunit10-10.5.3-6fce887.tgz +/phpunit10-10.5.5-ed21115.tgz +/phpunit10-10.5.7-e5c5b39.tgz +/phpunit10-10.5.8-08f4fa7.tgz +/phpunit10-10.5.9-0bd6637.tgz +/phpunit10-10.5.10-50b8e31.tgz +/phpunit10-10.5.11-0d968f6.tgz +/phpunit10-10.5.12-41a9886.tgz +/phpunit10-10.5.13-20a63fc.tgz +/phpunit10-10.5.14-4cf8824.tgz +/phpunit10-10.5.15-86376e0.tgz +/phpunit10-10.5.16-18f8d4a.tgz +/phpunit10-10.5.17-c1f736a.tgz +/phpunit10-10.5.18-835df17.tgz +/phpunit10-10.5.19-c726f0d.tgz +/phpunit10-10.5.20-547d314.tgz +/phpunit10-10.5.24-5f124e3.tgz +/phpunit10-10.5.25-831bf82.tgz +/phpunit10-10.5.26-42e2f13.tgz +/phpunit10-10.5.27-2425f71.tgz +/phpunit10-10.5.28-ff7fb85.tgz +/phpunit10-10.5.29-8e9e808.tgz +/phpunit10-10.5.30-b15524f.tgz +/phpunit10-10.5.31-43e7c3e.tgz +/phpunit10-10.5.32-f069f46.tgz +/phpunit10-10.5.33-4def7a9.tgz +/phpunit10-10.5.34-3c69d31.tgz +/phpunit10-10.5.35-7ac8b4e.tgz +/phpunit10-10.5.36-aa0a8ce.tgz +/phpunit10-10.5.37-c7cffa0.tgz +/phpunit10-10.5.38-a86773b.tgz +/phpunit10-10.5.39-4e89eff.tgz +/phpunit10-10.5.40-e6ddda9.tgz +/phpunit10-10.5.41-e76586f.tgz +/phpunit10-10.5.42-a9336f4.tgz +/phpunit10-10.5.43-fb117a8.tgz +/phpunit10-10.5.44-1381c62.tgz +/phpunit10-10.5.45-bd68a78.tgz +/phpunit10-10.5.46-8080be3.tgz +/phpunit10-10.5.47-3637b3e.tgz +/phpunit10-10.5.48-6e0a2bc.tgz +/phpunit10-10.5.53-3276847.tgz +/phpunit10-10.5.54-b1dbbaa.tgz +/phpunit10-10.5.55-4b2d546.tgz +/phpunit10-10.5.57-8e7598b.tgz +/phpunit10-10.5.58-e24fb46.tgz +/phpunit10-10.5.59-c47fe00.tgz diff --git a/makesrc.sh b/makesrc.sh index 3580b58..04ad6a0 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,24 +1,29 @@ #!/bin/bash NAME=$(basename $PWD) +DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) +MAJOR=$(sed -n '/^%global ver_major/{s/.* //;p}' $NAME.spec) +MINOR=$(sed -n '/^%global ver_minor/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} +DATE=$(date -d "$DATE -1 week" +%Y-%m-%d) + if [ -f $NAME-$VERSION-$SHORT.tgz ]; then echo "$NAME-$VERSION-$SHORT.tgz already there" else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n" echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit1 + git checkout $COMMIT || exit 1 cp composer.json ../composer.json popd diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index 2e82286..0b4ef15 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2023-04-14 10:47:29.000000000 +0200 -+++ ./phpunit 2023-04-14 10:49:23.217236377 +0200 -@@ -71,29 +71,25 @@ if (isset($GLOBALS['_composer_autoload_p +--- ./phpunit.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./phpunit 2024-10-28 16:48:36.313661416 +0100 +@@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); unset($GLOBALS['_composer_autoload_path']); @@ -13,10 +13,10 @@ diff -up ./phpunit.rpm ./phpunit - break; - } - } -- + - unset($file); -} - +- -if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( - STDERR, @@ -34,9 +34,11 @@ diff -up ./phpunit.rpm ./phpunit } require PHPUNIT_COMPOSER_INSTALL; +@@ -101,4 +87,13 @@ if ([] !== $unavailableExtensions) { + + unset($requiredExtensions, $unavailableExtensions); -exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); -+ +if (class_exists('PHPUnit\\TextUI\\Application')) { + // PHPUnit v10 or newer + exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); @@ -47,10 +49,54 @@ diff -up ./phpunit.rpm ./phpunit + // PHPUnit v6 to v9 + PHPUnit\TextUI\Command::main(); +} +diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/Command/Commands/VersionCheckCommand.php +--- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-10-28 17:08:20.070934441 +0100 +@@ -39,7 +39,7 @@ final class VersionCheckCommand implemen + + assert($latestVersion !== false); + +- $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $this->majorVersionNumber); ++ $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=$this->majorVersionNumber); + + assert($latestCompatibleVersion !== false); + +@@ -48,11 +48,11 @@ final class VersionCheckCommand implemen + + if (!$notLatest && !$notLatestCompatible) { + return Result::from( +- 'You are using the latest version of PHPUnit.' . PHP_EOL, ++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL, + ); + } + +- $buffer = 'You are not using the latest version of PHPUnit.' . PHP_EOL; ++ $buffer = 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL; + + if ($notLatestCompatible) { + $buffer .= sprintf( +@@ -60,6 +60,7 @@ final class VersionCheckCommand implemen + $this->versionId, + $latestCompatibleVersion, + ); ++ $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); + } + + if ($notLatest) { +@@ -67,6 +68,9 @@ final class VersionCheckCommand implemen + 'The latest version is PHPUnit %s.' . PHP_EOL, + $latestVersion, + ); ++ if ($major !== ($new = (int)explode('.', $latestVersion)[0])) { ++ $buffer .= sprintf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); ++ } + } + + return Result::from($buffer); diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php ---- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2023-04-14 10:51:13.796036447 +0200 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2023-04-14 10:53:03.227838557 +0200 -@@ -48,6 +48,6 @@ final class SchemaFinder +--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-10-28 16:48:35.645635304 +0100 +@@ -77,6 +77,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -59,8 +105,8 @@ diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Config } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2023-04-14 10:47:29.000000000 +0200 -+++ ./tests/bootstrap.php 2023-04-14 10:49:23.217236377 +0200 +--- ./tests/bootstrap.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./tests/bootstrap.php 2024-10-28 16:48:36.312661377 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } @@ -90,3 +136,39 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php } if ($phar) { +diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php +--- ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php 2024-10-28 17:05:46.654936571 +0100 +@@ -28,15 +28,16 @@ final class VersionCheckCommandTest exte + { + return [ + [ +- 'You are using the latest version of PHPUnit.' . PHP_EOL, ++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL, + 10, + '10.5.0', + '10.5.0', + '10.5.0', + ], + [ +- 'You are not using the latest version of PHPUnit.' . PHP_EOL . ++ 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL . + 'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL . ++ 'Try a system update for new phpunit10 package.' . PHP_EOL . PHP_EOL . + 'The latest version is PHPUnit 10.5.1.' . PHP_EOL, + 10, + '10.5.0', +@@ -44,9 +45,11 @@ final class VersionCheckCommandTest exte + '10.5.1', + ], + [ +- 'You are not using the latest version of PHPUnit.' . PHP_EOL . ++ 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL . + 'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL . +- 'The latest version is PHPUnit 11.0.0.' . PHP_EOL, ++ 'Try a system update for new phpunit10 package.' . PHP_EOL . PHP_EOL . ++ 'The latest version is PHPUnit 11.0.0.' . PHP_EOL . ++ 'Try to install and use the phpunit11 command.' . PHP_EOL . PHP_EOL, + 10, + '10.5.0', + '11.0.0', diff --git a/phpunit10.spec b/phpunit10.spec index 833ad5e..2fbf480 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -1,9 +1,8 @@ # remirepo/fedora spec file for phpunit10 # -# Copyright (c) 2010-2023 Remi Collet -# -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -11,8 +10,14 @@ %bcond_without tests -%global gh_commit d442ce7c4104d5683c12e67e4dcb5058159e9804 -#global gh_date 20150927 +%if 0%{?fedora} == 39 || 0%{?fedora} == 40 +%bcond_without defcmd +%else +%bcond_with defcmd +%endif + +%global gh_commit c47fe00df06fb1f68399ef7386edb01c25132473 +%global gh_date 2025-12-01 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,9 +28,9 @@ %global ns_vendor PHPUnit10 %global php_home %{_datadir}/php %global ver_major 10 -%global ver_minor 3 +%global ver_minor 5 -%global upstream_version 10.3.1 +%global upstream_version 10.5.59 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -35,6 +40,7 @@ Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} +# run makesrc.sh to create a git snapshot with test suite Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh @@ -43,26 +49,25 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 -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(phpunit/php-code-coverage) >= 10.1.1 with php-composer(phpunit/php-code-coverage) < 11) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +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(phpunit/php-code-coverage) >= 10.1.15 with php-composer(phpunit/php-code-coverage) < 11) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.1.0 with php-composer(phpunit/php-file-iterator) < 5) BuildRequires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) -BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0.1 with php-composer(phpunit/php-text-template) < 4) BuildRequires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) -BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) +BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0.1 with php-composer(sebastian/cli-parser) < 3) BuildRequires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) -BuildRequires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -BuildRequires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) -BuildRequires: (php-composer(sebastian/exporter) >= 5.0 with php-composer(sebastian/exporter) < 6) -BuildRequires: (php-composer(sebastian/global-state) >= 6.0.1 with php-composer(sebastian/global-state) < 7) +BuildRequires: (php-composer(sebastian/comparator) >= 5.0.4 with php-composer(sebastian/comparator) < 6) +BuildRequires: (php-composer(sebastian/diff) >= 5.1.1 with php-composer(sebastian/diff) < 6) +BuildRequires: (php-composer(sebastian/environment) >= 6.1.0 with php-composer(sebastian/environment) < 7) +BuildRequires: (php-composer(sebastian/exporter) >= 5.1.4 with php-composer(sebastian/exporter) < 6) +BuildRequires: (php-composer(sebastian/global-state) >= 6.0.2 with php-composer(sebastian/global-state) < 7) BuildRequires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) -BuildRequires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) +BuildRequires: (php-composer(sebastian/recursion-context) >= 5.0.1 with php-composer(sebastian/recursion-context) < 6) BuildRequires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) -BuildRequires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +BuildRequires: (php-composer(sebastian/version) >= 4.0.1 with php-composer(sebastian/version) < 5) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-mbstring @@ -80,25 +85,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "myclabs/deep-copy": "^1.10.1", -# "phar-io/manifest": "^2.0.3", -# "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^10.1.1", -# "phpunit/php-file-iterator": "^4.0", -# "phpunit/php-invoker": "^4.0", -# "phpunit/php-text-template": "^3.0", -# "phpunit/php-timer": "^6.0", -# "sebastian/cli-parser": "^2.0", -# "sebastian/code-unit": "^2.0", -# "sebastian/comparator": "^5.0", -# "sebastian/diff": "^5.0", -# "sebastian/environment": "^6.0", -# "sebastian/exporter": "^5.0", -# "sebastian/global-state": "^6.0.1", -# "sebastian/object-enumerator": "^5.0", -# "sebastian/recursion-context": "^5.0", -# "sebastian/type": "^4.0", -# "sebastian/version": "^4.0" +# "myclabs/deep-copy": "^1.13.4", +# "phar-io/manifest": "^2.0.4", +# "phar-io/version": "^3.2.1", +# "phpunit/php-code-coverage": "^10.1.15", +# "phpunit/php-file-iterator": "^4.1.0", +# "phpunit/php-invoker": "^4.0.0", +# "phpunit/php-text-template": "^3.0.1", +# "phpunit/php-timer": "^6.0.0", +# "sebastian/cli-parser": "^2.0.1", +# "sebastian/code-unit": "^2.0.0", +# "sebastian/comparator": "^5.0.4", +# "sebastian/diff": "^5.1.1", +# "sebastian/environment": "^6.1.0", +# "sebastian/exporter": "^5.1.4", +# "sebastian/global-state": "^6.0.2", +# "sebastian/object-enumerator": "^5.0.0", +# "sebastian/recursion-context": "^5.0.1", +# "sebastian/type": "^4.0.0", +# "sebastian/version": "^4.0.1" Requires: php(language) >= 8.1 Requires: php-cli Requires: php-dom @@ -107,39 +112,42 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -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(phpunit/php-code-coverage) >= 10.1.1 with php-composer(phpunit/php-code-coverage) < 11) -Requires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +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(phpunit/php-code-coverage) >= 10.1.15 with php-composer(phpunit/php-code-coverage) < 11) +Requires: (php-composer(phpunit/php-file-iterator) >= 4.1.0 with php-composer(phpunit/php-file-iterator) < 5) Requires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) -Requires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +Requires: (php-composer(phpunit/php-text-template) >= 3.0.1 with php-composer(phpunit/php-text-template) < 4) Requires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) -Requires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) +Requires: (php-composer(sebastian/cli-parser) >= 2.0.1 with php-composer(sebastian/cli-parser) < 3) Requires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -Requires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) -Requires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -Requires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) -Requires: (php-composer(sebastian/exporter) >= 5.0 with php-composer(sebastian/exporter) < 6) -Requires: (php-composer(sebastian/global-state) >= 6.0.1 with php-composer(sebastian/global-state) < 7) +Requires: (php-composer(sebastian/comparator) >= 5.0.4 with php-composer(sebastian/comparator) < 6) +Requires: (php-composer(sebastian/diff) >= 5.1.1 with php-composer(sebastian/diff) < 6) +Requires: (php-composer(sebastian/environment) >= 6.1.0 with php-composer(sebastian/environment) < 7) +Requires: (php-composer(sebastian/exporter) >= 5.1.4 with php-composer(sebastian/exporter) < 6) +Requires: (php-composer(sebastian/global-state) >= 6.0.2 with php-composer(sebastian/global-state) < 7) Requires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) -Requires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) +Requires: (php-composer(sebastian/recursion-context) >= 5.0.1 with php-composer(sebastian/recursion-context) < 6) Requires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) -Requires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +Requires: (php-composer(sebastian/version) >= 4.0.1 with php-composer(sebastian/version) < 5) # From composer.json, "suggest": { # "ext-soap": "*", Suggests: php-soap # recommends latest versions -# none yet +Recommends: phpunit11 +Recommends: phpunit12 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 10.0.0 -Requires: php-reflection Requires: php-openssl Requires: php-pcntl -Requires: php-pcre Requires: php-phar -Requires: php-spl + +%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +Provides: php-composer(phpunit/phpunit) = %{version} +Provides: phpunit = %{version}-%{release} +%endif %description @@ -149,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.readthedocs.io/ +Documentation: https://phpunit.de/documentation.html %prep @@ -198,18 +206,19 @@ cat src/autoload.php %{_bindir}/phpab \ --output tests/autoload.php \ - --exclude 'tests/end-to-end/regression/4376/tests/Test.php' \ - --exclude 'tests/end-to-end/regression/2448/Test.php' \ - --exclude 'tests/*/_files/*.php' \ - tests + tests/_files cat << 'EOF' | tee -a tests/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ + __DIR__ . '/unit/Event/AbstractEventTestCase.php', + __DIR__ . '/unit/Framework/MockObject/TestDoubleTestCase.php', + __DIR__ . '/unit/Metadata/Parser/AnnotationParserTestCase.php', + __DIR__ . '/unit/Metadata/Parser/AttributeParserTestCase.php', __DIR__ . '/_files/CoverageNamespacedFunctionTest.php', __DIR__ . '/_files/CoveredFunction.php', + __DIR__ . '/_files/Generator.php', __DIR__ . '/_files/NamespaceCoveredFunction.php', __DIR__ . '/end-to-end/code-coverage/ignore-function-using-attribute/src/CoveredFunction.php', - __DIR__ . '/end-to-end/execution-order/_files/MultiDependencyTest.php', ]); EOF @@ -222,6 +231,10 @@ mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd +%if %{with defcmd} +ln -s %{name} %{buildroot}%{_bindir}/phpunit +%endif + %if %{with tests} %check @@ -231,7 +244,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; do +for cmd in php php81 php82 php83 php84 php85; do if which $cmd; then $cmd ./phpunit $OPT || ret=1 fi @@ -245,10 +258,205 @@ exit $ret %doc README.md ChangeLog-%{ver_major}.%{ver_minor}.md %doc composer.json %{_bindir}/%{name} +%if %{with defcmd} +%{_bindir}/phpunit +%endif %{php_home}/%{ns_vendor} %changelog +* Tue Dec 2 2025 Remi Collet - 10.5.59-1 +- update to 10.5.59 + +* Mon Sep 29 2025 Remi Collet - 10.5.58-1 +- update to 10.5.58 + +* Wed Sep 24 2025 Remi Collet - 10.5.57-1 +- update to 10.5.57 (no change) +- raise dependency on sebastian/exporter 5.1.4 + +* Mon Sep 15 2025 Remi Collet - 10.5.55-1 +- update to 10.5.55 +- raise dependency on sebastian/comparator 5.0.4 + +* Thu Sep 11 2025 Remi Collet - 10.5.54-1 +- update to 10.5.54 + +* Wed Aug 20 2025 Remi Collet - 10.5.53-1 +- update to 10.5.53 + +* Fri Jul 25 2025 Fedora Release Engineering - 10.5.48-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jul 11 2025 Remi Collet - 10.5.48-1 +- update to 10.5.48 +- raise dependency on myclabs/deep-copy 1.13.3 + +* Sat Jun 21 2025 Remi Collet - 10.5.47-1 +- update to 10.5.47 + +* Sun May 4 2025 Remi Collet - 10.5.46-1 +- update to 10.5.46 +- raise dependency on myclabs/deep-copy 1.13.1 + +* Fri Feb 7 2025 Remi Collet - 10.5.45-1 +- update to 10.5.45 + +* Fri Jan 31 2025 Remi Collet - 10.5.44-1 +- update to 10.5.44 + +* Wed Jan 29 2025 Remi Collet - 10.5.43-1 +- update to 10.5.43 + +* Wed Jan 29 2025 Remi Collet - 10.5.42-1 +- update to 10.5.42 + +* Sat Jan 18 2025 Fedora Release Engineering - 10.5.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jan 13 2025 Remi Collet - 10.5.41-1 +- update to 10.5.41 + +* Sun Dec 22 2024 Remi Collet - 10.5.40-1 +- update to 10.5.40 + +* Wed Dec 11 2024 Remi Collet - 10.5.39-1 +- update to 10.5.39 +- raise dependency on myclabs/deep-copy 1.12.1 +- re-license spec file to CECILL-2.1 + +* Mon Oct 28 2024 Remi Collet - 10.5.38-1 +- update to 10.5.38 + +* Mon Oct 21 2024 Remi Collet - 10.5.37-1 +- update to 10.5.37 +- raise dependency on sebastian/comparator 5.0.3 + +* Wed Oct 9 2024 Remi Collet - 10.5.36-1 +- update to 10.5.36 + +* Thu Sep 19 2024 Remi Collet - 10.5.35-1 +- update to 10.5.35 + +* Fri Sep 13 2024 Remi Collet - 10.5.34-1 +- update to 10.5.34 + +* Mon Sep 9 2024 Remi Collet - 10.5.33-1 +- update to 10.5.33 + +* Thu Sep 5 2024 Remi Collet - 10.5.32-1 +- update to 10.5.32 + +* Tue Sep 3 2024 Remi Collet - 10.5.31-1 +- update to 10.5.31 + +* Tue Aug 13 2024 Remi Collet - 10.5.30-1 +- update to 10.5.30 +- raise dependency on sebastian/comparator 5.0.2 + +* Tue Jul 30 2024 Remi Collet - 10.5.29-1 +- update to 10.5.29 + +* Fri Jul 19 2024 Remi Collet - 10.5.28-1 +- update to 10.5.28 + +* Thu Jul 11 2024 Remi Collet - 10.5.27-1 +- update to 10.5.27 (no change) +- raise dependencies + +* Mon Jul 8 2024 Remi Collet - 10.5.26-1 +- update to 10.5.26 + +* Wed Jul 3 2024 Remi Collet - 10.5.25-1 +- update to 10.5.25 (no change) + +* Tue Jul 2 2024 Remi Collet - 10.5.24-1 +- update to 10.5.24 + +* Wed Apr 24 2024 Remi Collet - 10.5.20-1 +- update to 10.5.20 + +* Thu Apr 18 2024 Remi Collet - 10.5.19-1 +- update to 10.5.19 + +* Mon Apr 15 2024 Remi Collet - 10.5.18-1 +- update to 10.5.18 + +* Fri Apr 5 2024 Remi Collet - 10.5.17-1 +- update to 10.5.17 + +* Thu Mar 28 2024 Remi Collet - 10.5.16-1 +- update to 10.5.16 + +* Fri Mar 22 2024 Remi Collet - 10.5.15-1 +- update to 10.5.15 + +* Thu Mar 21 2024 Remi Collet - 10.5.14-1 +- update to 10.5.14 + +* Wed Mar 13 2024 Remi Collet - 10.5.13-1 +- update to 10.5.13 + +* Sat Mar 9 2024 Remi Collet - 10.5.12-1 +- update to 10.5.12 + +* Mon Feb 26 2024 Remi Collet - 10.5.11-1 +- update to 10.5.11 + +* Mon Feb 5 2024 Remi Collet - 10.5.10-1 +- update to 10.5.10 + +* Tue Jan 23 2024 Remi Collet - 10.5.9-1 +- update to 10.5.9 + +* Sun Jan 21 2024 Fedora Release Engineering - 10.5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Remi Collet - 10.5.8-1 +- update to 10.5.8 + +* Mon Jan 15 2024 Remi Collet - 10.5.7-1 +- update to 10.5.7 + +* Thu Dec 28 2023 Remi Collet - 10.5.5-1 +- update to 10.5.5 + +* Wed Dec 13 2023 Remi Collet - 10.5.3-1 +- update to 10.5.3 + +* Wed Dec 6 2023 Remi Collet - 10.5.2-1 +- update to 10.5.2 + +* Sat Dec 2 2023 Remi Collet - 10.5.1-1 +- update to 10.5.1 + +* Fri Dec 1 2023 Remi Collet - 10.5.0-1 +- update to 10.5.0 +- provide phpunit command + +* Thu Oct 26 2023 Remi Collet - 10.4.2-1 +- update to 10.4.2 + +* Sun Oct 8 2023 Remi Collet - 10.4.1-1 +- update to 10.4.1 + +* Fri Oct 6 2023 Remi Collet - 10.4.0-1 +- update to 10.4.0 + +* Tue Sep 19 2023 Remi Collet - 10.3.5-1 +- update to 10.3.5 +- raise dependency on sebastian/exporter 5 + +* Wed Sep 13 2023 Remi Collet - 10.3.4-1 +- update to 10.3.4 +- raise dependency on phpunit/php-code-coverage 10.1.5 + +* Tue Sep 5 2023 Remi Collet - 10.3.3-1 +- update to 10.3.3 + +* Fri Aug 18 2023 Remi Collet - 10.3.2-1 +- update to 10.3.2 + * Fri Aug 4 2023 Remi Collet - 10.3.1-1 - update to 10.3.1 diff --git a/sources b/sources index 19b0e96..ab6ada8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.3.1-d442ce7.tgz) = f1a7f77baef4ad4b20192b2397af4d3fee4ed9be9dfb2710ce8975ad2e51c822e85e7ca5f7bd211bc97de65b56762547a0d62d25f228a886d72a6261b4440003 +SHA512 (phpunit10-10.5.59-c47fe00.tgz) = 5d10a528b224c59760c8a5d9493ce84d460d8123839c6622d6c5afa613554016b4d7a603d0fa9f2560df9d01f5c004c3d7a97e17d48e63702a31ca5db9cffe43