From 28815c7688312d0282507c66cd5f68e55108dbd9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Aug 2020 12:10:09 +0200 Subject: update to 9.3.5 --- phpunit9-rpm.patch | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'phpunit9-rpm.patch') diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 5984d82..b6ccbc5 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-07-14 07:50:32.000000000 +0200 -+++ ./phpunit 2020-07-14 07:59:08.950883697 +0200 +--- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200 ++++ ./phpunit 2020-08-10 12:02:22.089870229 +0200 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -43,21 +43,20 @@ diff -up ./phpunit.rpm ./phpunit +} else { + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} -diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Loader.php ---- ./src/TextUI/Configuration/Loader.php.rpm 2020-07-14 07:59:08.950883697 +0200 -+++ ./src/TextUI/Configuration/Loader.php 2020-07-14 08:00:39.167509659 +0200 -@@ -195,7 +195,7 @@ final class Loader - private function validate(\DOMDocument $document): array - { - $original = \libxml_use_internal_errors(true); -- $xsdFilename = __DIR__ . '/../../../phpunit.xsd'; -+ $xsdFilename = __DIR__ . '/../../phpunit.xsd'; +diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php +--- ./src/Util/Xml/SchemaFinder.php.rpm 2020-08-10 12:02:22.089870229 +0200 ++++ ./src/Util/Xml/SchemaFinder.php 2020-08-10 12:06:11.098559995 +0200 +@@ -48,6 +48,6 @@ final class SchemaFinder + return __PHPUNIT_PHAR_ROOT__ . '/'; + } - if (\defined('__PHPUNIT_PHAR_ROOT__')) { - $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; +- return __DIR__ . '/../../../'; ++ return __DIR__ . '/../../'; + } + } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-07-14 07:50:32.000000000 +0200 -+++ ./tests/bootstrap.php 2020-07-14 07:59:08.950883697 +0200 +--- ./tests/bootstrap.php.rpm 2020-08-10 12:02:07.000000000 +0200 ++++ ./tests/bootstrap.php 2020-08-10 12:02:22.089870229 +0200 @@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) { \ini_set('precision', '14'); \ini_set('serialize_precision', '14'); -- cgit