v8.5.34

(cherry picked from commit ddfe64f3b9)
(cherry picked from commit ab70fe2108)

.gitignore

@@ -25,3 +25,6 @@ clog
 /phpunit8-8.5.29-e8c563c.tgz
 /phpunit8-8.5.30-4fd448d.tgz
 /phpunit8-8.5.31-33c126b.tgz
+/phpunit8-8.5.32-3756869.tgz
+/phpunit8-8.5.33-7d1ff0e.tgz
+/phpunit8-8.5.34-622d018.tgz

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')) {
++if (class_exists('PHPUnit\\TextUI\\Application')) {
-+    PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
++    // 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

phpunit8.spec

@@ -1,17 +1,15 @@
 # remirepo/fedora spec file for phpunit8
 #
-# Copyright (c) 2010-2022 Remi Collet
+# Copyright (c) 2010-2023 Remi Collet
 #
-# License: CC-BY-SA
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
-# For compatibility with SCL
-%undefine __brp_mangle_shebangs
 
-%global gh_commit    33c126b09a42de5c99e5e8032b54e8221264a74e
+%global gh_commit    622d0186707f39a4ae71df3bcf42d759bb868854
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
@@ -25,7 +23,7 @@
 %global ver_major    8
 %global ver_minor    5
 
-%global upstream_version 8.5.31
+%global upstream_version 8.5.34
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -33,7 +31,7 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}
 Summary:        The PHP Unit Testing framework version %{ver_major}
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{upstream_version}-%{gh_short}.tgz
 Source1:        makesrc.sh
@@ -129,6 +127,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
@@ -152,7 +153,7 @@ Documentation: https://phpunit.readthedocs.io/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p0 -b .rpm
+%patch -P0 -p0 -b .rpm
 
 
 %build
@@ -215,7 +216,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php
 sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit
 
 ret=0
-for cmd in php php74 php80 php81 php82; do
+for cmd in php php80 php81 php82 php83; do
   if which $cmd; then
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
@@ -232,6 +233,15 @@ exit $ret
 
 
 %changelog
+* Tue Sep 19 2023 Remi Collet <remi@remirepo.net> - 8.5.34-1
+- update to 8.5.34
+
+* 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
+
 * Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 8.5.31-1
 - update to 8.5.31
 

sources

@@ -1 +1 @@
-SHA512 (phpunit8-8.5.31-33c126b.tgz) = aa283613dd79b2d972f3c75901b22f32d3261623089f94810ab73ecee23d94b8dc2e8307d91ec5f8eb248207cd6bdd6333bb80d16815248b2d6a018808268acb
+SHA512 (phpunit8-8.5.34-622d018.tgz) = f012d3dbd68bb9e1ac1a8cecfd8d8b03593b423b3e83b2661c30904928e5023fb52760d0a865b88e21c737ffd8c285d99d7640df476b6579e9fa0ea7813e25c8