diff options
Diffstat (limited to 'phpunit9-rpm.patch')
| -rw-r--r-- | phpunit9-rpm.patch | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 8b70cbd..62091a4 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2019-02-01 06:41:59.000000000 +0100 -+++ ./phpunit 2019-02-01 08:43:27.079804951 +0100 +--- ./phpunit.rpm 2020-02-07 07:56:17.000000000 +0100 ++++ ./phpunit 2020-02-07 16:20:53.817753399 +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/PHPUnit8/autoload.php'); ++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit9/autoload.php'); } $options = getopt('', array('prepend:')); @@ -43,22 +43,22 @@ diff -up ./phpunit.rpm ./phpunit +} 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-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 +diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Loader.php +--- ./src/TextUI/Configuration/Loader.php.rpm 2020-02-07 07:56:17.000000000 +0100 ++++ ./src/TextUI/Configuration/Loader.php 2020-02-07 16:20:53.818753394 +0100 +@@ -194,7 +194,7 @@ final class Loader + private function validate(\DOMDocument $document): array { $original = \libxml_use_internal_errors(true); -- $xsdFilename = __DIR__ . '/../../phpunit.xsd'; -+ $xsdFilename = __DIR__ . '/../phpunit.xsd'; +- $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-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')) { +--- ./tests/bootstrap.php.rpm 2020-02-07 16:21:18.097630840 +0100 ++++ ./tests/bootstrap.php 2020-02-07 16:22:12.237357522 +0100 +@@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) { \ini_set('precision', '14'); \ini_set('serialize_precision', '14'); @@ -67,5 +67,4 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.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'; |