diff -up ./phpunit.rpm ./phpunit --- ./phpunit.rpm 2015-01-17 12:24:41.000000000 +0100 +++ ./phpunit 2015-01-18 08:52:50.896228541 +0100 @@ -13,24 +13,7 @@ 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 the following commands:' . PHP_EOL . - 'wget http://getcomposer.org/composer.phar' . PHP_EOL . - 'php composer.phar install' . PHP_EOL - ); - die(1); -} - +define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php')); require PHPUNIT_COMPOSER_INSTALL; PHPUnit_TextUI_Command::main(); diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php --- ./tests/bootstrap.php.rpm 2015-01-17 12:24:41.000000000 +0100 +++ ./tests/bootstrap.php 2015-01-18 08:51:55.668966689 +0100 @@ -1,6 +1,9 @@