diff options
| -rw-r--r-- | composer.json | 17 | ||||
| -rw-r--r-- | phpunit8-rpm.patch | 90 | ||||
| -rw-r--r-- | phpunit8.spec | 123 |
3 files changed, 174 insertions, 56 deletions
diff --git a/composer.json b/composer.json index 7ca2f67..e5aad89 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": { @@ -32,24 +33,20 @@ "myclabs/deep-copy": "^1.10.0", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "phpspec/prophecy": "^1.10.3", "phpunit/php-code-coverage": "^7.0.12", "phpunit/php-file-iterator": "^2.0.4", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", + "sebastian/comparator": "^3.0.5", "sebastian/diff": "^3.0.2", "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", + "sebastian/exporter": "^3.1.5", "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" }, - "require-dev": { - "ext-PDO": "*" - }, "config": { "platform": { "php": "7.2.0" @@ -58,9 +55,9 @@ "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" diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 12bef82..07bbbb6 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,19 +1,24 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200 -+++ ./phpunit 2021-08-02 08:34:41.313976887 +0200 -@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } +--- ./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']); --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,64 @@ 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:')); -@@ -89,4 +76,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-08-02 08:27:58.000000000 +0200 -+++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200 -@@ -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-08-02 08:27:58.000000000 +0200 -+++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200 +--- ./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 0905afe..f194a9e 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,17 +1,18 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2021 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 496281b64ec781856ed0a583483b5923b4033722 +%global gh_commit 1ecad678646c817a29e55a32c930f3601c3f5a8c #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +26,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.19 +%global upstream_version 8.5.38 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -33,7 +34,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 @@ -54,10 +55,10 @@ BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-c BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 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/comparator) >= 3.0.5 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/exporter) >= 3.1.5 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) @@ -75,10 +76,10 @@ 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-comparator3 >= 3.0.5 BuildRequires: php-sebastian-diff3 >= 3.0.2 BuildRequires: php-sebastian-environment4 >= 4.2.3 -BuildRequires: php-sebastian-exporter3 >= 3.1.2 +BuildRequires: php-sebastian-exporter3 >= 3.1.5 BuildRequires: php-sebastian-global-state3 BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3 BuildRequires: php-sebastian-resource-operations2 >= 2.0.1 @@ -107,15 +108,14 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "myclabs/deep-copy": "^1.10.0", # "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpspec/prophecy": "^1.10.3", # "phpunit/php-code-coverage": "^7.0.10", # "phpunit/php-file-iterator": "^2.0.4", # "phpunit/php-text-template": "^1.2.1", # "phpunit/php-timer": "^2.1.2", -# "sebastian/comparator": "^3.0.2", +# "sebastian/comparator": "^3.0.5", # "sebastian/diff": "^3.0.2", # "sebastian/environment": "^4.2.3", -# "sebastian/exporter": "^3.1.2", +# "sebastian/exporter": "^3.1.5", # "sebastian/global-state": "^3.0.0", # "sebastian/object-enumerator": "^3.0.3", # "sebastian/resource-operations": "^2.0.1", @@ -140,10 +140,10 @@ Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-c Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 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/comparator) >= 3.0.5 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/exporter) >= 3.1.5 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) @@ -156,6 +156,10 @@ 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 # remirepo:21 %else Requires: php-doctrine-instantiator >= 1.3.1 @@ -167,10 +171,10 @@ 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-comparator3 >= 3.0.5 Requires: php-sebastian-diff3 >= 3.0.2 Requires: php-sebastian-environment4 >= 4.2.3 -Requires: php-sebastian-exporter3 >= 3.1.2 +Requires: php-sebastian-exporter3 >= 3.1.5 Requires: php-sebastian-global-state3 Requires: php-sebastian-object-enumerator3 >= 3.0.3 Requires: php-sebastian-resource-operations2 >= 2.0.1 @@ -188,6 +192,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. @@ -201,7 +210,9 @@ 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 %build @@ -217,7 +228,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', @@ -232,6 +242,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( @@ -244,8 +256,8 @@ cat src/autoload.php --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/3889/Issue3889Test.test.php' \ + --exclude 'tests/end-to-end/regression/3904/Issue3904Test.php' \ tests @@ -264,7 +276,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 php72 php73 php74 php80; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -283,6 +295,75 @@ exit $ret %changelog +* 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) + +* Fri Jul 29 2022 Remi Collet <remi@remirepo.net> - 8.5.28-1 +- update to 8.5.28 + +* Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 8.5.27-1 +- update to 8.5.27 + +* Mon Apr 4 2022 Remi Collet <remi@remirepo.net> - 8.5.26-1 +- update to 8.5.26 + +* Thu Mar 17 2022 Remi Collet <remi@remirepo.net> - 8.5.25-1 +- update to 8.5.25 + +* Sun Mar 6 2022 Remi Collet <remi@remirepo.net> - 8.5.24-1 +- update to 8.5.24 #StandWithUkraine + +* Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 8.5.23-1 +- update to 8.5.23 + +* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 8.5.22-1 +- update to 8.5.22 + +* Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 8.5.21-1 +- update to 8.5.21 + +* Wed Sep 1 2021 Remi Collet <remi@remirepo.net> - 8.5.20-1 +- update to 8.5.20 + * Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 8.5.19-1 - update to 8.5.19 - raise dependency on phar-io/manifest 2.0.3 |