diff --git a/.gitignore b/.gitignore index 2583c85..1f7de30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,66 @@ /phpunit9-9.0.1-68d7e5b.tar.gz +/phpunit9-9.0.2-c0ecbfb.tar.gz +/phpunit9-9.1.3-a747804.tar.gz +/phpunit9-9.1.4-2d7080c.tar.gz +/phpunit9-9.1.5-1b570cd.tgz +/phpunit9-9.2.5-ad7cc5e.tgz +/phpunit9-9.2.6-1c6a9e4.tgz +/phpunit9-9.3.8-93d78d8.tgz +/phpunit9-9.3.10-919333f.tgz +/phpunit9-9.3.11-f7316ea.tgz +/phpunit9-9.4.0-ef53346.tgz +/phpunit9-9.4.1-1f09a12.tgz +/phpunit9-9.4.2-3866b2e.tgz +/phpunit9-9.4.3-9fa359f.tgz +/phpunit9-9.4.4-6535e63.tgz +/phpunit9-9.5.0-8e16c22.tgz +/phpunit9-9.5.2-f661659.tgz +/phpunit9-9.5.3-27241ac.tgz +/phpunit9-9.5.4-c73c673.tgz +/phpunit9-9.5.5-89ff45e.tgz +/phpunit9-9.5.6-fb9b833.tgz +/phpunit9-9.5.7-d0dc8b6.tgz +/phpunit9-9.5.8-191768c.tgz +/phpunit9-9.5.9-ea8c2df.tgz +/phpunit9-9.5.10-c814a05.tgz +/phpunit9-9.5.11-2406855.tgz +/phpunit9-9.5.12-93d4bf4.tgz +/phpunit9-9.5.13-597cb64.tgz +/phpunit9-9.5.14-1883687.tgz +/phpunit9-9.5.15-dc73838.tgz +/phpunit9-9.5.16-5ff8c54.tgz +/phpunit9-9.5.17-5c5abcf.tgz +/phpunit9-9.5.18-1b58560.tgz +/phpunit9-9.5.21-0e32b76.tgz +/phpunit9-9.5.24-d0aa609.tgz +/phpunit9-9.5.25-3e6f90c.tgz +/phpunit9-9.5.26-851867e.tgz +/phpunit9-9.5.27-a2bc7ff.tgz +/phpunit9-9.5.28-954ca31.tgz +/phpunit9-9.6.0-70fc8be.tgz +/phpunit9-9.6.3-e7b1615.tgz +/phpunit9-9.6.4-9125ee0.tgz +/phpunit9-9.6.5-86e7619.tgz +/phpunit9-9.6.6-b65d59a.tgz +/phpunit9-9.6.7-c993f0d.tgz +/phpunit9-9.6.8-17d621b.tgz +/phpunit9-9.6.9-a9aceaf.tgz +/phpunit9-9.6.10-a6d3516.tgz +/phpunit9-9.6.11-810500e.tgz +/phpunit9-9.6.12-a122c2e.tgz +/phpunit9-9.6.13-f3d767f.tgz +/phpunit9-9.6.14-43653e6.tgz +/phpunit9-9.6.15-05017b8.tgz +/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/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..c85b319 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,35 @@ +#!/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) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +DATE=$(date -d "$DATE -4 days" +%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, Date=$DATE\n" + + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 + + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + popd + + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + + echo "Done." +fi diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 62091a4..7e082fe 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,19 +1,24 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-02-07 07:56:17.000000000 +0100 -+++ ./phpunit 2020-02-07 16:20:53.817753399 +0100 -@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } +--- ./phpunit.rpm 2024-03-21 13:50:22.000000000 +0100 ++++ ./phpunit 2024-03-21 13:59:15.659377103 +0100 +@@ -71,27 +71,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,47 +29,99 @@ 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/PHPUnit9/autoload.php'); } $options = getopt('', array('prepend:')); -@@ -58,4 +45,8 @@ unset($options); +@@ -104,4 +88,13 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; -PHPUnit\TextUI\Command::main(); -+if (class_exists('PHPUnit_TextUI_Command')) { -+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older ++if (class_exists('PHPUnit\\TextUI\\Application')) { ++ // PHPUnit v10 or newer ++ exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); ++} else if (class_exists('PHPUnit_TextUI_Command')) { ++ // PHPUnit v5 or older ++ PHPUnit_TextUI_Command::main(); +} else { -+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer ++ // PHPUnit v6 to v9 ++ PHPUnit\TextUI\Command::main(); +} -diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Loader.php ---- ./src/TextUI/Configuration/Loader.php.rpm 2020-02-07 07:56:17.000000000 +0100 -+++ ./src/TextUI/Configuration/Loader.php 2020-02-07 16:20:53.818753394 +0100 -@@ -194,7 +194,7 @@ final class Loader - private function validate(\DOMDocument $document): array - { - $original = \libxml_use_internal_errors(true); -- $xsdFilename = __DIR__ . '/../../../phpunit.xsd'; -+ $xsdFilename = __DIR__ . '/../../phpunit.xsd'; +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 + $this->printVersionString(); - if (\defined('__PHPUNIT_PHAR_ROOT__')) { - $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; + $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; + } +@@ -618,6 +618,7 @@ class Command + Version::id(), + $latestCompatibleVersion, + ); ++ printf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); + } + + if ($notLatest) { +@@ -625,6 +626,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/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 +@@ -75,6 +75,6 @@ final class SchemaFinder + return __PHPUNIT_PHAR_ROOT__ . '/'; + } + +- return __DIR__ . '/../../../'; ++ return __DIR__ . '/../../'; + } + } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-02-07 16:21:18.097630840 +0100 -+++ ./tests/bootstrap.php 2020-02-07 16:22:12.237357522 +0100 -@@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) { - \ini_set('precision', '14'); - \ini_set('serialize_precision', '14'); +--- ./tests/bootstrap.php.rpm 2024-03-21 13:50:22.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-21 13:59:15.659377103 +0100 +@@ -9,8 +9,8 @@ + */ + const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; --require_once __DIR__ . '/../vendor/autoload.php'; -+require_once '@PATH@/autoload.php'; -+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; -+require_once __DIR__ . '/_files/CoveredFunction.php'; -+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; -+require_once __DIR__ . '/autoload.php'; +-$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,14 @@ 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 __DIR__ . '/autoload.php'; + } + + if ($phar) { diff --git a/phpunit9.spec b/phpunit9.spec index c922b58..d0a6635 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,20 +1,17 @@ # remirepo/fedora spec file for phpunit9 # -# Copyright (c) 2010-2020 Remi Collet -# -# License: CC-BY-SA -# 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 # -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit 68d7e5b17a6b9461e17c00446caa409863154f76 -#global gh_date 20150927 +%global gh_commit b69489b312503bf8fa6d75a76916919d7d2fa6d4 +%global gh_date 2025-12-01 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_vendor sebastianbergmann +%global gh_owner sebastianbergmann %global gh_project phpunit # Packagist %global pk_vendor phpunit @@ -23,43 +20,47 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 0 -%global ver_patch 1 -%global specrel 1 +%global ver_minor 6 + +%global upstream_version 9.6.30 +#global upstream_prever dev Name: %{pk_project}%{ver_major} -Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} -License: BSD -URL: https://github.com/%{gh_vendor}/%{gh_project} -Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +License: BSD-3-Clause +URL: https://github.com/%{gh_owner}/%{gh_project} +Source0: %{name}-%{upstream_version}-%{gh_short}.tgz +Source1: makesrc.sh # Fix command for autoload Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2) -BuildRequires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3) -BuildRequires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) -BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4) -BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3) -BuildRequires: (php-composer(phpunit/php-timer) >= 3.0 with php-composer(phpunit/php-timer) < 4) -BuildRequires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5) -BuildRequires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5) -BuildRequires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5) -BuildRequires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5) -BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4) -BuildRequires: (php-composer(sebastian/type) >= 2.0 with php-composer(sebastian/type) < 3) -BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) +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(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-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(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-mbstring @@ -70,31 +71,33 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": "^7.3", +# "php": ">=7.3", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.2.0", -# "myclabs/deep-copy": "^1.9.1", -# "phar-io/manifest": "^1.0.3", -# "phar-io/version": "^2.0.1", -# "phpspec/prophecy": "^1.8.1", -# "phpunit/php-code-coverage": "^7.0.7", -# "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-text-template": "^1.2.1", -# "phpunit/php-timer": "^2.1.2", -# "sebastian/comparator": "^3.0.2", -# "sebastian/diff": "^3.0.2", -# "sebastian/environment": "^4.2.2", -# "sebastian/exporter": "^3.1.1", -# "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", +# "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", +# "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", +# "sebastian/version": "^3.0.2" Requires: php(language) >= 7.3 Requires: php-cli Requires: php-dom @@ -103,39 +106,47 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -Requires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2) -Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2) -Requires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3) -Requires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9) -Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) -Requires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4) -Requires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3) -Requires: (php-composer(phpunit/php-timer) >= 3.0 with php-composer(phpunit/php-timer) < 4) -Requires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5) -Requires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5) -Requires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5) -Requires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) -Requires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5) -Requires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4) -Requires: (php-composer(sebastian/type) >= 2.0 with php-composer(sebastian/type) < 3) -Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) +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(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-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(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { # "ext-soap": "*", # "ext-xdebug": "*" Suggests: php-soap Suggests: php-xdebug +# recommends latest versions +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 -Requires: php-spl + +%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +Provides: php-composer(phpunit/phpunit) = %{version} +Provides: phpunit = %{version}-%{release} +%endif %description @@ -145,12 +156,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.readthedocs.io/ +Documentation: https://phpunit.de/documentation.html %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm find . -name \*.rpm -delete -print @@ -163,49 +174,60 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies +if (PHP_VERSION_ID > 80100) { + $inst = [ + '%{php_home}/Doctrine/Instantiator2/autoload.php', + '%{php_home}/Doctrine/Instantiator/autoload.php', + ]; +} else { + $inst = '%{php_home}/Doctrine/Instantiator/autoload.php'; +} \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage8/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage9/autoload.php', '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', '%{php_home}/SebastianBergmann/Template2/autoload.php', - '%{php_home}/SebastianBergmann/Timer3/autoload.php', - '%{php_home}/Prophecy/autoload.php', + '%{php_home}/SebastianBergmann/Timer5/autoload.php', + $inst, + '%{php_home}/SebastianBergmann/CliParser/autoload.php', + '%{php_home}/SebastianBergmann/CodeUnit/autoload.php', '%{php_home}/SebastianBergmann/Invoker3/autoload.php', '%{php_home}/SebastianBergmann/Diff4/autoload.php', '%{php_home}/SebastianBergmann/Comparator4/autoload.php', '%{php_home}/SebastianBergmann/Environment5/autoload.php', '%{php_home}/SebastianBergmann/Exporter4/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState4/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState5/autoload.php', '%{php_home}/SebastianBergmann/ObjectEnumerator4/autoload.php', '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', - '%{php_home}/SebastianBergmann/Type2/autoload.php', + '%{php_home}/SebastianBergmann/Type3/autoload.php', '%{php_home}/SebastianBergmann/Version3/autoload.php', - [ - '%{php_home}/Doctrine/Instantiator11/autoload.php', - '%{php_home}/Doctrine/Instantiator/autoload.php', - ], - [ - '%{php_home}/DeepCopy19/autoload.php', - '%{php_home}/DeepCopy/autoload.php', - ], - '%{php_home}/PharIo/Manifest/autoload.php', - '%{php_home}/PharIo/Version/autoload.php', + '%{php_home}/DeepCopy/autoload.php', + '%{php_home}/PharIo/Manifest2/autoload.php', + '%{php_home}/PharIo/Version3/autoload.php', __DIR__ . '/Framework/Assert/Functions.php', + // May load Comparator/RecursionContext bad version + '%{php_home}/Prophecy/autoload.php', ]); +// Extensions +\Fedora\Autoloader\Dependencies::optional( + glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php") +); EOF cat src/autoload.php %{_bindir}/phpab \ --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/4376/tests/Test.php' \ + --exclude 'tests/end-to-end/regression/2448/Test.php' \ + --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ + --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.php' \ tests %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} +cp -pr schema %{buildroot}%{php_home}/%{ns_vendor}/schema +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 @@ -217,7 +239,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 php73 php74; do +for cmd in php php81 php82 php83 php84 php85; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -234,6 +256,275 @@ 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 + +* Wed Sep 13 2023 Remi Collet - 9.6.12-1 +- update to 9.6.12 +- raise dependency on phpunit/php-code-coverage 9.2.28 + +* 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 + +* Mon Jun 12 2023 Remi Collet - 9.6.9-1 +- update to 9.6.9 + +* Thu May 11 2023 Remi Collet - 9.6.8-1 +- update to 9.6.8 + +* Fri Apr 14 2023 Remi Collet - 9.6.7-1 +- update to 9.6.7 + +* Mon Mar 27 2023 Remi Collet - 9.6.6-1 +- update to 9.6.6 + +* Thu Mar 9 2023 Remi Collet - 9.6.5-1 +- update to 9.6.5 + +* Tue Feb 28 2023 Remi Collet - 9.6.4-1 +- update to 9.6.4 + +* Mon Feb 6 2023 Remi Collet - 9.6.3-1 +- update to 9.6.3 + +* Fri Feb 3 2023 Remi Collet - 9.6.0-1 +- update to 9.6.0 + +* Fri Jan 20 2023 Fedora Release Engineering - 9.5.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Remi Collet - 9.5.28-1 +- update to 9.5.28 +- allow doctrine/instantiator v2 + +* Fri Dec 9 2022 Remi Collet - 9.5.27-1 +- update to 9.5.27 + +* Fri Oct 28 2022 Remi Collet - 9.5.26-1 +- update to 9.5.26 + +* Sun Sep 25 2022 Remi Collet - 9.5.25-1 +- update to 9.5.25 +- raise dependency on sebastian/comparator 4.0.8 +- raise dependency on sebastian/exporter 4.0.5 +- raise dependency on sebastian/type 3.2 + +* Thu Sep 1 2022 Remi Collet - 9.5.24-1 +- update to 9.5.24 +- raise dependency on sebastian/type 3.1 + +* Fri Jul 22 2022 Fedora Release Engineering - 9.5.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 20 2022 Remi Collet - 9.5.21-1 +- update to 9.5.21 +- raise dependency on sebastian/type 3.0 + +* Tue Mar 8 2022 Remi Collet - 9.5.18-1 +- update to 9.5.18 + +* Sun Mar 6 2022 Remi Collet - 9.5.17-1 +- update to 9.5.17 #StandWithUkraine + +* Thu Feb 24 2022 Remi Collet - 9.5.16-1 +- update to 9.5.16 +- raise dependency on phpunit/php-code-coverage 9.2.13 + +* Wed Feb 23 2022 Remi Collet - 9.5.15-1 +- update to 9.5.15 +- raise dependency on phpunit/php-code-coverage 9.2.12 + +* Fri Feb 18 2022 Remi Collet - 9.5.14-1 +- update to 9.5.14 + +* Mon Jan 24 2022 Remi Collet - 9.5.13-1 +- update to 9.5.13 + +* Fri Jan 21 2022 Remi Collet - 9.5.12-1 +- update to 9.5.12 + +* Thu Dec 30 2021 Remi Collet - 9.5.11-1 +- update to 9.5.11 + +* Mon Sep 27 2021 Remi Collet - 9.5.10-1 +- update to 9.5.10 +- raise dependency on phpunit/php-code-coverage 9.2.7 + +* Wed Sep 1 2021 Remi Collet - 9.5.9-1 +- update to 9.5.9 + +* Mon Aug 2 2021 Remi Collet - 9.5.8-1 +- update to 9.5.8 +- raise dependency on phar-io/manifest 2.0.3 + +* Fri Jul 23 2021 Fedora Release Engineering - 9.5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 19 2021 Remi Collet - 9.5.7-1 +- update to 9.5.7 + +* Wed Jun 23 2021 Remi Collet - 9.5.6-1 +- update to 9.5.6 + +* Mon Jun 7 2021 Remi Collet - 9.5.5-1 +- update to 9.5.5 +- raise dependency on sebastian/type 2.3.2 + +* Tue Mar 23 2021 Remi Collet - 9.5.4-1 +- update to 9.5.4 + +* Wed Mar 17 2021 Remi Collet - 9.5.3-1 +- update to 9.5.3 + +* Wed Feb 3 2021 Remi Collet - 9.5.2-1 +- update to 9.5.2 + +* Wed Jan 27 2021 Fedora Release Engineering - 9.5.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 4 2020 Remi Collet - 9.5.0-1 +- update to 9.5.0 +- raise dependency on phpunit/php-code-coverage 9.2.3 + +* Tue Dec 1 2020 Remi Collet - 9.4.4-1 +- update to 9.4.4 + +* Tue Nov 10 2020 Remi Collet - 9.4.3-1 +- update to 9.4.3 + +* Mon Oct 19 2020 Remi Collet - 9.4.2-1 +- update to 9.4.2 + +* Mon Oct 12 2020 Remi Collet - 9.4.1-1 +- update to 9.4.1 + +* Fri Oct 2 2020 Remi Collet - 9.4.0-1 +- update to 9.4.0 +- raise dependency on phpunit/php-code-coverage 9.2 + +* Thu Sep 24 2020 Remi Collet - 9.3.11-1 +- update to 9.3.11 (no change) +- raise dependency on phpunit/php-code-coverage 9.1.11 + +* Sun Sep 13 2020 Remi Collet - 9.3.10-1 +- update to 9.3.10 + +* Thu Aug 27 2020 Remi Collet - 9.3.8-1 +- update to 9.3.8 +- add dependency on sebastian/cli-parser +- raise dependency on phpunit/php-code-coverage 9.1.5 +- raise dependency on myclabs/deep-copy 1.10.1 +- raise dependency on phar-io/manifest 2.0.1 +- raise dependency on phar-io/version 3.0.2 +- raise dependency on phpspec/prophecy 1.11.1 +- raise dependency on phpunit/php-file-iterator 3.0.4 +- raise dependency on phpunit/php-invoker 3.1 +- raise dependency on sebastian/diff 4.0.2 +- raise dependency on sebastian/global-state 5.0 +- raise dependency on sebastian/type 2.2.1 + +* Tue Jul 28 2020 Fedora Release Engineering - 9.2.6-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Remi Collet - 9.2.6-1 +- update to 9.2.6 +- raise dependency on latest minor version available + for all libraries + +* Mon Jun 22 2020 Remi Collet - 9.2.5-1 +- update to 9.2.5 +- raise dependency on phpunit/php-timer 5.0 +- raise dependency on sebastian/type 2.1 + +* Sat May 23 2020 Remi Collet - 9.1.5-1 +- update to 9.1.5 +- sources from git snapshot + +* Thu Apr 30 2020 Remi Collet - 9.1.4-1 +- update to 9.1.4 +- raise dependency on sebastian/code-unit 1.0.2 + +* Thu Apr 23 2020 Remi Collet - 9.1.3-1 +- update to 9.1.3 +- raise dependency on phpunit/php-timer 3.1.4 +- add dependency on sebastian/code-unit + +* Tue Mar 31 2020 Remi Collet - 9.0.2-1 +- update to 9.0.2 +- own /usr/share/php/PHPUnit9/Extensions +- raise dependency on phpunit/php-code-coverage 8.0.1 +- raise dependency on sebastian/environment 5.0.1 + * Fri Feb 14 2020 Remi Collet - 9.0.1-1 - update to 9.0.1 diff --git a/sources b/sources index dd847f2..775c187 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.0.1-68d7e5b.tar.gz) = da752e2cb9e6bc27afee7ff1d0cb2c45f587e6e60a7905ea308a19691b422ab3419cb761f271e2b127943b2e456df9ac3c64bc9cb427be40fe301d4609e4295e +SHA512 (phpunit9-9.6.30-b69489b.tgz) = 5609599ea75cb7c455c12137acc26e20e940b81c75d8a9033c32fb6ea7ff6ddeb0bead70f801aa75d7b75033cc9c67f7eeca6be83c672222f0445cc940ab6037