diff -up ./phpunit.rpm ./phpunit --- ./phpunit.rpm 2018-02-02 06:04:08.000000000 +0100 +++ ./phpunit 2018-02-02 10:25:26.281085072 +0100 @@ -27,27 +27,18 @@ 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/PHPUnit7/autoload.php'); } 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 ./tests/bootstrap.php.rpm ./tests/bootstrap.php --- ./tests/bootstrap.php.rpm 2018-02-02 06:04:08.000000000 +0100 +++ ./tests/bootstrap.php 2018-02-02 10:24:37.643848378 +0100 @@ -6,7 +6,10 @@ if (!defined('TEST_FILES_PATH')) { ini_set('precision', 14); ini_set('serialize_precision', 14); -require_once __DIR__ . '/../vendor/autoload.php'; +require_once '@PATH@/autoload.php'; +require_once __DIR__ . '/_files/CoveredFunction.php'; +require_once '@PATH@/Framework/Assert/Functions.php'; +require_once __DIR__ . '/autoload.php'; // TODO: Figure out why (some of) these are required (the classes should be autoloaded instead) require_once TEST_FILES_PATH . 'BeforeAndAfterTest.php';