From 7f3d2baddd3fe42e09b6011fdc88a05fe4f369f5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Feb 2021 06:49:50 +0100
Subject: [PATCH] v8.5.14

---
 .gitignore         |  1 +
 phpunit8-rpm.patch | 18 +++++++++---------
 phpunit8.spec      | 11 +++++++----
 sources            |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23a4c56..95b3fa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ clog
 /phpunit8-8.5.11-3123601.tgz
 /phpunit8-8.5.12-f40cf5b.tgz
 /phpunit8-8.5.13-8e86be3.tgz
+/phpunit8-8.5.14-c25f798.tgz
diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch
index b66a4d2..f4e4c9f 100644
--- a/phpunit8-rpm.patch
+++ b/phpunit8-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2020-11-10 16:52:55.000000000 +0100
-+++ ./phpunit	2020-11-10 16:58:06.470107562 +0100
+--- ./phpunit.rpm	2021-02-03 14:04:11.000000000 +0100
++++ ./phpunit	2021-02-03 14:04:57.662439204 +0100
 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
      ini_set('date.timezone', 'UTC');
  }
@@ -44,20 +44,20 @@ 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	2020-11-10 16:58:06.470107562 +0100
-+++ ./src/Util/Configuration.php	2020-11-10 16:59:17.462913118 +0100
-@@ -903,7 +903,7 @@ final class Configuration
+--- ./src/Util/Configuration.php.rpm	2021-02-03 14:04:57.662439204 +0100
++++ ./src/Util/Configuration.php	2021-02-03 14:06:08.876097281 +0100
+@@ -929,7 +929,7 @@ final class Configuration
      private function validateConfigurationAgainstSchema(): void
      {
-         $original    = \libxml_use_internal_errors(true);
+         $original    = libxml_use_internal_errors(true);
 -        $xsdFilename = __DIR__ . '/../../phpunit.xsd';
 +        $xsdFilename = __DIR__ . '/../phpunit.xsd';
  
-         if (\defined('__PHPUNIT_PHAR_ROOT__')) {
+         if (defined('__PHPUNIT_PHAR_ROOT__')) {
              $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm	2020-11-10 16:52:55.000000000 +0100
-+++ ./tests/bootstrap.php	2020-11-10 16:58:06.470107562 +0100
+--- ./tests/bootstrap.php.rpm	2021-02-03 14:04:11.000000000 +0100
++++ ./tests/bootstrap.php	2021-02-03 14:04:57.662439204 +0100
 @@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) {
  \ini_set('precision', '14');
  \ini_set('serialize_precision', '14');
diff --git a/phpunit8.spec b/phpunit8.spec
index ec5924c..d3767d8 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for phpunit8
 #
-# Copyright (c) 2010-2020 Remi Collet
+# Copyright (c) 2010-2021 Remi Collet
 #
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    8e86be391a58104ef86037ba8a846524528d784e
+%global gh_commit    c25f79895d27b6ecd5abfa63de1606b786a461a3
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -27,8 +27,8 @@
 %global specrel      1
 
 Name:           %{pk_project}%{ver_major}
-Version:        8.5.13
-Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1
+Version:        8.5.14
+Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        The PHP Unit Testing framework version %{ver_major}
 
 License:        BSD
@@ -231,6 +231,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb  3 2021 Remi Collet <remi@remirepo.net> - 8.5.14-1
+- update to 8.5.14
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.5.13-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 6a55d8a..ef34862 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit8-8.5.13-8e86be3.tgz) = bc2e9a4ecd8ef26c55faa9a439cdb5be95b0825f73785a20e03bea40457ce68c44a82da297327f46ffbe309f230e345e2d3546f9590cdcc932f8cdd1aa8cfefb
+SHA512 (phpunit8-8.5.14-c25f798.tgz) = 406a84b619741308396e400da75c7b29f04bfe05c02017819749305044781afb6bf615bd6d8e4f458a4f0108557d39f9694d59ed4fd24f626d69af8300256018