diff options
Diffstat (limited to 'phpunit11-rpm.patch')
| -rw-r--r-- | phpunit11-rpm.patch | 76 |
1 files changed, 59 insertions, 17 deletions
diff --git a/phpunit11-rpm.patch b/phpunit11-rpm.patch index 10b1cc7..bcc35c6 100644 --- a/phpunit11-rpm.patch +++ b/phpunit11-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-08-02 08:11:38.000000000 +0200 -+++ ./phpunit 2024-08-02 08:12:01.101893244 +0200 +--- ./phpunit.rpm 2024-10-28 16:32:22.000000000 +0100 ++++ ./phpunit 2024-10-28 16:32:27.795731213 +0100 @@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -50,18 +50,23 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); +} diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/Command/Commands/VersionCheckCommand.php ---- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-08-02 08:11:38.000000000 +0200 -+++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-08-02 08:13:24.053211780 +0200 -@@ -31,7 +31,7 @@ final readonly class VersionCheckCommand +--- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-10-28 16:32:22.000000000 +0100 ++++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-10-28 17:11:42.258839065 +0100 +@@ -39,7 +39,7 @@ final readonly class VersionCheckCommand assert($latestVersion !== false); -- $latestCompatibleVersion = @file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . Version::majorVersionNumber()); -+ $latestCompatibleVersion = @file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=Version::majorVersionNumber()); +- $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $this->majorVersionNumber); ++ $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=$this->majorVersionNumber); - $notLatest = version_compare($latestVersion, Version::id(), '>'); - $notLatestCompatible = false; -@@ -46,7 +46,7 @@ final readonly class VersionCheckCommand + assert($latestCompatibleVersion !== false); + +@@ -52,11 +52,11 @@ final readonly class VersionCheckCommand + + if (!$notLatest && !$notLatestCompatible) { + return Result::from( +- 'You are using the latest version of PHPUnit.' . PHP_EOL, ++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL, ); } @@ -70,15 +75,15 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ if ($notLatestCompatible) { $buffer .= sprintf( -@@ -54,6 +54,7 @@ final readonly class VersionCheckCommand - Version::id(), +@@ -64,6 +64,7 @@ final readonly class VersionCheckCommand + $this->versionId, $latestCompatibleVersion, ); + $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); } if ($notLatest) { -@@ -61,6 +62,9 @@ final readonly class VersionCheckCommand +@@ -71,6 +72,9 @@ final readonly class VersionCheckCommand 'The latest version is PHPUnit %s.' . PHP_EOL, $latestVersion, ); @@ -89,8 +94,8 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ return Result::from($buffer, Result::FAILURE); diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php ---- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-08-02 08:11:38.000000000 +0200 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-08-02 08:12:01.102893284 +0200 +--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-10-28 16:32:22.000000000 +0100 ++++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-10-28 16:32:27.795731213 +0100 @@ -77,6 +77,6 @@ final readonly class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -100,8 +105,8 @@ diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Config } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2024-08-02 08:11:38.000000000 +0200 -+++ ./tests/bootstrap.php 2024-08-02 08:12:01.102893284 +0200 +--- ./tests/bootstrap.php.rpm 2024-10-28 16:32:22.000000000 +0100 ++++ ./tests/bootstrap.php 2024-10-28 16:32:27.796731252 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } @@ -131,3 +136,40 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php } if ($phar) { +diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php +--- ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm 2024-10-28 16:32:22.000000000 +0100 ++++ ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php 2024-10-28 17:11:47.725052771 +0100 +@@ -28,7 +28,7 @@ final class VersionCheckCommandTest exte + { + return [ + [ +- 'You are using the latest version of PHPUnit.' . PHP_EOL, ++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL, + Result::SUCCESS, + 10, + '10.5.0', +@@ -36,8 +36,9 @@ final class VersionCheckCommandTest exte + '10.5.0', + ], + [ +- 'You are not using the latest version of PHPUnit.' . PHP_EOL . ++ 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL . + 'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL . ++ 'Try a system update for new phpunit10 package.' . PHP_EOL . PHP_EOL . + 'The latest version is PHPUnit 10.5.1.' . PHP_EOL, + Result::FAILURE, + 10, +@@ -46,9 +47,11 @@ final class VersionCheckCommandTest exte + '10.5.1', + ], + [ +- 'You are not using the latest version of PHPUnit.' . PHP_EOL . ++ 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL . + 'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL . +- 'The latest version is PHPUnit 11.0.0.' . PHP_EOL, ++ 'Try a system update for new phpunit10 package.' . PHP_EOL . PHP_EOL . ++ 'The latest version is PHPUnit 11.0.0.' . PHP_EOL . ++ 'Try to install and use the phpunit11 command.' . PHP_EOL . PHP_EOL, + Result::FAILURE, + 10, + '10.5.0', |