summaryrefslogtreecommitdiffstats
path: root/phpunit10-rpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'phpunit10-rpm.patch')
-rw-r--r--phpunit10-rpm.patch54
1 files changed, 29 insertions, 25 deletions
diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch
index 0360db7..1ce77f1 100644
--- a/phpunit10-rpm.patch
+++ b/phpunit10-rpm.patch
@@ -1,14 +1,11 @@
diff -up ./phpunit.rpm ./phpunit
---- ./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
+--- ./phpunit.rpm 2023-02-03 16:32:47.889941148 +0100
++++ ./phpunit 2023-02-03 16:41:15.850841011 +0100
+@@ -62,29 +62,25 @@ if (isset($GLOBALS['_composer_autoload_p
define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
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 {
+-} 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);
@@ -19,7 +16,7 @@ diff -up ./phpunit.rpm ./phpunit
-
- unset($file);
-}
--
+
-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
- fwrite(
- STDERR,
@@ -27,25 +24,32 @@ diff -up ./phpunit.rpm ./phpunit
- ' composer install' . PHP_EOL . PHP_EOL .
- 'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL
- );
--
++} 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'));
+
- die(1);
-+ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit9/autoload.php');
++} else {
++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit10/autoload.php');
}
- $options = getopt('', array('prepend:'));
-@@ -95,4 +79,8 @@ unset($options);
-
require PHPUNIT_COMPOSER_INSTALL;
--PHPUnit\TextUI\Command::main();
-+if (class_exists('PHPUnit_TextUI_Command')) {
-+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
+-exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv']));
++
++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
-+++ ./src/Util/Xml/SchemaFinder.php 2021-12-30 09:04:21.186910890 +0100
+--- ./src/Util/Xml/SchemaFinder.php.rpm 2023-02-03 10:51:19.000000000 +0100
++++ ./src/Util/Xml/SchemaFinder.php 2023-02-03 16:32:47.889941148 +0100
@@ -48,6 +48,6 @@ final class SchemaFinder
return __PHPUNIT_PHAR_ROOT__ . '/';
}
@@ -55,11 +59,11 @@ 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 2021-12-30 09:04:21.186910890 +0100
-@@ -9,8 +9,8 @@
- */
- const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
+--- ./tests/bootstrap.php.rpm 2023-02-03 10:51:19.000000000 +0100
++++ ./tests/bootstrap.php 2023-02-03 16:42:03.557642693 +0100
+@@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) {
+ define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR);
+ }
-$composer = file_exists(__DIR__ . '/../vendor/autoload.php');
-$phar = file_exists(__DIR__ . '/autoload.php');
@@ -68,7 +72,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
if ($composer && $phar) {
print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL;
-@@ -26,10 +26,14 @@ if (!$composer && !$phar) {
+@@ -28,10 +28,14 @@ if (!$composer && !$phar) {
if ($composer) {
if (!defined('PHPUNIT_COMPOSER_INSTALL')) {