92 lines
3.5 KiB
Diff
92 lines
3.5 KiB
Diff
diff -up ./phpunit.rpm ./phpunit
|
|
--- ./phpunit.rpm 2023-04-14 10:47:29.000000000 +0200
|
|
+++ ./phpunit 2023-04-14 10:49:23.217236377 +0200
|
|
@@ -71,29 +71,25 @@ if (isset($GLOBALS['_composer_autoload_p
|
|
define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
|
|
|
|
unset($GLOBALS['_composer_autoload_path']);
|
|
-} 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;
|
|
- }
|
|
- }
|
|
-
|
|
- unset($file);
|
|
-}
|
|
|
|
-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
|
|
- fwrite(
|
|
- STDERR,
|
|
- 'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL .
|
|
- ' 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);
|
|
+} else {
|
|
+ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit10/autoload.php');
|
|
}
|
|
|
|
require PHPUNIT_COMPOSER_INSTALL;
|
|
|
|
-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 v6 to v9
|
|
+ PHPUnit\TextUI\Command::main();
|
|
+}
|
|
diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php
|
|
--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2023-04-14 10:51:13.796036447 +0200
|
|
+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2023-04-14 10:53:03.227838557 +0200
|
|
@@ -48,6 +48,6 @@ final class SchemaFinder
|
|
return __PHPUNIT_PHAR_ROOT__ . '/';
|
|
}
|
|
|
|
- return __DIR__ . '/../../../../';
|
|
+ return __DIR__ . '/../../../';
|
|
}
|
|
}
|
|
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
|
|
--- ./tests/bootstrap.php.rpm 2023-04-14 10:47:29.000000000 +0200
|
|
+++ ./tests/bootstrap.php 2023-04-14 10:49:23.217236377 +0200
|
|
@@ -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');
|
|
+$composer = true;
|
|
+$phar = false;
|
|
|
|
if ($composer && $phar) {
|
|
print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL;
|
|
@@ -28,10 +28,15 @@ if (!$composer && !$phar) {
|
|
|
|
if ($composer) {
|
|
if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
|
|
- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
|
|
+ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php');
|
|
}
|
|
|
|
- require_once __DIR__ . '/../vendor/autoload.php';
|
|
+ require_once PHPUNIT_COMPOSER_INSTALL;
|
|
+ require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php';
|
|
+ require_once __DIR__ . '/_files/CoveredFunction.php';
|
|
+ require_once __DIR__ . '/_files/Generator.php';
|
|
+ require_once __DIR__ . '/_files/NamespaceCoveredFunction.php';
|
|
+ require_once __DIR__ . '/autoload.php';
|
|
}
|
|
|
|
if ($phar) {
|