diff options
-rw-r--r-- | composer.json | 26 | ||||
-rwxr-xr-x | makesrc.sh | 39 | ||||
-rw-r--r-- | phpunit9-rpm.patch | 119 | ||||
-rw-r--r-- | phpunit9.spec | 296 |
4 files changed, 359 insertions, 121 deletions
diff --git a/composer.json b/composer.json index 10d681d..42e16c6 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,32 +29,27 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.1", + "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "ext-PDO": "*", - "phpspec/prophecy-phpunit": "^2.0.1" - }, "config": { "platform": { "php": "7.3.0" @@ -62,8 +58,8 @@ "sort-packages": true }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "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" @@ -88,7 +84,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.4-dev" + "dev-master": "9.6-dev" } } } @@ -1,28 +1,35 @@ #!/bin/bash NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_vendor/{s/.* //;p}' $NAME.spec) +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 '/^Version:/{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} -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" +DATE=$(date -d "$DATE -4 days" +%Y-%m-%d) -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +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 "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + popd -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT -echo "Done." + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + + echo "Done." +fi diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index b6ccbc5..e9698bf 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,19 +1,24 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200 -+++ ./phpunit 2020-08-10 12:02:22.089870229 +0200 -@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } +--- ./phpunit.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./phpunit 2024-03-06 10:19:22.109376592 +0100 +@@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p + define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); --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,29 +29,57 @@ 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/Command.php.rpm ./src/TextUI/Command.php +--- ./src/TextUI/Command.php.rpm 2024-03-06 10:19:26.914560422 +0100 ++++ ./src/TextUI/Command.php 2024-03-06 10:19:32.787785106 +0100 +@@ -600,7 +600,7 @@ class Command + $this->printVersionString(); + + $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); +- $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(), '>'); +@@ -617,6 +617,7 @@ class Command + Version::id(), + $latestCompatibleVersion, + ); ++ printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); + } + + if ($notLatest) { +@@ -624,6 +625,7 @@ class Command + 'The latest version is PHPUnit %s.' . PHP_EOL, + $latestVersion, + ); ++ printf('Try to install and use the phpunit%s command.' . PHP_EOL, 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 2020-08-10 12:02:22.089870229 +0200 -+++ ./src/Util/Xml/SchemaFinder.php 2020-08-10 12:06:11.098559995 +0200 -@@ -48,6 +48,6 @@ final class SchemaFinder +--- ./src/Util/Xml/SchemaFinder.php.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./src/Util/Xml/SchemaFinder.php 2024-03-06 10:19:22.109376592 +0100 +@@ -75,6 +75,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -55,15 +88,33 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-08-10 12:02:07.000000000 +0200 -+++ ./tests/bootstrap.php 2020-08-10 12:02:22.089870229 +0200 -@@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) { - \ini_set('precision', '14'); - \ini_set('serialize_precision', '14'); +--- ./tests/bootstrap.php.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-06 10:19:22.109376592 +0100 +@@ -9,8 +9,8 @@ + */ + const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; + +-$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'; + } --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'; + if ($phar) { diff --git a/phpunit9.spec b/phpunit9.spec index 35b45dc..3f7e469 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,20 +1,21 @@ # remirepo/fedora spec file for phpunit9 # -# Copyright (c) 2010-2020 Remi Collet +# Copyright (c) 2010-2024 Remi Collet # -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # +# remirepo:2 # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1f09a12726593737e8a228ebb1c8647305d07c41 -#global gh_date 20150927 +%global gh_commit 32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04 +%global gh_date 2024-03-21 %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,17 +24,19 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 4 -%global specrel 1 +%global ver_minor 6 + +%global upstream_version 9.6.18 +#global upstream_prever dev Name: %{pk_project}%{ver_major} -Version: 9.4.1 -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: %{name}-%{version}-%{gh_short}.tgz +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 @@ -43,49 +46,49 @@ BuildArch: noarch BuildRequires: php(language) >= 7.3 # 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(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.1 with php-composer(phar-io/manifest) < 3) +BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) BuildRequires: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2 with php-composer(phpunit/php-code-coverage) < 10) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.13 with php-composer(phpunit/php-code-coverage) < 10) BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) -BuildRequires: (php-composer(sebastian/comparator) >= 4.0.5 with php-composer(sebastian/comparator) < 5) +BuildRequires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5) +BuildRequires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) BuildRequires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) -BuildRequires: (php-composer(sebastian/type) >= 2.3 with php-composer(sebastian/type) < 3) +BuildRequires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) # remirepo:23 %else BuildRequires: php-doctrine-instantiator >= 1.3.1 BuildRequires: php-myclabs-deep-copy >= 1.10.1 -BuildRequires: php-phar-io-manifest2 >= 2.0.1 +BuildRequires: php-phar-io-manifest2 >= 2.0.3 BuildRequires: php-phar-io-version3 >= 3.0.2 BuildRequires: php-phpspec-prophecy >= 1.12.1 -BuildRequires: php-phpunit-php-code-coverage9 >= 9.2 +BuildRequires: php-phpunit-php-code-coverage9 >= 9.2.13 BuildRequires: php-phpunit-php-file-iterator3 >= 3.0.4 BuildRequires: php-phpunit-php-invoker3 >= 3.1 BuildRequires: php-phpunit-php-text-template2 >= 2.0.2 BuildRequires: php-phpunit-php-timer5 >= 5.0.1 BuildRequires: php-sebastian-cli-parser >= 1.0 BuildRequires: php-sebastian-code-unit >= 1.0.5 -BuildRequires: php-sebastian-comparator4 >= 4.0.5 +BuildRequires: php-sebastian-comparator4 >= 4.0.8 BuildRequires: php-sebastian-diff4 >= 4.0.2 BuildRequires: php-sebastian-environment5 >= 5.1.2 -BuildRequires: php-sebastian-exporter4 >= 4.0.2 +BuildRequires: php-sebastian-exporter4 >= 4.0.5 BuildRequires: php-sebastian-global-state5 >= 5.0 BuildRequires: php-sebastian-object-enumerator4 >= 4.0.2 BuildRequires: php-sebastian-resource-operations3 >= 3.0.2 -BuildRequires: php-sebastian-type2 >= 2.3 +BuildRequires: php-sebastian-type3 >= 3.2 BuildRequires: php-sebastian-version3 >= 3.0.1 %endif BuildRequires: php-dom @@ -105,26 +108,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.3.1", +# "doctrine/instantiator": "^1.3.1 || ^2", # "myclabs/deep-copy": "^1.10.1", -# "phar-io/manifest": "^2.0.1", +# "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpspec/prophecy": "^1.12.1", -# "phpunit/php-code-coverage": "^9.2", +# "phpunit/php-code-coverage": "^9.2.28", # "phpunit/php-file-iterator": "^3.0.5", # "phpunit/php-invoker": "^3.1.1", # "phpunit/php-text-template": "^2.0.3", # "phpunit/php-timer": "^5.0.2", # "sebastian/cli-parser": "^1.0.1", # "sebastian/code-unit": "^1.0.6", -# "sebastian/comparator": "^4.0.5", +# "sebastian/comparator": "^4.0.8", # "sebastian/diff": "^4.0.3", # "sebastian/environment": "^5.1.3", -# "sebastian/exporter": "^4.0.3", +# "sebastian/exporter": "^4.0.5", # "sebastian/global-state": "^5.0.1", # "sebastian/object-enumerator": "^4.0.3", # "sebastian/resource-operations": "^3.0.3", -# "sebastian/type": "^2.3", +# "sebastian/type": "^3.2", # "sebastian/version": "^3.0.2" Requires: php(language) >= 7.3 Requires: php-cli @@ -136,54 +138,60 @@ 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(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 3) Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) +Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) Requires: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 9.2 with php-composer(phpunit/php-code-coverage) < 10) +Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.28 with php-composer(phpunit/php-code-coverage) < 10) Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) Requires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) -Requires: (php-composer(sebastian/comparator) >= 4.0.5 with php-composer(sebastian/comparator) < 5) +Requires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5) +Requires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) Requires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) -Requires: (php-composer(sebastian/type) >= 2.3 with php-composer(sebastian/type) < 3) +Requires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { # "ext-soap": "*", # "ext-xdebug": "*" Suggests: php-soap Suggests: php-xdebug +# recommends latest versions +Recommends: phpunit10 +# Fedora 38+ only until 8.1 EOL +%if 0%{?fedora} >= 38 +Recommends: phpunit11 +%endif # remirepo:23 %else Requires: php-doctrine-instantiator >= 1.3.1 Requires: php-myclabs-deep-copy >= 1.10.1 -Requires: php-phar-io-manifest2 >= 2.0.1 +Requires: php-phar-io-manifest2 >= 2.0.3 Requires: php-phar-io-version3 >= 3.0.2 Requires: php-phpspec-prophecy >= 1.12.1 -Requires: php-phpunit-php-code-coverage9 >= 9.2 +Requires: php-phpunit-php-code-coverage9 >= 9.2.28 Requires: php-phpunit-php-file-iterator3 >= 3.0.4 Requires: php-phpunit-php-invoker3 >= 3.1 Requires: php-phpunit-php-text-template2 >= 2.0.2 Requires: php-phpunit-php-timer5 >= 5.0.1 Requires: php-sebastian-cli-parser >= 1.0 Requires: php-sebastian-code-unit >= 1.0.5 -Requires: php-sebastian-comparator4 >= 4.0.5 +Requires: php-sebastian-comparator4 >= 4.0.8 Requires: php-sebastian-diff4 >= 4.0.2 Requires: php-sebastian-environment5 >= 5.1.2 -Requires: php-sebastian-exporter4 >= 4.0.2 +Requires: php-sebastian-exporter4 >= 4.0.5 Requires: php-sebastian-global-state5 >= 5.0 Requires: php-sebastian-object-enumerator4 >= 4.0.2 Requires: php-sebastian-resource-operations3 >= 3.0.2 -Requires: php-sebastian-type2 >= 2.3 +Requires: php-sebastian-type3 >= 3.2 Requires: php-sebastian-version3 >= 3.0.1 %endif # Autoloader @@ -196,6 +204,11 @@ 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 PHPUnit is a programmer-oriented testing framework for PHP. @@ -209,7 +222,7 @@ Documentation: https://phpunit.readthedocs.io/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm find . -name \*.rpm -delete -print @@ -222,12 +235,20 @@ 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/CodeCoverage9/autoload.php', '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', '%{php_home}/SebastianBergmann/Template2/autoload.php', '%{php_home}/SebastianBergmann/Timer5/autoload.php', - '%{php_home}/Prophecy/autoload.php', + $inst, '%{php_home}/SebastianBergmann/CliParser/autoload.php', '%{php_home}/SebastianBergmann/CodeUnit/autoload.php', '%{php_home}/SebastianBergmann/Invoker3/autoload.php', @@ -238,13 +259,14 @@ cat << 'EOF' | tee -a src/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/Instantiator/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( @@ -255,14 +277,10 @@ 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/force-covers-annotation/tests/Test.php' \ - --exclude 'tests/end-to-end/regression/GitHub/2448/Test.php' \ - --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ - --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.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 @@ -282,10 +300,8 @@ 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 php80; do +for cmd in php php81 php82 php83; do if which $cmd; then - VER=$($cmd -r 'echo PHP_VERSION_ID;') - [ $VER -ge 80000 ] && OPT="$OPT --filter '^((?!(testStaticReturnTypeIsDoubledCorrectly|testNullableStaticReturnTypeIsDoubledCorrectly|testUnionReturnTypeWithStaticIsDoubledCorrectly)).)*$'" $cmd ./phpunit $OPT --verbose || ret=1 fi done @@ -303,6 +319,174 @@ exit $ret %changelog +* Thu Mar 21 2024 Remi Collet <remi@remirepo.net> - 9.6.18-1 +- update to 9.6.18 + +* Wed Mar 6 2024 Remi Collet <remi@remirepo.net> - 9.6.17-2 +- improve --check-version for RPM + +* Mon Feb 26 2024 Remi Collet <remi@remirepo.net> - 9.6.17-1 +- update to 9.6.17 + +* Mon Feb 5 2024 Remi Collet <remi@remirepo.net> - 9.6.16-2 +- recommend phpunit11 + +* Fri Jan 19 2024 Remi Collet <remi@remirepo.net> - 9.6.16-1 +- update to 9.6.16 + +* Fri Dec 22 2023 Remi Collet <remi@remirepo.net> - 9.6.15-2 +- fix possible autoloader issue with phpspec/prophecy + +* Sat Dec 2 2023 Remi Collet <remi@remirepo.net> - 9.6.15-1 +- update to 9.6.15 + +* Fri Dec 1 2023 Remi Collet <remi@remirepo.net> - 9.6.14-1 +- update to 9.6.14 (no change) + +* Tue Sep 19 2023 Remi Collet <remi@remirepo.net> - 9.6.13-1 +- update to 9.6.13 + +* Wed Sep 13 2023 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 9.6.11-1 +- update to 9.6.11 + +* Mon Jul 10 2023 Remi Collet <remi@remirepo.net> - 9.6.10-1 +- update to 9.6.10 + +* Mon Jun 12 2023 Remi Collet <remi@remirepo.net> - 9.6.9-1 +- update to 9.6.9 + +* Thu May 11 2023 Remi Collet <remi@remirepo.net> - 9.6.8-1 +- update to 9.6.8 + +* Fri Apr 14 2023 Remi Collet <remi@remirepo.net> - 9.6.7-1 +- update to 9.6.7 + +* Mon Mar 27 2023 Remi Collet <remi@remirepo.net> - 9.6.6-1 +- update to 9.6.6 + +* Thu Mar 9 2023 Remi Collet <remi@remirepo.net> - 9.6.5-1 +- update to 9.6.5 + +* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 9.6.4-1 +- update to 9.6.4 + +* Mon Feb 6 2023 Remi Collet <remi@remirepo.net> - 9.6.3-1 +- update to 9.6.3 + +* Sat Feb 4 2023 Remi Collet <remi@remirepo.net> - 9.6.2-1 +- update to 9.6.2 +- adapt launcher for phpunit10 + +* Fri Feb 3 2023 Remi Collet <remi@remirepo.net> - 9.6.0-1 +- update to 9.6.0 + +* Mon Jan 16 2023 Remi Collet <remi@remirepo.net> - 9.5.28-1 +- update to 9.5.28 +- allow doctrine/instantiator v2 + +* Fri Dec 9 2022 Remi Collet <remi@remirepo.net> - 9.5.27-1 +- update to 9.5.27 + +* Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 9.5.26-1 +- update to 9.5.26 + +* Sun Sep 25 2022 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 9.5.24-1 +- update to 9.5.24 +- raise dependency on sebastian/type 3.1 + +* Tue Aug 30 2022 Remi Collet <remi@remirepo.net> - 9.5.23-1 +- update to 9.5.23 +- keep dependency on phpspec/prophecy (optional) + +* Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 9.5.21-1 +- update to 9.5.21 + +* Mon Apr 4 2022 Remi Collet <remi@remirepo.net> - 9.5.20-1 +- update to 9.5.20 + +* Tue Mar 15 2022 Remi Collet <remi@remirepo.net> - 9.5.19-1 +- update to 9.5.19 +- raise dependency on sebastian/type 3.0 + +* Tue Mar 8 2022 Remi Collet <remi@remirepo.net> - 9.5.18-1 +- update to 9.5.18 + +* Sun Mar 6 2022 Remi Collet <remi@remirepo.net> - 9.5.17-1 +- update to 9.5.17 #StandWithUkraine + +* Thu Feb 24 2022 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 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 <remi@remirepo.net> - 9.5.14-1 +- update to 9.5.14 + +* Mon Jan 24 2022 Remi Collet <remi@remirepo.net> - 9.5.13-1 +- update to 9.5.13 + +* Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 9.5.12-1 +- update to 9.5.12 + +* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 9.5.11-1 +- update to 9.5.11 + +* Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 9.5.9-1 +- update to 9.5.9 + +* Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 9.5.8-1 +- update to 9.5.8 +- raise dependency on phar-io/manifest 2.0.3 + +* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 9.5.7-1 +- update to 9.5.7 + +* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 9.5.6-1 +- update to 9.5.6 + +* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 9.5.5-1 +- update to 9.5.5 +- raise dependency on sebastian/type 2.3.2 + +* Tue Mar 23 2021 Remi Collet <remi@remirepo.net> - 9.5.4-1 +- update to 9.5.4 + +* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 9.5.3-1 +- update to 9.5.3 + +* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 9.5.2-1 +- update to 9.5.2 + +* Fri Dec 4 2020 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 9.4.4-1 +- update to 9.4.4 + +* Tue Nov 10 2020 Remi Collet <remi@remirepo.net> - 9.4.3-1 +- update to 9.4.3 + +* Mon Oct 19 2020 Remi Collet <remi@remirepo.net> - 9.4.2-1 +- update to 9.4.2 + * Mon Oct 12 2020 Remi Collet <remi@remirepo.net> - 9.4.1-1 - update to 9.4.1 |