update patch

This commit is contained in:
Remi Collet 2024-09-19 15:03:17 +02:00
commit c1bcfbd578

View file

@ -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']);
@ -48,10 +48,45 @@ diff -up ./phpunit.rpm ./phpunit
+ // 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);
@ -61,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;