From d2cd20852c97418e3d6f5e66f352a333c975803c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Feb 2018 08:11:09 +0100 Subject: duplicate phpunit6 spec file --- phpunit7-rpm.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 phpunit7-rpm.patch (limited to 'phpunit7-rpm.patch') diff --git a/phpunit7-rpm.patch b/phpunit7-rpm.patch new file mode 100644 index 0000000..c03c25d --- /dev/null +++ b/phpunit7-rpm.patch @@ -0,0 +1,65 @@ +diff -up ./phpunit.rpm ./phpunit +--- ./phpunit.rpm 2017-02-07 16:05:03.325668400 +0100 ++++ ./phpunit 2017-02-07 16:09:20.442818688 +0100 +@@ -27,27 +27,27 @@ 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; +- } ++// Ensure correct include_path for RHSCL ++$inc = get_include_path(); ++$dirs = explode(':', $inc); ++if (!in_array('/usr/share/php', $dirs)) { ++ $dirs[] = '/usr/share/php'; ++ set_include_path(implode(':', $dirs)); + } ++unset ($inc, $dirs); + +-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', stream_resolve_include_path('PHPUnit6/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 2017-03-15 19:45:42.004596546 +0100 ++++ tests/bootstrap.php 2017-03-15 19:47:16.561034373 +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'; -- cgit