v9.6.21

(cherry picked from commit a9eb9225d1)

.gitignore

@@ -52,3 +52,8 @@
 /phpunit9-9.6.14-43653e6.tgz
 /phpunit9-9.6.15-05017b8.tgz
 /phpunit9-9.6.16-3767b2c.tgz
+/phpunit9-9.6.17-1a15698.tgz
+/phpunit9-9.6.18-32c2c2d.tgz
+/phpunit9-9.6.19-a1a54a4.tgz
+/phpunit9-9.6.20-49d7820.tgz
+/phpunit9-9.6.21-de6abf3.tgz

makesrc.sh

@@ -8,6 +8,8 @@ VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
+DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
+
 if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
 	echo "$NAME-$VERSION-$SHORT.tgz already there"
 else
@@ -15,11 +17,11 @@ else
 
 	echo "Cloning..."
 	rm -rf $PROJECT-$COMMIT
-	git clone --jobs 8 https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
 
 	echo "Getting commit..."
 	pushd $PROJECT-$COMMIT
-		git checkout $COMMIT || exit1
+		git checkout $COMMIT || exit 1
 		cp composer.json ../composer.json
 	popd
 

phpunit9-rpm.patch

@@ -1,7 +1,7 @@
 diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2021-12-30 09:04:15.000000000 +0100
+--- ./phpunit.rpm	2024-03-21 13:50:22.000000000 +0100
-+++ ./phpunit	2021-12-30 09:05:07.774778660 +0100
++++ ./phpunit	2024-03-21 13:59:15.659377103 +0100
-@@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p
+@@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p
      define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
  
      unset($GLOBALS['_composer_autoload_path']);
@@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit
  }
  
  $options = getopt('', array('prepend:'));
-@@ -95,4 +79,13 @@ unset($options);
+@@ -104,4 +88,13 @@ unset($options);
  
  require PHPUNIT_COMPOSER_INSTALL;
  
@@ -48,10 +48,45 @@ diff -up ./phpunit.rpm ./phpunit
 +    // PHPUnit v6 to v9
 +    PHPUnit\TextUI\Command::main();
 +}
+diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php
+--- ./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');
+-        $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . explode('.', Version::series())[0]);
++        $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=explode('.', Version::series())[0]);
+ 
+         $notLatest           = version_compare($latestVersion, Version::id(), '>');
+         $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>');
+ 
+         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 . PHP_EOL, $major);
+         }
+ 
+         if ($notLatest) {
+@@ -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 . 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	2021-12-30 09:04:15.000000000 +0100
+--- ./src/Util/Xml/SchemaFinder.php.rpm	2024-03-21 13:50:22.000000000 +0100
-+++ ./src/Util/Xml/SchemaFinder.php	2021-12-30 09:04:21.186910890 +0100
++++ ./src/Util/Xml/SchemaFinder.php	2024-03-21 13:59:15.659377103 +0100
-@@ -48,6 +48,6 @@ final class SchemaFinder
+@@ -75,6 +75,6 @@ final class SchemaFinder
              return __PHPUNIT_PHAR_ROOT__ . '/';
          }
  
@@ -60,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	2021-12-30 09:04:15.000000000 +0100
+--- ./tests/bootstrap.php.rpm	2024-03-21 13:50:22.000000000 +0100
-+++ ./tests/bootstrap.php	2021-12-30 09:04:21.186910890 +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;

phpunit9.spec

@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for phpunit9
 #
-# Copyright (c) 2010-2023 Remi Collet
+# Copyright (c) 2010-2024 Remi Collet
 #
 # License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
@@ -9,8 +9,8 @@
 #
 
 
-%global gh_commit    3767b2c56ce02d01e3491046f33466a1ae60a37f
+%global gh_commit    de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa
-%global gh_date      2024-01-19
+%global gh_date      2024-09-19
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
@@ -23,7 +23,7 @@
 %global ver_major    9
 %global ver_minor    6
 
-%global upstream_version 9.6.16
+%global upstream_version 9.6.21
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -135,6 +135,10 @@ Suggests:       php-soap
 Suggests:       php-xdebug
 # recommends latest versions
 Recommends:     phpunit10
+# Fedora 38+ only until 8.1 EOL
+%if 0%{?fedora} >= 38
+Recommends:     phpunit11
+%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 8.0.0
@@ -241,7 +245,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 php81 php82 php83; do
+for cmd in php php81 php82 php83 php84; do
   if which $cmd; then
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
@@ -258,6 +262,15 @@ exit $ret
 
 
 %changelog
+* Thu Sep 19 2024 Remi Collet <remi@remirepo.net> - 9.6.21-1
+- update to 9.6.21
+
+* Thu Mar 21 2024 Remi Collet <remi@remirepo.net> - 9.6.18-1
+- update to 9.6.18
+
+* Mon Feb 26 2024 Remi Collet <remi@remirepo.net> - 9.6.17-1
+- update to 9.6.17
+
 * Fri Jan 19 2024 Remi Collet <remi@remirepo.net> - 9.6.16-1
 - update to 9.6.16
 

sources

@@ -1 +1 @@
-SHA512 (phpunit9-9.6.16-3767b2c.tgz) = 315ab73ffcb1e071eb2d4adc3debc206835e85484e9cd8d3c3f2a00649c8184dafdde95deb3afe7d67f3c0ca2b5e27146a92754def54200ae03ddb2ba87a010e
+SHA512 (phpunit9-9.6.21-de6abf3.tgz) = 192171cf1686e171d74264de84666423c506440f2ee790260e88e79c9bb497d394f334f62a1e3175907a98ef41cb8a7770fa6853f61e56efb8eba88f4ad0df4e