diff --git a/.gitignore b/.gitignore index 3ee7c98..f000b96 100644 --- a/.gitignore +++ b/.gitignore @@ -3,41 +3,3 @@ clog /phpunit8-8.5.5-63dda3b.tgz /phpunit8-8.5.6-3f9c407.tgz /phpunit8-8.5.8-34c18ba.tgz -/phpunit8-8.5.9-f5c8a5d.tgz -/phpunit8-8.5.11-3123601.tgz -/phpunit8-8.5.12-f40cf5b.tgz -/phpunit8-8.5.13-8e86be3.tgz -/phpunit8-8.5.14-c25f798.tgz -/phpunit8-8.5.15-038d419.tgz -/phpunit8-8.5.16-cc66f2f.tgz -/phpunit8-8.5.17-7906785.tgz -/phpunit8-8.5.18-bd5fc77.tgz -/phpunit8-8.5.19-496281b.tgz -/phpunit8-8.5.20-9deefba.tgz -/phpunit8-8.5.21-50a58a6.tgz -/phpunit8-8.5.22-ddd05b9.tgz -/phpunit8-8.5.23-efb20ff.tgz -/phpunit8-8.5.24-293cb00.tgz -/phpunit8-8.5.25-9ff23f4.tgz -/phpunit8-8.5.26-ef117c5.tgz -/phpunit8-8.5.27-df70070.tgz -/phpunit8-8.5.28-8f2d1c9.tgz -/phpunit8-8.5.29-e8c563c.tgz -/phpunit8-8.5.30-4fd448d.tgz -/phpunit8-8.5.31-33c126b.tgz -/phpunit8-8.5.32-3756869.tgz -/phpunit8-8.5.33-7d1ff0e.tgz -/phpunit8-8.5.34-622d018.tgz -/phpunit8-8.5.35-c14b7dc.tgz -/phpunit8-8.5.36-9652df5.tgz -/phpunit8-8.5.37-fce30f3.tgz -/phpunit8-8.5.38-1ecad67.tgz -/phpunit8-8.5.39-172ba97.tgz -/phpunit8-8.5.40-48ed828.tgz -/phpunit8-8.5.41-d843cb5.tgz -/phpunit8-8.5.42-3a68a70.tgz -/phpunit8-8.5.44-e1d7ab6.tgz -/phpunit8-8.5.45-5a69265.tgz -/phpunit8-8.5.46-2da51ff.tgz -/phpunit8-8.5.48-75f469c.tgz -/phpunit8-8.5.49-2605ccb.tgz diff --git a/makesrc.sh b/makesrc.sh index 3580b58..8152336 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,32 +1,28 @@ #!/bin/bash NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +OWNER=$(sed -n '/^%global gh_vendor/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} -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\n" - echo "Cloning..." - rm -rf $PROJECT-$COMMIT - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - echo "Getting commit..." - pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit1 - cp composer.json ../composer.json - popd +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd - echo "Archiving..." - tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT - echo "Cleaning..." - rm -rf $PROJECT-$COMMIT +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT - echo "Done." -fi +echo "Done." diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 07bbbb6..8b70cbd 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,25 +1,20 @@ diff -up ./phpunit.rpm ./phpunit ---- ./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']); +--- ./phpunit.rpm 2019-02-01 06:41:59.000000000 +0100 ++++ ./phpunit 2019-02-01 08:43:27.079804951 +0100 +@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { + ini_set('date.timezone', 'UTC'); + } - 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); +-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( - STDERR, @@ -29,101 +24,48 @@ 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/PHPUnit8/autoload.php'); } $options = getopt('', array('prepend:')); -@@ -95,4 +79,13 @@ unset($options); +@@ -58,4 +45,8 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; -PHPUnit\TextUI\Command::main(); -+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(); ++if (class_exists('PHPUnit_TextUI_Command')) { ++ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older +} else { -+ // PHPUnit v6 to v9 -+ PHPUnit\TextUI\Command::main(); ++ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} -diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php ---- ./src/TextUI/Command.php.rpm 2024-03-06 09:33:13.000000000 +0100 -+++ ./src/TextUI/Command.php 2024-04-05 08:01:23.626251144 +0200 -@@ -1144,13 +1144,13 @@ class Command - $this->printVersionString(); - - $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); -- $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . explode('.', Version::series())[0]); -+ $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=explode('.', Version::series())[0]); - - $notLatest = version_compare($latestVersion, Version::id(), '>'); - $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); - - if ($notLatest || $notLatestCompatible) { -- print 'You are not using the latest version of PHPUnit.' . PHP_EOL; -+ print 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL; - } else { - print 'You are using the latest version of PHPUnit.' . PHP_EOL; - } -@@ -1161,6 +1161,7 @@ class Command - Version::id(), - $latestCompatibleVersion - ); -+ printf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); - } - - if ($notLatest) { -@@ -1168,6 +1169,7 @@ class Command - 'The latest version is PHPUnit %s.' . PHP_EOL, - $latestVersion - ); -+ printf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); - } - - exit(TestRunner::SUCCESS_EXIT); diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2024-03-06 09:33:13.000000000 +0100 -+++ ./src/Util/Configuration.php 2024-04-05 08:00:14.044636630 +0200 -@@ -932,7 +932,7 @@ final class Configuration +--- ./src/Util/Configuration.php.rpm 2019-02-01 06:41:59.000000000 +0100 ++++ ./src/Util/Configuration.php 2019-02-01 08:43:27.079804951 +0100 +@@ -899,7 +899,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { - $original = libxml_use_internal_errors(true); + $original = \libxml_use_internal_errors(true); - $xsdFilename = __DIR__ . '/../../phpunit.xsd'; + $xsdFilename = __DIR__ . '/../phpunit.xsd'; - if (defined('__PHPUNIT_PHAR_ROOT__')) { - $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; + if (\defined('__PHPUNIT_PHAR_ROOT__')) { + $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2024-03-06 09:33:13.000000000 +0100 -+++ ./tests/bootstrap.php 2024-04-05 08:00:14.044636630 +0200 -@@ -9,8 +9,8 @@ - */ - const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; +--- ./tests/bootstrap.php.rpm 2019-02-01 08:43:27.080804957 +0100 ++++ ./tests/bootstrap.php 2019-02-01 08:44:59.691284599 +0100 +@@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) { + \ini_set('precision', '14'); + \ini_set('serialize_precision', '14'); --$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,15 @@ 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 '@PATH@//Framework/Assert/Functions.php'; -+ require_once __DIR__ . '/autoload.php'; - } - - if ($phar) { +-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 '@PATH@/Framework/Assert/Functions.php'; ++require_once __DIR__ . '/autoload.php'; diff --git a/phpunit8.spec b/phpunit8.spec index 5331753..60e6664 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,17 +1,20 @@ # remirepo/fedora spec file for phpunit8 # -# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2010-2020 Remi Collet +# +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # +# For compatibility with SCL +%undefine __brp_mangle_shebangs -%global gh_commit 2605ccb4744dbcc20e00a12b7082c86ab3431071 -%global gh_date 2025-12-01 +%global gh_commit 34c18baa6a44f1d1fbf0338907139e9dce95b997 +#global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner sebastianbergmann +%global gh_vendor sebastianbergmann %global gh_project phpunit # Packagist %global pk_vendor phpunit @@ -21,18 +24,16 @@ %global php_home %{_datadir}/php %global ver_major 8 %global ver_minor 5 - -%global upstream_version 8.5.49 -#global upstream_prever dev +%global specrel 1 Name: %{pk_project}%{ver_major} -Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Version: 8.5.8 +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} -License: BSD-3-Clause -URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{upstream_version}-%{gh_short}.tgz +License: BSD +URL: https://github.com/%{gh_vendor}/%{gh_project} +Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh # Fix command for autoload @@ -40,24 +41,24 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.13.4 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) -BuildRequires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) -BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.17 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.6 with php-composer(phpunit/php-file-iterator) < 3) +BuildRequires: (php-composer(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) >= 7.0.7 with php-composer(phpunit/php-code-coverage) < 8) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.4 with php-composer(phpunit/php-timer) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0.6 with php-composer(sebastian/comparator) < 4) -BuildRequires: (php-composer(sebastian/diff) >= 3.0.6 with php-composer(sebastian/diff) < 4) -BuildRequires: (php-composer(sebastian/environment) >= 4.2.5 with php-composer(sebastian/environment) < 5) -BuildRequires: (php-composer(sebastian/exporter) >= 3.1.8 with php-composer(sebastian/exporter) < 4) -BuildRequires: (php-composer(sebastian/global-state) >= 3.0.6 with php-composer(sebastian/global-state) < 4) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.5 with php-composer(sebastian/object-enumerator) < 4) -BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.3 with php-composer(sebastian/resource-operations) < 3) +BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) +BuildRequires: (php-composer(sebastian/comparator) >= 3.0.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.2 with php-composer(sebastian/environment) < 5) +BuildRequires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 4) +BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) +BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) +BuildRequires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) BuildRequires: php-dom BuildRequires: php-json @@ -69,28 +70,29 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": ">=7.2", +# "php": "^7.2", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.5.0", -# "myclabs/deep-copy": "^1.13.4", -# "phar-io/manifest": "^2.0.4", -# "phar-io/version": "^3.2.1", -# "phpunit/php-code-coverage": "^7.0.17", -# "phpunit/php-file-iterator": "^2.0.6", +# "doctrine/instantiator": "^1.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.4", -# "sebastian/comparator": "^3.0.6", -# "sebastian/diff": "^3.0.6", -# "sebastian/environment": "^4.2.5", -# "sebastian/exporter": "^3.1.8", -# "sebastian/global-state": "^3.0.6", -# "sebastian/object-enumerator": "^3.0.5", -# "sebastian/resource-operations": "^2.0.3", +# "phpunit/php-timer": "^2.1.2", +# "sebastian/comparator": "^3.0.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", Requires: php(language) >= 7.2 @@ -101,23 +103,23 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) -Requires: (php-composer(myclabs/deep-copy) >= 1.13.4 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) -Requires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) -Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.17 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.6 with php-composer(phpunit/php-file-iterator) < 3) +Requires: (php-composer(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) >= 7.0.7 with php-composer(phpunit/php-code-coverage) < 8) +Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -Requires: (php-composer(phpunit/php-timer) >= 2.1.4 with php-composer(phpunit/php-timer) < 3) -Requires: (php-composer(sebastian/comparator) >= 3.0.6 with php-composer(sebastian/comparator) < 4) -Requires: (php-composer(sebastian/diff) >= 3.0.6 with php-composer(sebastian/diff) < 4) -Requires: (php-composer(sebastian/environment) >= 4.2.5 with php-composer(sebastian/environment) < 5) -Requires: (php-composer(sebastian/exporter) >= 3.1.8 with php-composer(sebastian/exporter) < 4) -Requires: (php-composer(sebastian/global-state) >= 3.0.6 with php-composer(sebastian/global-state) < 4) -Requires: (php-composer(sebastian/object-enumerator) >= 3.0.5 with php-composer(sebastian/object-enumerator) < 4) -Requires: (php-composer(sebastian/resource-operations) >= 2.0.3 with php-composer(sebastian/resource-operations) < 3) -Requires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) +Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) +Requires: (php-composer(sebastian/comparator) >= 3.0.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.2 with php-composer(sebastian/environment) < 5) +Requires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 4) +Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) +Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) +Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) +Requires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) # From composer.json, "suggest": { # "phpunit/php-invoker": "^2.0.0", @@ -126,22 +128,15 @@ 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 -# recommends latest versions -Recommends: phpunit9 -Recommends: phpunit10 -Recommends: phpunit11 -Recommends: phpunit12 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 +Requires: php-reflection Requires: php-openssl Requires: php-pcntl +Requires: php-pcre Requires: php-phar - -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 -Provides: php-composer(phpunit/phpunit) = %{version} -Provides: phpunit = %{version}-%{release} -%endif +Requires: php-spl %description @@ -151,14 +146,12 @@ It is an instance of the xUnit architecture for unit testing frameworks. This package provides the version %{ver_major} of PHPUnit, available using the %{name} command. -Documentation: https://phpunit.de/documentation.html +Documentation: https://phpunit.readthedocs.io/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p0 -b .rpm - -find . -name \*.rpm -delete -print +%patch0 -p0 -b .rpm %build @@ -174,6 +167,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Text/Template/Autoload.php', '%{php_home}/SebastianBergmann/CodeCoverage7/autoload.php', '%{php_home}/SebastianBergmann/Timer/autoload.php', + '%{php_home}/Prophecy/autoload.php', '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2 '%{php_home}/SebastianBergmann/Comparator3/autoload.php', '%{php_home}/SebastianBergmann/Environment4/autoload.php', @@ -183,13 +177,17 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/ResourceOperations2/autoload.php', '%{php_home}/SebastianBergmann/Type/autoload.php', '%{php_home}/SebastianBergmann/Version/autoload.php', - '%{php_home}/Doctrine/Instantiator/autoload.php', - '%{php_home}/DeepCopy/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}/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', + '%{php_home}/PharIo/Manifest/autoload.php', + '%{php_home}/PharIo/Version/autoload.php', ]); // Extensions \Fedora\Autoloader\Dependencies::optional( @@ -202,8 +200,8 @@ cat src/autoload.php --output tests/autoload.php \ --exclude '*/BankAccountTest2.php' \ --exclude '*/regression/Trac/783/OneTest.php' \ - --exclude 'tests/end-to-end/regression/3889/Issue3889Test.test.php' \ - --exclude 'tests/end-to-end/regression/3904/Issue3904Test.php' \ + --exclude 'tests/end-to-end/regression/GitHub/3889/Issue3889Test.test.php' \ + --exclude 'tests/end-to-end/regression/GitHub/3904/Issue3904Test.php' \ tests @@ -222,7 +220,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 php72 php73 php74 php80; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -239,171 +237,6 @@ exit $ret %changelog -* Tue Dec 2 2025 Remi Collet - 8.5.49-1 -- update to 8.5.49 (no change) - -* Wed Sep 24 2025 Remi Collet - 8.5.48-1 -- update to 8.5.48 (no change) -- raise dependency on sebastian/exporter 3.1.8 - -* Mon Sep 15 2025 Remi Collet - 8.5.46-1 -- update to 8.5.46 - -* Thu Sep 11 2025 Remi Collet - 8.5.45-1 -- update to 8.5.45 - -* Wed Aug 20 2025 Remi Collet - 8.5.44-1 -- update to 8.5.44 - -* Fri Jul 25 2025 Fedora Release Engineering - 8.5.42-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun May 4 2025 Remi Collet - 8.5.42-1 -- update to 8.5.42 -- raise dependency on myclabs/deep-copy 1.13.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 8.5.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Dec 5 2024 Remi Collet - 8.5.41-1 -- update to 8.5.41 (no change) -- raise dependency on myclabs/deep-copy 1.12.1 - -* Thu Sep 19 2024 Remi Collet - 8.5.40-1 -- update to 8.5.40 - -* Fri Jul 19 2024 Fedora Release Engineering - 8.5.39-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jul 11 2024 Remi Collet - 8.5.39-1 -- update to 8.5.39 (no change) -- raise dependencies - -* Fri Apr 5 2024 Remi Collet - 8.5.38-1 -- update to 8.5.38 (no change) - -* Wed Mar 6 2024 Remi Collet - 8.5.37-1 -- update to 8.5.37 - -* Thu Jan 25 2024 Fedora Release Engineering - 8.5.36-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 8.5.36-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Dec 2 2023 Remi Collet - 8.5.36-1 -- update to 8.5.36 (no change) - -* Fri Dec 1 2023 Remi Collet - 8.5.35-1 -- update to 8.5.35 (no change) - -* Tue Sep 19 2023 Remi Collet - 8.5.34-1 -- update to 8.5.34 - -* Fri Jul 21 2023 Fedora Release Engineering - 8.5.33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Feb 28 2023 Remi Collet - 8.5.33-1 -- update to 8.5.33 - -* Thu Jan 26 2023 Remi Collet - 8.5.32-1 -- update to 8.5.32 - -* Fri Jan 20 2023 Fedora Release Engineering - 8.5.31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Oct 28 2022 Remi Collet - 8.5.31-1 -- update to 8.5.31 - -* Sun Sep 25 2022 Remi Collet - 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 - 8.5.29-1 -- update to 8.5.29 -- keep dependency on phpspec/prophecy (optional) - -* Fri Jul 29 2022 Remi Collet - 8.5.28-1 -- update to 8.5.28 - -* Fri Jul 22 2022 Fedora Release Engineering - 8.5.27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 20 2022 Remi Collet - 8.5.27-1 -- update to 8.5.27 - -* Mon Apr 4 2022 Remi Collet - 8.5.26-1 -- update to 8.5.26 - -* Thu Mar 17 2022 Remi Collet - 8.5.25-1 -- update to 8.5.25 - -* Sun Mar 6 2022 Remi Collet - 8.5.24-1 -- update to 8.5.24 #StandWithUkraine - -* Fri Jan 21 2022 Remi Collet - 8.5.23-1 -- update to 8.5.23 - -* Thu Dec 30 2021 Remi Collet - 8.5.22-1 -- update to 8.5.22 - -* Mon Sep 27 2021 Remi Collet - 8.5.21-1 -- update to 8.5.21 - -* Wed Sep 1 2021 Remi Collet - 8.5.20-1 -- update to 8.5.20 - -* Mon Aug 2 2021 Remi Collet - 8.5.19-1 -- update to 8.5.19 -- raise dependency on phar-io/manifest 2.0.3 -- raise dependency on phpunit/php-file-iterator 2.0.4 - -* Fri Jul 23 2021 Fedora Release Engineering - 8.5.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jul 19 2021 Remi Collet - 8.5.18-1 -- update to 8.5.18 - -* Wed Jun 23 2021 Remi Collet - 8.5.17-1 -- update to 8.5.17 - -* Mon Jun 7 2021 Remi Collet - 8.5.16-1 -- update to 8.5.16 - -* Wed Mar 17 2021 Remi Collet - 8.5.15-1 -- update to 8.5.15 - -* Wed Feb 3 2021 Remi Collet - 8.5.14-1 -- update to 8.5.14 - -* Wed Jan 27 2021 Fedora Release Engineering - 8.5.13-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 1 2020 Remi Collet - 8.5.13-1 -- update to 8.5.13 - -* Mon Nov 30 2020 Remi Collet - 8.5.12-1 -- update to 8.5.12 -- raise dependency on phar-io/manifest 2.0.1 -- raise dependency on phar-io/version 3.0.2 - -* Fri Nov 27 2020 Remi Collet - 8.5.11-1 -- update to 8.5.11 -- raise dependency on phpunit/php-code-coverage 7.0.12 - -* Tue Nov 10 2020 Remi Collet - 8.5.9-1 -- update to 8.5.9 -- raise dependency on doctrine/instantiator 1.3.1 -- raise dependency on myclabs/deep-copy 1.10.0 -- raise dependency on phpspec/prophecy 1.10.3 -- raise dependency on phpunit/php-code-coverage 7.0.10 -- raise dependency on sebastian/environment 4.2.2 -- raise dependency on sebastian/exporter 3.1.2 - -* Tue Jul 28 2020 Fedora Release Engineering - 8.5.8-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Mon Jun 22 2020 Remi Collet - 8.5.8-1 - update to 8.5.8 @@ -419,14 +252,8 @@ exit $ret * Tue Mar 31 2020 Remi Collet - 8.5.3-1 - update to 8.5.3 - -* Tue Mar 17 2020 Remi Collet - 8.5.2-2 -- load phpunit-selenium autoloader if present - own /usr/share/php/PHPUnit8/Extensions -* Thu Jan 30 2020 Fedora Release Engineering - 8.5.2-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Wed Jan 8 2020 Remi Collet - 8.5.2-1 - update to 8.5.2 diff --git a/sources b/sources index 9d0ff0f..0714d80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.49-2605ccb.tgz) = 0d9e36ffdabe03bd2ad71719c1e1e7efb5a93e537965f9377bf211929d147cd4466ed892212ac30ed2d9c310d775eb9cd0f297d169e081da9dd01f62ac3e5959 +SHA512 (phpunit8-8.5.8-34c18ba.tgz) = 27d70638c60e8951d090bab61f7cb4017e7479930dc7dd83b708bffe23ba4c49b647d3ce2f73b01bf92d81a1cb0c56025ece999dae31076a71117ddda3dc7506