diff options
| author | Remi Collet <remi@remirepo.net> | 2018-10-05 07:31:09 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-10-05 07:31:09 +0200 |
| commit | 1d432219d76a19373a57cbd2125dbacb4a60518f (patch) | |
| tree | d918725bd912c3e3ebf77f1229b7188c9b6f5419 /phpunit7-rpm.patch | |
| parent | 1d76d9cda60be061c96938ad7569f39d4f303d3a (diff) | |
update to 7.4.0
raise dependency on sebastian/resource-operations 2.0
Diffstat (limited to 'phpunit7-rpm.patch')
| -rw-r--r-- | phpunit7-rpm.patch | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/phpunit7-rpm.patch b/phpunit7-rpm.patch index 15cf866..ac1ba36 100644 --- a/phpunit7-rpm.patch +++ b/phpunit7-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2018-04-18 15:41:53.000000000 +0200 -+++ ./phpunit 2018-04-18 17:47:22.114947265 +0200 -@@ -27,27 +27,18 @@ if (!ini_get('date.timezone')) { +--- ./phpunit.rpm 2018-10-05 07:24:04.878465790 +0200 ++++ ./phpunit 2018-10-05 07:28:13.403045771 +0200 +@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -32,6 +32,9 @@ diff -up ./phpunit.rpm ./phpunit + 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(); @@ -40,9 +43,21 @@ 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 2018-10-05 06:05:24.000000000 +0200 ++++ ./src/Util/Configuration.php 2018-10-05 07:24:04.879465796 +0200 +@@ -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 2018-04-18 17:47:22.114947265 +0200 -+++ ./tests/bootstrap.php 2018-04-18 17:49:00.630467371 +0200 +--- ./tests/bootstrap.php.rpm 2018-10-05 06:05:24.000000000 +0200 ++++ ./tests/bootstrap.php 2018-10-05 07:24:04.878465790 +0200 @@ -14,7 +14,12 @@ if (!\defined('TEST_FILES_PATH')) { \ini_set('precision', 14); \ini_set('serialize_precision', 14); @@ -57,15 +72,3 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php // TODO: Figure out why these are required (the classes should be autoloaded instead) require_once TEST_FILES_PATH . 'BeforeAndAfterTest.php'; -diff -up src/Util/Configuration.php.rpm src/Util/Configuration.php ---- src/Util/Configuration.php.rpm 2018-06-01 08:58:20.650603791 +0200 -+++ src/Util/Configuration.php 2018-06-01 08:58:28.559655848 +0200 -@@ -979,7 +979,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'; |