diff options
| -rw-r--r-- | phpunit10-rpm.patch | 29 | ||||
| -rw-r--r-- | phpunit10.spec | 9 |
2 files changed, 25 insertions, 13 deletions
diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index ac79d54..fa07a47 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-02-26 09:36:05.000000000 +0100 -+++ ./phpunit 2024-03-06 10:22:28.176494758 +0100 +--- ./phpunit.rpm 2024-03-21 10:34:01.000000000 +0100 ++++ ./phpunit 2024-03-21 14:02:24.892294049 +0100 @@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -50,8 +50,8 @@ 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-03-06 10:23:20.003477445 +0100 -+++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-03-06 10:24:42.157620333 +0100 +--- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-03-21 10:34:01.000000000 +0100 ++++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-03-21 14:02:53.539493026 +0100 @@ -24,7 +24,7 @@ final class VersionCheckCommand implemen public function execute(): Result { @@ -61,11 +61,20 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ $notLatest = version_compare($latestVersion, Version::id(), '>'); $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); +@@ -35,7 +35,7 @@ final class VersionCheckCommand implemen + ); + } + +- $buffer = 'You are not using the latest version of PHPUnit.' . PHP_EOL; ++ $buffer = 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL; + + if ($notLatestCompatible) { + $buffer .= sprintf( @@ -43,6 +43,7 @@ final class VersionCheckCommand implemen Version::id(), $latestCompatibleVersion, ); -+ $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); ++ $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); } if ($notLatest) { @@ -73,13 +82,13 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ 'The latest version is PHPUnit %s.' . PHP_EOL, $latestVersion, ); -+ $buffer .= sprintf('Try to install and use the phpunit%s command.' . PHP_EOL, explode('.', $latestVersion)[0]); ++ $buffer .= sprintf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); } return Result::from($buffer); diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php ---- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-02-26 09:36:05.000000000 +0100 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-03-06 10:22:28.177494796 +0100 +--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-03-21 10:34:01.000000000 +0100 ++++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-03-21 14:02:24.893294091 +0100 @@ -75,6 +75,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -89,8 +98,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-02-26 09:36:05.000000000 +0100 -+++ ./tests/bootstrap.php 2024-03-06 10:22:28.177494796 +0100 +--- ./tests/bootstrap.php.rpm 2024-03-21 10:34:01.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-21 14:02:24.893294091 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } diff --git a/phpunit10.spec b/phpunit10.spec index 36d8381..09d4d89 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -20,8 +20,8 @@ %bcond_with defcmd %endif -%global gh_commit 4cf8824bab39c2dd57b57b9f6332f7135e2a3a49 -%global gh_date 2024-03-21 +%global gh_commit 86376e05e8745ed81d88232ff92fee868247b07b +%global gh_date 2024-03-22 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -34,7 +34,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.14 +%global upstream_version 10.5.15 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -323,6 +323,9 @@ exit $ret %changelog +* Fri Mar 22 2024 Remi Collet <remi@remirepo.net> - 10.5.15-1 +- update to 10.5.15 + * Thu Mar 21 2024 Remi Collet <remi@remirepo.net> - 10.5.14-1 - update to 10.5.14 |