update to 9.6.19

2 files changed, 26 insertions, 16 deletions

diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch
index e9698bf..7e082fe 100644
--- a/phpunit9-rpm.patch
+++ b/phpunit9-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2024-02-26 09:34:48.000000000 +0100
-+++ ./phpunit	2024-03-06 10:19:22.109376592 +0100
+--- ./phpunit.rpm	2024-03-21 13:50:22.000000000 +0100
++++ ./phpunit	2024-03-21 13:59:15.659377103 +0100
 @@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p
      define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
  
@@ -49,9 +49,9 @@ diff -up ./phpunit.rpm ./phpunit
 +    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
+--- ./src/TextUI/Command.php.rpm	2024-03-21 13:50:22.000000000 +0100
++++ ./src/TextUI/Command.php	2024-03-21 13:59:59.517211974 +0100
+@@ -601,13 +601,13 @@ class Command
          $this->printVersionString();
  
          $latestVersion           = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit');
@@ -60,25 +60,32 @@ diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php
  
          $notLatest           = version_compare($latestVersion, Version::id(), '>');
          $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>');
-@@ -617,6 +617,7 @@ class Command
+ 
+         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;
+         }
+@@ -618,6 +618,7 @@ class Command
                  Version::id(),
                  $latestCompatibleVersion,
              );
-+            printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major);
++            printf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major);
          }
  
          if ($notLatest) {
-@@ -624,6 +625,7 @@ class Command
+@@ -625,6 +626,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]);
++            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/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php
---- ./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
+--- ./src/Util/Xml/SchemaFinder.php.rpm	2024-03-21 13:50:22.000000000 +0100
++++ ./src/Util/Xml/SchemaFinder.php	2024-03-21 13:59:15.659377103 +0100
 @@ -75,6 +75,6 @@ final class SchemaFinder
              return __PHPUNIT_PHAR_ROOT__ . '/';
          }
@@ -88,8 +95,8 @@ 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	2024-02-26 09:34:48.000000000 +0100
-+++ ./tests/bootstrap.php	2024-03-06 10:19:22.109376592 +0100
+--- ./tests/bootstrap.php.rpm	2024-03-21 13:50:22.000000000 +0100
++++ ./tests/bootstrap.php	2024-03-21 13:59:15.659377103 +0100
 @@ -9,8 +9,8 @@
   */
  const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
diff --git a/phpunit9.spec b/phpunit9.spec
index 3f7e469..2a1ee78 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -12,8 +12,8 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04
-%global gh_date      2024-03-21
+%global gh_commit    a1a54a473501ef4cdeaae4e06891674114d79db8
+%global gh_date      2024-04-05
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
@@ -26,7 +26,7 @@
 %global ver_major    9
 %global ver_minor    6
 
-%global upstream_version 9.6.18
+%global upstream_version 9.6.19
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -319,6 +319,9 @@ exit $ret
 
 
 %changelog
+* Fri Apr  5 2024 Remi Collet <remi@remirepo.net> - 9.6.19-1
+- update to 9.6.19
+
 * Thu Mar 21 2024 Remi Collet <remi@remirepo.net> - 9.6.18-1
 - update to 9.6.18