diff options
Diffstat (limited to 'phpunit8-rpm.patch')
-rw-r--r-- | phpunit8-rpm.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index bb75e19..8b70cbd 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2019-01-15 09:19:08.000000000 +0100 -+++ ./phpunit 2019-01-15 11:49:08.859885786 +0100 +--- ./phpunit.rpm 2019-02-01 06:41:59.000000000 +0100 ++++ ./phpunit 2019-02-01 08:43:27.079804951 +0100 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -29,7 +29,7 @@ diff -up ./phpunit.rpm ./phpunit + 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'); ++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit8/autoload.php'); } $options = getopt('', array('prepend:')); @@ -44,9 +44,9 @@ diff -up ./phpunit.rpm ./phpunit + 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 +--- ./src/Util/Configuration.php.rpm 2019-02-01 06:41:59.000000000 +0100 ++++ ./src/Util/Configuration.php 2019-02-01 08:43:27.079804951 +0100 +@@ -899,7 +899,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { $original = \libxml_use_internal_errors(true); @@ -56,11 +56,11 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php 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 +--- ./tests/bootstrap.php.rpm 2019-02-01 08:43:27.080804957 +0100 ++++ ./tests/bootstrap.php 2019-02-01 08:44:59.691284599 +0100 @@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) { - \ini_set('precision', 14); - \ini_set('serialize_precision', 14); + \ini_set('precision', '14'); + \ini_set('serialize_precision', '14'); -require_once __DIR__ . '/../vendor/autoload.php'; +require_once '@PATH@/autoload.php'; |