41b785bb6a
raise dependency on phar-io/manifest 2.0.3 raise dependency on phpunit/php-file-iterator 2.0.4 (cherry picked from commit3fb51192c0) (cherry picked from commitb626eb3b6f)
89 lines
3.3 KiB
Diff
89 lines
3.3 KiB
Diff
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');
|
|
}
|
|
|
|
-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
|
|
- );
|
|
-
|
|
- 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);
|
|
|
|
require PHPUNIT_COMPOSER_INSTALL;
|
|
|
|
-PHPUnit\TextUI\Command::main();
|
|
+if (class_exists('PHPUnit_TextUI_Command')) {
|
|
+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
|
|
+} else {
|
|
+ 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
|
|
@@ -929,7 +929,7 @@ final class Configuration
|
|
private function validateConfigurationAgainstSchema(): void
|
|
{
|
|
$original = libxml_use_internal_errors(true);
|
|
- $xsdFilename = __DIR__ . '/../../phpunit.xsd';
|
|
+ $xsdFilename = __DIR__ . '/../phpunit.xsd';
|
|
|
|
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
|
|
@@ -9,8 +9,8 @@
|
|
*/
|
|
const 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;
|
|
@@ -26,10 +26,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/NamespaceCoveredFunction.php';
|
|
+ require_once '@PATH@//Framework/Assert/Functions.php';
|
|
+ require_once __DIR__ . '/autoload.php';
|
|
}
|
|
|
|
if ($phar) {
|