diff options
| -rw-r--r-- | phpunit8-rpm.patch | 42 | ||||
| -rw-r--r-- | phpunit8.spec | 9 |
2 files changed, 27 insertions, 24 deletions
diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 12bef82..2fe8780 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,19 +1,24 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200 -+++ ./phpunit 2021-08-02 08:34:41.313976887 +0200 -@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } +--- ./phpunit.rpm 2021-12-30 08:58:05.000000000 +0100 ++++ ./phpunit 2021-12-30 09:01:08.095425016 +0100 +@@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p + define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); --foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { -- if (file_exists($file)) { -- define('PHPUNIT_COMPOSER_INSTALL', $file); + unset($GLOBALS['_composer_autoload_path']); ++} else if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) { ++ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n"; ++ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php')); + } else { +- foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { +- if (file_exists($file)) { +- define('PHPUNIT_COMPOSER_INSTALL', $file); - -- break; +- break; +- } - } --} - --unset($file); +- unset($file); +-} - -if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( @@ -24,16 +29,11 @@ diff -up ./phpunit.rpm ./phpunit - ); - - die(1); -+// Libraries PATH -+if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) { -+ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n"; -+ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php')); -+} else { + define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit8/autoload.php'); } $options = getopt('', array('prepend:')); -@@ -89,4 +76,8 @@ unset($options); +@@ -95,4 +79,8 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2021-08-02 08:27:58.000000000 +0200 -+++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200 +--- ./src/Util/Configuration.php.rpm 2021-12-30 08:58:05.000000000 +0100 ++++ ./src/Util/Configuration.php 2021-12-30 08:58:11.290733945 +0100 @@ -929,7 +929,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { @@ -56,8 +56,8 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php if (defined('__PHPUNIT_PHAR_ROOT__')) { $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-08-02 08:27:58.000000000 +0200 -+++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200 +--- ./tests/bootstrap.php.rpm 2021-12-30 08:58:05.000000000 +0100 ++++ ./tests/bootstrap.php 2021-12-30 08:58:11.290733945 +0100 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit8.spec b/phpunit8.spec index a5cd1d9..4a68331 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984 +%global gh_commit ddd05b9d844260353895a3b950a9258126c11503 #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.21 +%global upstream_version 8.5.22 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -264,7 +264,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 php72 php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -283,6 +283,9 @@ exit $ret %changelog +* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 8.5.22-1 +- update to 8.5.22 + * Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 8.5.21-1 - update to 8.5.21 |