diff options
| -rw-r--r-- | phpunit9-rpm.patch | 42 | ||||
| -rw-r--r-- | phpunit9.spec | 11 |
2 files changed, 28 insertions, 25 deletions
diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index d52fde6..0360db7 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,19 +1,24 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-08-02 09:09:31.000000000 +0200 -+++ ./phpunit 2021-08-02 09:09:33.927568458 +0200 -@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } +--- ./phpunit.rpm 2021-12-30 09:04:15.000000000 +0100 ++++ ./phpunit 2021-12-30 09:05:07.774778660 +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/PHPUnit9/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/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2021-08-02 09:09:31.000000000 +0200 -+++ ./src/Util/Xml/SchemaFinder.php 2021-08-02 09:09:33.927568458 +0200 +--- ./src/Util/Xml/SchemaFinder.php.rpm 2021-12-30 09:04:15.000000000 +0100 ++++ ./src/Util/Xml/SchemaFinder.php 2021-12-30 09:04:21.186910890 +0100 @@ -48,6 +48,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -55,8 +55,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-08-02 09:09:33.928568455 +0200 -+++ ./tests/bootstrap.php 2021-08-02 09:10:37.377383177 +0200 +--- ./tests/bootstrap.php.rpm 2021-12-30 09:04:15.000000000 +0100 ++++ ./tests/bootstrap.php 2021-12-30 09:04:21.186910890 +0100 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit9.spec b/phpunit9.spec index 97fc06c..53013ee 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c814a05837f2edb0d1471d6e3f4ab3501ca3899a +%global gh_commit 2406855036db1102126125537adb1406f7242fdd #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 5 -%global upstream_version 9.5.10 +%global upstream_version 9.5.11 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -34,7 +34,7 @@ Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD -URL: https://github.com/%{gh_vendor}/%{gh_project} +URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh @@ -284,7 +284,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 php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -303,6 +303,9 @@ exit $ret %changelog +* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 9.5.11-1 +- update to 9.5.11 + * Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 9.5.10-1 - update to 9.5.10 - raise dependency on phpunit/php-code-coverage 9.2.7 |