diff options
| -rw-r--r-- | composer.json | 40 | ||||
| -rwxr-xr-x | makesrc.sh | 11 | ||||
| -rw-r--r-- | phpunit8-rpm.patch | 62 | ||||
| -rw-r--r-- | phpunit8.spec | 230 |
4 files changed, 201 insertions, 142 deletions
diff --git a/composer.json b/composer.json index 8bcd2a9..972b346 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ } ], "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues" + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy" }, "prefer-stable": true, "require": { @@ -28,35 +29,36 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "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.12", - "phpunit/php-file-iterator": "^2.0.4", + "doctrine/instantiator": "^1.5.0", + "myclabs/deep-copy": "^1.13.1", + "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", "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.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", + "phpunit/php-timer": "^2.1.4", + "sebastian/comparator": "^3.0.5", + "sebastian/diff": "^3.0.6", + "sebastian/environment": "^4.2.5", + "sebastian/exporter": "^3.1.6", + "sebastian/global-state": "^3.0.5", + "sebastian/object-enumerator": "^3.0.5", + "sebastian/resource-operations": "^2.0.3", + "sebastian/type": "^1.1.5", "sebastian/version": "^2.0.1" }, "config": { "platform": { "php": "7.2.0" }, + "classmap-authoritative": true, "optimize-autoloader": true, "sort-packages": true }, "suggest": { - "phpunit/php-invoker": "^2.0.0", - "ext-soap": "*", - "ext-xdebug": "*" + "phpunit/php-invoker": "To allow enforcing time limits", + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -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/phpunit8-rpm.patch b/phpunit8-rpm.patch index 2fe8780..07bbbb6 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-12-30 08:58:05.000000000 +0100 -+++ ./phpunit 2021-12-30 09:01:08.095425016 +0100 +--- ./phpunit.rpm 2024-03-06 09:33:13.000000000 +0100 ++++ ./phpunit 2024-04-05 08:00:14.044636630 +0200 @@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -33,20 +33,60 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -95,4 +79,8 @@ unset($options); +@@ -95,4 +79,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/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 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 +--- ./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 private function validateConfigurationAgainstSchema(): void { $original = libxml_use_internal_errors(true); @@ -56,8 +96,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 2021-12-30 08:58:05.000000000 +0100 -+++ ./tests/bootstrap.php 2021-12-30 08:58:11.290733945 +0100 +--- ./tests/bootstrap.php.rpm 2024-03-06 09:33:13.000000000 +0100 ++++ ./tests/bootstrap.php 2024-04-05 08:00:14.044636630 +0200 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit8.spec b/phpunit8.spec index 263a200..684e603 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,18 +1,18 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2022 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 # +# remirepo:2 # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e8c563c47a9a303662955518ca532b022b337f4d -#global gh_date 20150927 +%global gh_commit 3a68a70824da546d26ac08ca4fced67341f4158f +%global gh_date 2025-05-02 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -25,7 +25,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.29 +%global upstream_version 8.5.42 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -33,7 +33,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh @@ -43,49 +43,25 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) +BuildRequires: (php-composer(myclabs/deep-copy) >= 1.13.1 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.10.3 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3) +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-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) -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.2 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(phpunit/php-timer) >= 2.1.4 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.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.6 with php-composer(sebastian/exporter) < 4) +BuildRequires: (php-composer(sebastian/global-state) >= 3.0.5 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(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) +BuildRequires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) -# remirepo:21 -%else -BuildRequires: php-doctrine-instantiator >= 1.3.1 -BuildRequires: php-myclabs-deep-copy >= 1.10.0 -BuildRequires: php-phar-io-manifest2 >= 2.0.3 -BuildRequires: php-phar-io-version3 >= 3.0.2 -BuildRequires: php-phpspec-prophecy >= 1.10.3 -BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.12 -BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.4 -BuildRequires: php-phpunit-Text-Template >= 1.2.1 -BuildRequires: php-phpunit-php-timer2 >= 2.1.2 -BuildRequires: php-sebastian-comparator3 >= 3.0.2 -BuildRequires: php-sebastian-diff3 >= 3.0.2 -BuildRequires: php-sebastian-environment4 >= 4.2.3 -BuildRequires: php-sebastian-exporter3 >= 3.1.2 -BuildRequires: php-sebastian-global-state3 -BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3 -BuildRequires: php-sebastian-resource-operations2 >= 2.0.1 -BuildRequires: php-sebastian-type >= 1.1.3 -BuildRequires: php-phpunit-Version >= 2.0.1 -BuildRequires: php-phpunit-php-invoker2 -%endif BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-mbstring @@ -103,21 +79,21 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "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", +# "doctrine/instantiator": "^1.5.0", +# "myclabs/deep-copy": "^1.13.1", +# "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", # "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.3", -# "sebastian/exporter": "^3.1.2", -# "sebastian/global-state": "^3.0.0", -# "sebastian/object-enumerator": "^3.0.3", -# "sebastian/resource-operations": "^2.0.1", +# "phpunit/php-timer": "^2.1.4", +# "sebastian/comparator": "^3.0.5", +# "sebastian/diff": "^3.0.6", +# "sebastian/environment": "^4.2.5", +# "sebastian/exporter": "^3.1.6", +# "sebastian/global-state": "^3.0.5", +# "sebastian/object-enumerator": "^3.0.5", +# "sebastian/resource-operations": "^2.0.3", # "sebastian/type": "^1.1.3", # "sebastian/version": "^2.0.1", Requires: php(language) >= 7.2 @@ -128,25 +104,23 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) +Requires: (php-composer(myclabs/deep-copy) >= 1.13.1 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.10.3 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3) +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-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) -Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) -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.2 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(phpunit/php-timer) >= 2.1.4 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.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.6 with php-composer(sebastian/exporter) < 4) +Requires: (php-composer(sebastian/global-state) >= 3.0.5 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(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) # From composer.json, "suggest": { # "phpunit/php-invoker": "^2.0.0", @@ -155,37 +129,21 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-c Requires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) Suggests: php-soap Suggests: php-xdebug -# remirepo:21 -%else -Requires: php-doctrine-instantiator >= 1.3.1 -Requires: php-myclabs-deep-copy >= 1.10.0 -Requires: php-phar-io-manifest2 >= 2.0.3 -Requires: php-phar-io-version3 >= 3.0.2 -Requires: php-phpspec-prophecy >= 1.10.3 -Requires: php-phpunit-php-code-coverage7 >= 7.0.12 -Requires: php-phpunit-php-file-iterator2 >= 2.0.4 -Requires: php-phpunit-Text-Template >= 1.2.1 -Requires: php-phpunit-php-timer2 >= 2.1.2 -Requires: php-sebastian-comparator3 >= 3.0.2 -Requires: php-sebastian-diff3 >= 3.0.2 -Requires: php-sebastian-environment4 >= 4.2.3 -Requires: php-sebastian-exporter3 >= 3.1.2 -Requires: php-sebastian-global-state3 -Requires: php-sebastian-object-enumerator3 >= 3.0.3 -Requires: php-sebastian-resource-operations2 >= 2.0.1 -Requires: php-sebastian-type >= 1.1.3 -Requires: php-phpunit-Version >= 2.0.1 -Requires: php-phpunit-php-invoker2 -%endif +# recommends latest versions +Recommends: phpunit9 +Recommends: phpunit10 +Recommends: phpunit11 # 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 @@ -195,12 +153,14 @@ 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 %build @@ -216,7 +176,6 @@ 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', @@ -231,6 +190,8 @@ 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( @@ -263,7 +224,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 php74 php80 php81 php82; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -272,8 +233,6 @@ exit $ret %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md ChangeLog-%{ver_major}.%{ver_minor}.md %doc composer.json @@ -282,6 +241,59 @@ exit $ret %changelog +* Sun May 4 2025 Remi Collet <remi@remirepo.net> - 8.5.42-1 +- update to 8.5.42 +- raise dependency on myclabs/deep-copy 1.13.1 + +* Thu Dec 5 2024 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 8.5.40-1 +- update to 8.5.40 + +* Thu Jul 11 2024 Remi Collet <remi@remirepo.net> - 8.5.39-1 +- update to 8.5.39 (no change) +- raise dependencies + +* Fri Apr 5 2024 Remi Collet <remi@remirepo.net> - 8.5.38-1 +- update to 8.5.38 (no change) + +* Wed Mar 6 2024 Remi Collet <remi@remirepo.net> - 8.5.37-2 +- improve --check-version for RPM + +* Wed Mar 6 2024 Remi Collet <remi@remirepo.net> - 8.5.37-1 +- update to 8.5.37 + +* Fri Dec 22 2023 Remi Collet <remi@remirepo.net> - 8.5.36-2 +- fix possible autoloader issue with phpspec/prophecy + +* Sat Dec 2 2023 Remi Collet <remi@remirepo.net> - 8.5.36-1 +- update to 8.5.36 (no change) + +* Fri Dec 1 2023 Remi Collet <remi@remirepo.net> - 8.5.35-1 +- update to 8.5.35 (no change) + +* Tue Sep 19 2023 Remi Collet <remi@remirepo.net> - 8.5.34-1 +- update to 8.5.34 + +* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 8.5.33-1 +- update to 8.5.33 + +* Sat Feb 4 2023 Remi Collet <remi@remirepo.net> - 8.5.32-2 +- adapt launcher for phpunit10 + +* Thu Jan 26 2023 Remi Collet <remi@remirepo.net> - 8.5.32-1 +- update to 8.5.32 + +* Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 8.5.31-1 +- update to 8.5.31 + +* Sun Sep 25 2022 Remi Collet <remi@remirepo.net> - 8.5.30-1 +- update to 8.5.30 +- raise dependency on sebastian/comparator 3.0.2 +- raise dependency on sebastian/exporter 3.1.5 + * Tue Aug 30 2022 Remi Collet <remi@remirepo.net> - 8.5.29-1 - update to 8.5.29 - keep dependency on phpspec/prophecy (optional) |