From a744836547c990d67d57a021662841ce930a788b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Feb 2019 07:51:55 +0100 Subject: duplicate phpunit7 spec --- phpunit8-rpm.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 phpunit8-rpm.patch (limited to 'phpunit8-rpm.patch') diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch new file mode 100644 index 0000000..bb75e19 --- /dev/null +++ b/phpunit8-rpm.patch @@ -0,0 +1,71 @@ +diff -up ./phpunit.rpm ./phpunit +--- ./phpunit.rpm 2019-01-15 09:19:08.000000000 +0100 ++++ ./phpunit 2019-01-15 11:49:08.859885786 +0100 +@@ -27,25 +27,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/PHPUnit7/autoload.php'); + } + + $options = getopt('', array('prepend:')); +@@ -58,4 +45,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 2019-01-15 09:19:08.000000000 +0100 ++++ ./src/Util/Configuration.php 2019-01-15 11:49:08.859885786 +0100 +@@ -1025,7 +1025,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 2019-01-15 11:49:08.859885786 +0100 ++++ ./tests/bootstrap.php 2019-01-15 11:50:12.567276300 +0100 +@@ -14,4 +14,9 @@ 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/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'; -- cgit