diff options
Diffstat (limited to 'phpunit9-rpm.patch')
| -rw-r--r-- | phpunit9-rpm.patch | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index d3c313b..d52fde6 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-06-07 07:17:56.000000000 +0200 -+++ ./phpunit 2021-06-07 07:18:25.769837276 +0200 -@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { +--- ./phpunit.rpm 2021-08-02 09:09:31.000000000 +0200 ++++ ./phpunit 2021-08-02 09:09:33.927568458 +0200 +@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -58,4 +45,8 @@ unset($options); +@@ -89,4 +76,8 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2021-06-07 07:17:56.000000000 +0200 -+++ ./src/Util/Xml/SchemaFinder.php 2021-06-07 07:18:25.769837276 +0200 +--- ./src/Util/Xml/SchemaFinder.php.rpm 2021-08-02 09:09:31.000000000 +0200 ++++ ./src/Util/Xml/SchemaFinder.php 2021-08-02 09:09:33.927568458 +0200 @@ -48,6 +48,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -55,22 +55,33 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-06-07 07:18:25.769837276 +0200 -+++ ./tests/bootstrap.php 2021-06-07 07:19:32.888583752 +0200 -@@ -8,7 +8,7 @@ - * file that was distributed with this source code. +--- ./tests/bootstrap.php.rpm 2021-08-02 09:09:33.928568455 +0200 ++++ ./tests/bootstrap.php 2021-08-02 09:10:37.377383177 +0200 +@@ -9,8 +9,8 @@ */ - if (!defined('PHPUNIT_COMPOSER_INSTALL')) { -- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); -+ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); - } + const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; + +-$composer = file_exists(__DIR__ . '/../vendor/autoload.php'); +-$phar = file_exists(__DIR__ . '/autoload.php'); ++$composer = true; ++$phar = false; + + if ($composer && $phar) { + print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL; +@@ -26,10 +26,14 @@ if (!$composer && !$phar) { - if (!defined('TEST_FILES_PATH')) { -@@ -19,3 +19,7 @@ ini_set('precision', '14'); - ini_set('serialize_precision', '14'); + if ($composer) { + if (!defined('PHPUNIT_COMPOSER_INSTALL')) { +- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); ++ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); + } + +- require_once __DIR__ . '/../vendor/autoload.php'; ++ require_once PHPUNIT_COMPOSER_INSTALL; ++ require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; ++ require_once __DIR__ . '/_files/CoveredFunction.php'; ++ require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; ++ require_once __DIR__ . '/autoload.php'; + } - require_once PHPUNIT_COMPOSER_INSTALL; -+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; -+require_once __DIR__ . '/_files/CoveredFunction.php'; -+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; -+require_once __DIR__ . '/autoload.php'; + if ($phar) { |