From aaa0dd6555e5d29c4947409af1404c6b344cf4e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 28 Feb 2023 15:12:38 +0100
Subject: [PATCH] v8.5.33

(cherry picked from commit 1594f12219963008f50b1c17f9dce5abe3c4dce5)
---
 .gitignore         |  1 +
 phpunit8-rpm.patch | 13 +++++++++----
 phpunit8.spec      | 10 ++++++++--
 sources            |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index f497c84..a062d6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ clog
 /phpunit8-8.5.30-4fd448d.tgz
 /phpunit8-8.5.31-33c126b.tgz
 /phpunit8-8.5.32-3756869.tgz
+/phpunit8-8.5.33-7d1ff0e.tgz
diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch
index 2fe8780..25cd8f0 100644
--- a/phpunit8-rpm.patch
+++ b/phpunit8-rpm.patch
@@ -33,15 +33,20 @@ diff -up ./phpunit.rpm ./phpunit
  }
  
  $options = getopt('', array('prepend:'));
-@@ -95,4 +79,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/Util/Configuration.php.rpm ./src/Util/Configuration.php
 --- ./src/Util/Configuration.php.rpm	2021-12-30 08:58:05.000000000 +0100
diff --git a/phpunit8.spec b/phpunit8.spec
index 9ead523..711ef9d 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    375686930d05c9fd7d20f6e5fc38121e8d7a9d55
+%global gh_commit    7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
@@ -25,7 +25,7 @@
 %global ver_major    8
 %global ver_minor    5
 
-%global upstream_version 8.5.32
+%global upstream_version 8.5.33
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -129,6 +129,9 @@ 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
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 8.0.0
@@ -232,6 +235,9 @@ exit $ret
 
 
 %changelog
+* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 8.5.33-1
+- update to 8.5.33
+
 * Thu Jan 26 2023 Remi Collet <remi@remirepo.net> - 8.5.32-1
 - update to 8.5.32
 
diff --git a/sources b/sources
index b644426..22322de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit8-8.5.32-3756869.tgz) = 06d531224a027d557c8463ad810f7d44e8b8ab4b79173977cfc5f8118a3260d9bebfe07b8d1a2eb201f5f327968ee8de5ae2d06bc2ab85d7d7505d9acdaeadcc
+SHA512 (phpunit8-8.5.33-7d1ff0e.tgz) = 24d801a3846cd4a49b7ad8ed76c832ca4c9c44ba084a643ac0b0a222a4dee10b44aef23aacb989804c7a8d2331fb8d43dfd0d7bdf264717b849e53c275af00c8