diff --git a/.gitignore b/.gitignore index 0dd967c..d2de14d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /phpunit9-9.5.27-a2bc7ff.tgz /phpunit9-9.5.28-954ca31.tgz /phpunit9-9.6.0-70fc8be.tgz +/phpunit9-9.6.3-e7b1615.tgz diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 0360db7..be09111 100644 --- a/phpunit9-rpm.patch +++ b/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 diff --git a/phpunit9.spec b/phpunit9.spec index ee354d6..26bd9ed 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 70fc8be1d0b9fad56a199a4df5f9cfabfc246f84 +%global gh_commit e7b1615e3e887d6c719121c6d4a44b0ab9645555 #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 9 %global ver_minor 6 -%global upstream_version 9.6.0 +%global upstream_version 9.6.3 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -252,6 +252,9 @@ exit $ret %changelog +* Mon Feb 6 2023 Remi Collet - 9.6.3-1 +- update to 9.6.3 + * Fri Feb 3 2023 Remi Collet - 9.6.0-1 - update to 9.6.0 diff --git a/sources b/sources index e45c26f..fb56990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.0-70fc8be.tgz) = ad62d12309fe317c66932e5db8a03e17ec97e513f4d831324b9e77835e281932f2e08cd5e7750f6cb88861da4a12c437df1e4c92e005185c0a02a89921a54936 +SHA512 (phpunit9-9.6.3-e7b1615.tgz) = f67253af942fa8b132288a7f3efe53924d776d223298729a7e3f4b2c50ce5b25a36e20a7909a0fb2a972ecbdeb0e4f06fb24d9a880fce01442f9e27b816ab6ca