v9.6.13

(cherry picked from commit 55903c3bfb)

.gitignore

@@ -37,3 +37,15 @@
 /phpunit9-9.5.26-851867e.tgz
 /phpunit9-9.5.27-a2bc7ff.tgz
 /phpunit9-9.5.28-954ca31.tgz
+/phpunit9-9.6.0-70fc8be.tgz
+/phpunit9-9.6.3-e7b1615.tgz
+/phpunit9-9.6.4-9125ee0.tgz
+/phpunit9-9.6.5-86e7619.tgz
+/phpunit9-9.6.6-b65d59a.tgz
+/phpunit9-9.6.7-c993f0d.tgz
+/phpunit9-9.6.8-17d621b.tgz
+/phpunit9-9.6.9-a9aceaf.tgz
+/phpunit9-9.6.10-a6d3516.tgz
+/phpunit9-9.6.11-810500e.tgz
+/phpunit9-9.6.12-a122c2e.tgz
+/phpunit9-9.6.13-f3d767f.tgz

phpunit9-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/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php
 --- ./src/Util/Xml/SchemaFinder.php.rpm	2021-12-30 09:04:15.000000000 +0100

phpunit9.spec

@@ -1,17 +1,15 @@
 # remirepo/fedora spec file for phpunit9
 #
-# 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    954ca3113a03bf780d22f07bf055d883ee04b65e
+%global gh_commit    f3d767f7f9e191eab4189abe41ab37797e30b1be
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
@@ -23,9 +21,9 @@
 %global ns_vendor    PHPUnit9
 %global php_home     %{_datadir}/php
 %global ver_major    9
-%global ver_minor    5
+%global ver_minor    6
 
-%global upstream_version 9.5.28
+%global upstream_version 9.6.13
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -85,7 +83,7 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 #        "myclabs/deep-copy": "^1.10.1",
 #        "phar-io/manifest": "^2.0.3",
 #        "phar-io/version": "^3.0.2",
-#        "phpunit/php-code-coverage": "^9.2.13",
+#        "phpunit/php-code-coverage": "^9.2.28",
 #        "phpunit/php-file-iterator": "^3.0.5",
 #        "phpunit/php-invoker": "^3.1.1",
 #        "phpunit/php-text-template": "^2.0.3",
@@ -114,7 +112,7 @@ Requires:       (php-composer(myclabs/deep-copy) >= 1.10.1            with php-c
 Requires:       (php-composer(phar-io/manifest) >= 2.0.3              with php-composer(phar-io/manifest) < 3)
 Requires:       (php-composer(phar-io/version) >= 3.0.2               with php-composer(phar-io/version) < 4)
 Requires:       (php-composer(phpspec/prophecy) >= 1.12.1             with php-composer(phpspec/prophecy) <  2)
-Requires:       (php-composer(phpunit/php-code-coverage) >= 9.2.13    with php-composer(phpunit/php-code-coverage) <  10)
+Requires:       (php-composer(phpunit/php-code-coverage) >= 9.2.28    with php-composer(phpunit/php-code-coverage) <  10)
 Requires:       (php-composer(phpunit/php-file-iterator) >= 3.0.4     with php-composer(phpunit/php-file-iterator) <  4)
 Requires:       (php-composer(phpunit/php-invoker) >= 3.1             with php-composer(phpunit/php-invoker) <  4)
 Requires:       (php-composer(phpunit/php-text-template) >= 2.0.2     with php-composer(phpunit/php-text-template) <  3)
@@ -135,6 +133,8 @@ Requires:       (php-composer(sebastian/version) >= 3.0.1             with php-c
 #        "ext-xdebug": "*"
 Suggests:       php-soap
 Suggests:       php-xdebug
+# recommends latest versions
+Recommends:     phpunit10
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 8.0.0
@@ -158,7 +158,7 @@ Documentation: https://phpunit.readthedocs.io/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p0 -b .rpm
+%patch -P0 -p0 -b .rpm
 
 find . -name \*.rpm -delete -print
 
@@ -184,6 +184,7 @@ if (PHP_VERSION_ID > 80100) {
     '%{php_home}/SebastianBergmann/FileIterator3/autoload.php',
     '%{php_home}/SebastianBergmann/Template2/autoload.php',
     '%{php_home}/SebastianBergmann/Timer5/autoload.php',
+    $inst,
     '%{php_home}/Prophecy/autoload.php',
     '%{php_home}/SebastianBergmann/CliParser/autoload.php',
     '%{php_home}/SebastianBergmann/CodeUnit/autoload.php',
@@ -197,7 +198,6 @@ if (PHP_VERSION_ID > 80100) {
     '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php',
     '%{php_home}/SebastianBergmann/Type3/autoload.php',
     '%{php_home}/SebastianBergmann/Version3/autoload.php',
-    $inst,
     '%{php_home}/DeepCopy/autoload.php',
     '%{php_home}/PharIo/Manifest2/autoload.php',
     '%{php_home}/PharIo/Version3/autoload.php',
@@ -235,7 +235,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 php80 php81 php82; do
+for cmd in php php80 php81 php82 php83; do
   if which $cmd; then
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
@@ -252,6 +252,43 @@ exit $ret
 
 
 %changelog
+* Tue Sep 19 2023 Remi Collet <remi@remirepo.net> - 9.6.13-1
+- update to 9.6.13
+
+* Wed Sep 13 2023 Remi Collet <remi@remirepo.net> - 9.6.12-1
+- update to 9.6.12
+- raise dependency on phpunit/php-code-coverage 9.2.28
+
+* Sun Aug 20 2023 Remi Collet <remi@remirepo.net> - 9.6.11-1
+- update to 9.6.11
+
+* Mon Jul 10 2023 Remi Collet <remi@remirepo.net> - 9.6.10-1
+- update to 9.6.10
+
+* Mon Jun 12 2023 Remi Collet <remi@remirepo.net> - 9.6.9-1
+- update to 9.6.9
+
+* Thu May 11 2023 Remi Collet <remi@remirepo.net> - 9.6.8-1
+- update to 9.6.8
+
+* Fri Apr 14 2023 Remi Collet <remi@remirepo.net> - 9.6.7-1
+- update to 9.6.7
+
+* Mon Mar 27 2023 Remi Collet <remi@remirepo.net> - 9.6.6-1
+- update to 9.6.6
+
+* Thu Mar  9 2023 Remi Collet <remi@remirepo.net> - 9.6.5-1
+- update to 9.6.5
+
+* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 9.6.4-1
+- update to 9.6.4
+
+* Mon Feb  6 2023 Remi Collet <remi@remirepo.net> - 9.6.3-1
+- update to 9.6.3
+
+* Fri Feb  3 2023 Remi Collet <remi@remirepo.net> - 9.6.0-1
+- update to 9.6.0
+
 * Mon Jan 16 2023 Remi Collet <remi@remirepo.net> - 9.5.28-1
 - update to 9.5.28
 - allow doctrine/instantiator v2

sources

@@ -1 +1 @@
-SHA512 (phpunit9-9.5.28-954ca31.tgz) = 5c12e28e2b0add0e4a3683b7a7e27c6bbfe9a195d1c2f3c9ff1630b325a19894b237ed8f29c62e32b8c3ba20213cb0a940089336d689e8cfa5f704be58be06c7
+SHA512 (phpunit9-9.6.13-f3d767f.tgz) = 964c90ef08cd50034992b958e2c32f832ea02c00447ab01016e02df83235bffc234d5795eae255a6f0ad35685b31751a2a3ff23a133feec896a9865106a25885