From e870f2f9110f88ebe838c279adb16202f18855ae Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 2 Aug 2021 09:08:53 +0200
Subject: update to 8.5.19 raise dependency on phar-io/manifest 2.0.3 raise
 dependency on phpunit/php-file-iterator 2.0.4

---
 phpunit8-rpm.patch | 57 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

(limited to 'phpunit8-rpm.patch')

diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch
index 530819f..12bef82 100644
--- a/phpunit8-rpm.patch
+++ b/phpunit8-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2021-06-07 07:13:03.000000000 +0200
-+++ ./phpunit	2021-06-07 07:13:10.372992677 +0200
-@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
+--- ./phpunit.rpm	2021-08-02 08:27:58.000000000 +0200
++++ ./phpunit	2021-08-02 08:34:41.313976887 +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/Configuration.php.rpm ./src/Util/Configuration.php
---- ./src/Util/Configuration.php.rpm	2021-06-07 07:13:03.000000000 +0200
-+++ ./src/Util/Configuration.php	2021-06-07 07:13:10.372992677 +0200
+--- ./src/Util/Configuration.php.rpm	2021-08-02 08:27:58.000000000 +0200
++++ ./src/Util/Configuration.php	2021-08-02 08:34:40.070979790 +0200
 @@ -929,7 +929,7 @@ final class Configuration
      private function validateConfigurationAgainstSchema(): void
      {
@@ -56,23 +56,34 @@ 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	2021-06-07 07:13:10.372992677 +0200
-+++ ./tests/bootstrap.php	2021-06-07 07:15:29.571502817 +0200
-@@ -8,7 +8,7 @@
-  * file that was distributed with this source code.
+--- ./tests/bootstrap.php.rpm	2021-08-02 08:27:58.000000000 +0200
++++ ./tests/bootstrap.php	2021-08-02 08:44:30.257601265 +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,15 @@ if (!$composer && !$phar) {
  
- if (!defined('TEST_FILES_PATH')) {
-@@ -19,3 +19,8 @@ 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 '@PATH@//Framework/Assert/Functions.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 '@PATH@/Framework/Assert/Functions.php';
-+require_once __DIR__ . '/autoload.php';
+ if ($phar) {
-- 
cgit