update to 8.5.9

raise dependency on doctrine/instantiator 1.3.1
raise dependency on myclabs/deep-copy 1.10.0
raise dependency on phpspec/prophecy 1.10.3
raise dependency on phpunit/php-code-coverage 7.0.10
raise dependency on sebastian/environment 4.2.2
raise dependency on sebastian/exporter 3.1.2

3 files changed, 58 insertions, 48 deletions

diff --git a/composer.json b/composer.json
index 305fe7a..91ac3ef 100644
--- a/composer.json
+++ b/composer.json
@@ -28,19 +28,19 @@
         "ext-mbstring": "*",
         "ext-xml": "*",
         "ext-xmlwriter": "*",
-        "doctrine/instantiator": "^1.2.0",
-        "myclabs/deep-copy": "^1.9.1",
+        "doctrine/instantiator": "^1.3.1",
+        "myclabs/deep-copy": "^1.10.0",
         "phar-io/manifest": "^1.0.3",
         "phar-io/version": "^2.0.1",
-        "phpspec/prophecy": "^1.8.1",
-        "phpunit/php-code-coverage": "^7.0.7",
+        "phpspec/prophecy": "^1.10.3",
+        "phpunit/php-code-coverage": "^7.0.10",
         "phpunit/php-file-iterator": "^2.0.2",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^2.1.2",
         "sebastian/comparator": "^3.0.2",
         "sebastian/diff": "^3.0.2",
-        "sebastian/environment": "^4.2.2",
-        "sebastian/exporter": "^3.1.1",
+        "sebastian/environment": "^4.2.3",
+        "sebastian/exporter": "^3.1.2",
         "sebastian/global-state": "^3.0.0",
         "sebastian/object-enumerator": "^3.0.3",
         "sebastian/resource-operations": "^2.0.1",
diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch
index 8b70cbd..b66a4d2 100644
--- a/phpunit8-rpm.patch
+++ b/phpunit8-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2019-02-01 06:41:59.000000000 +0100
-+++ ./phpunit	2019-02-01 08:43:27.079804951 +0100
+--- ./phpunit.rpm	2020-11-10 16:52:55.000000000 +0100
++++ ./phpunit	2020-11-10 16:58:06.470107562 +0100
 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
      ini_set('date.timezone', 'UTC');
  }
@@ -44,9 +44,9 @@ 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	2019-02-01 06:41:59.000000000 +0100
-+++ ./src/Util/Configuration.php	2019-02-01 08:43:27.079804951 +0100
-@@ -899,7 +899,7 @@ final class Configuration
+--- ./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
      private function validateConfigurationAgainstSchema(): void
      {
          $original    = \libxml_use_internal_errors(true);
@@ -54,10 +54,10 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php
 +        $xsdFilename = __DIR__ . '/../phpunit.xsd';
  
          if (\defined('__PHPUNIT_PHAR_ROOT__')) {
-             $xsdFilename =  __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
+             $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm	2019-02-01 08:43:27.080804957 +0100
-+++ ./tests/bootstrap.php	2019-02-01 08:44:59.691284599 +0100
+--- ./tests/bootstrap.php.rpm	2020-11-10 16:52:55.000000000 +0100
++++ ./tests/bootstrap.php	2020-11-10 16:58:06.470107562 +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 dda9895..61ece78 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    34c18baa6a44f1d1fbf0338907139e9dce95b997
+%global gh_commit    f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -24,10 +24,10 @@
 %global php_home     %{_datadir}/php
 %global ver_major    8
 %global ver_minor    5
-%global specrel      2
+%global specrel      1
 
 Name:           %{pk_project}%{ver_major}
-Version:        8.5.8
+Version:        8.5.9
 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}
 
@@ -43,19 +43,19 @@ BuildArch:      noarch
 BuildRequires:  php(language) >= 7.2
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(doctrine/instantiator) >= 1.2.0         with php-composer(doctrine/instantiator) <  2)
-BuildRequires:  (php-composer(myclabs/deep-copy) >= 1.9.1             with php-composer(myclabs/deep-copy) <  2)
+BuildRequires:  (php-composer(doctrine/instantiator) >= 1.3.1         with php-composer(doctrine/instantiator) <  2)
+BuildRequires:  (php-composer(myclabs/deep-copy) >= 1.10.0            with php-composer(myclabs/deep-copy) <  2)
 BuildRequires:  (php-composer(phar-io/manifest) >= 1.0.3              with php-composer(phar-io/manifest) <  2)
 BuildRequires:  (php-composer(phar-io/version) >= 2.0.1               with php-composer(phar-io/version) <  3)
-BuildRequires:  (php-composer(phpspec/prophecy) >= 1.8.1              with php-composer(phpspec/prophecy) <  2)
-BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 7.0.7     with php-composer(phpunit/php-code-coverage) <  8)
+BuildRequires:  (php-composer(phpspec/prophecy) >= 1.10.3             with php-composer(phpspec/prophecy) <  2)
+BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 7.0.10    with php-composer(phpunit/php-code-coverage) <  8)
 BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 2.0.2     with php-composer(phpunit/php-file-iterator) <  3)
 BuildRequires:  (php-composer(phpunit/php-text-template) >= 1.2.1     with php-composer(phpunit/php-text-template) <  2)
 BuildRequires:  (php-composer(phpunit/php-timer) >= 2.1.2             with php-composer(phpunit/php-timer) <  3)
 BuildRequires:  (php-composer(sebastian/comparator) >= 3.0.2          with php-composer(sebastian/comparator) <  4)
 BuildRequires:  (php-composer(sebastian/diff) >= 3.0.2                with php-composer(sebastian/diff) <  4)
-BuildRequires:  (php-composer(sebastian/environment) >= 4.2.2         with php-composer(sebastian/environment) <  5)
-BuildRequires:  (php-composer(sebastian/exporter) >= 3.1.1            with php-composer(sebastian/exporter) <  4)
+BuildRequires:  (php-composer(sebastian/environment) >= 4.2.3         with php-composer(sebastian/environment) <  5)
+BuildRequires:  (php-composer(sebastian/exporter) >= 3.1.2            with php-composer(sebastian/exporter) <  4)
 BuildRequires:  (php-composer(sebastian/global-state) >= 3.0.0        with php-composer(sebastian/global-state) <  4)
 BuildRequires:  (php-composer(sebastian/object-enumerator) >= 3.0.3   with php-composer(sebastian/object-enumerator) <  4)
 BuildRequires:  (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
@@ -64,19 +64,19 @@ BuildRequires:  (php-composer(sebastian/type) >= 1.1.3                with php-c
 BuildRequires:  (php-composer(phpunit/php-invoker) >= 2.0.0           with php-composer(phpunit/php-invoker) <  3)
 # remirepo:21
 %else
-BuildRequires:  php-doctrine-instantiator                   >= 1.2.0
-BuildRequires:  php-myclabs-deep-copy                       >= 1.9.1
+BuildRequires:  php-doctrine-instantiator                   >= 1.3.1
+BuildRequires:  php-myclabs-deep-copy                       >= 1.10.0
 BuildRequires:  php-phar-io-manifest                        >= 1.0.3
 BuildRequires:  php-phar-io-version                         >= 2.0.1
-BuildRequires:  php-phpspec-prophecy                        >= 1.8.1
-BuildRequires:  php-phpunit-php-code-coverage7              >= 7.0.7
+BuildRequires:  php-phpspec-prophecy                        >= 1.10.3
+BuildRequires:  php-phpunit-php-code-coverage7              >= 7.0.10
 BuildRequires:  php-phpunit-php-file-iterator2              >= 2.0.2
 BuildRequires:  php-phpunit-Text-Template                   >= 1.2.1
 BuildRequires:  php-phpunit-php-timer2                      >= 2.1.2
 BuildRequires:  php-sebastian-comparator3                   >= 3.0.2
 BuildRequires:  php-sebastian-diff3                         >= 3.0.2
-BuildRequires:  php-sebastian-environment4                  >= 4.2.2
-BuildRequires:  php-sebastian-exporter3                     >= 3.1.1
+BuildRequires:  php-sebastian-environment4                  >= 4.2.3
+BuildRequires:  php-sebastian-exporter3                     >= 3.1.2
 BuildRequires:  php-sebastian-global-state3
 BuildRequires:  php-sebastian-object-enumerator3            >= 3.0.3
 BuildRequires:  php-sebastian-resource-operations2          >= 2.0.1
@@ -101,19 +101,19 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 #        "ext-mbstring": "*",
 #        "ext-xml": "*",
 #        "ext-xmlwriter": "*",
-#        "doctrine/instantiator": "^1.2.0",
-#        "myclabs/deep-copy": "^1.9.1",
+#        "doctrine/instantiator": "^1.3.1",
+#        "myclabs/deep-copy": "^1.10.0",
 #        "phar-io/manifest": "^1.0.3",
 #        "phar-io/version": "^2.0.1",
-#        "phpspec/prophecy": "^1.8.1",
-#        "phpunit/php-code-coverage": "^7.0.7",
+#        "phpspec/prophecy": "^1.10.3",
+#        "phpunit/php-code-coverage": "^7.0.10",
 #        "phpunit/php-file-iterator": "^2.0.2",
 #        "phpunit/php-text-template": "^1.2.1",
 #        "phpunit/php-timer": "^2.1.2",
 #        "sebastian/comparator": "^3.0.2",
 #        "sebastian/diff": "^3.0.2",
-#        "sebastian/environment": "^4.2.2",
-#        "sebastian/exporter": "^3.1.1",
+#        "sebastian/environment": "^4.2.3",
+#        "sebastian/exporter": "^3.1.2",
 #        "sebastian/global-state": "^3.0.0",
 #        "sebastian/object-enumerator": "^3.0.3",
 #        "sebastian/resource-operations": "^2.0.1",
@@ -129,19 +129,19 @@ Requires:       php-xml
 Requires:       php-xmlwriter
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(doctrine/instantiator) >= 1.2.0         with php-composer(doctrine/instantiator) <  2)
-Requires:       (php-composer(myclabs/deep-copy) >= 1.9.1             with php-composer(myclabs/deep-copy) <  2)
+Requires:       (php-composer(doctrine/instantiator) >= 1.3.1         with php-composer(doctrine/instantiator) <  2)
+Requires:       (php-composer(myclabs/deep-copy) >= 1.10.0            with php-composer(myclabs/deep-copy) <  2)
 Requires:       (php-composer(phar-io/manifest) >= 1.0.3              with php-composer(phar-io/manifest) <  2)
 Requires:       (php-composer(phar-io/version) >= 2.0.1               with php-composer(phar-io/version) <  3)
-Requires:       (php-composer(phpspec/prophecy) >= 1.8.1              with php-composer(phpspec/prophecy) <  2)
-Requires:       (php-composer(phpunit/php-code-coverage) >= 7.0.7     with php-composer(phpunit/php-code-coverage) <  8)
+Requires:       (php-composer(phpspec/prophecy) >= 1.10.3             with php-composer(phpspec/prophecy) <  2)
+Requires:       (php-composer(phpunit/php-code-coverage) >= 7.0.10    with php-composer(phpunit/php-code-coverage) <  8)
 Requires:       (php-composer(phpunit/php-file-iterator) >= 2.0.2     with php-composer(phpunit/php-file-iterator) <  3)
 Requires:       (php-composer(phpunit/php-text-template) >= 1.2.1     with php-composer(phpunit/php-text-template) <  2)
 Requires:       (php-composer(phpunit/php-timer) >= 2.1.2             with php-composer(phpunit/php-timer) <  3)
 Requires:       (php-composer(sebastian/comparator) >= 3.0.2          with php-composer(sebastian/comparator) <  4)
 Requires:       (php-composer(sebastian/diff) >= 3.0.2                with php-composer(sebastian/diff) <  4)
-Requires:       (php-composer(sebastian/environment) >= 4.2.2         with php-composer(sebastian/environment) <  5)
-Requires:       (php-composer(sebastian/exporter) >= 3.1.1            with php-composer(sebastian/exporter) <  4)
+Requires:       (php-composer(sebastian/environment) >= 4.2.3         with php-composer(sebastian/environment) <  5)
+Requires:       (php-composer(sebastian/exporter) >= 3.1.2            with php-composer(sebastian/exporter) <  4)
 Requires:       (php-composer(sebastian/global-state) >= 3.0.0        with php-composer(sebastian/global-state) <  4)
 Requires:       (php-composer(sebastian/object-enumerator) >= 3.0.3   with php-composer(sebastian/object-enumerator) <  4)
 Requires:       (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
@@ -156,19 +156,19 @@ Suggests:       php-soap
 Suggests:       php-xdebug
 # remirepo:21
 %else
-Requires:       php-doctrine-instantiator                   >= 1.2.0
-Requires:       php-myclabs-deep-copy                       >= 1.9.1
+Requires:       php-doctrine-instantiator                   >= 1.3.1
+Requires:       php-myclabs-deep-copy                       >= 1.10.0
 Requires:       php-phar-io-manifest                        >= 1.0.3
 Requires:       php-phar-io-version                         >= 2.0.1
-Requires:       php-phpspec-prophecy                        >= 1.8.1
-Requires:       php-phpunit-php-code-coverage7              >= 7.0.7
+Requires:       php-phpspec-prophecy                        >= 1.10.3
+Requires:       php-phpunit-php-code-coverage7              >= 7.0.10
 Requires:       php-phpunit-php-file-iterator2              >= 2.0.2
 Requires:       php-phpunit-Text-Template                   >= 1.2.1
 Requires:       php-phpunit-php-timer2                      >= 2.1.2
 Requires:       php-sebastian-comparator3                   >= 3.0.2
 Requires:       php-sebastian-diff3                         >= 3.0.2
-Requires:       php-sebastian-environment4                  >= 4.2.2
-Requires:       php-sebastian-exporter3                     >= 3.1.1
+Requires:       php-sebastian-environment4                  >= 4.2.3
+Requires:       php-sebastian-exporter3                     >= 3.1.2
 Requires:       php-sebastian-global-state3
 Requires:       php-sebastian-object-enumerator3            >= 3.0.3
 Requires:       php-sebastian-resource-operations2          >= 2.0.1
@@ -262,7 +262,8 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php
 sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit
 
 ret=0
-for cmd in php php72 php73 php74 php80; do
+# Not compatible with 8.0.0RC4
+for cmd in php php72 php73 php74; do
   if which $cmd; then
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
@@ -281,6 +282,15 @@ exit $ret
 
 
 %changelog
+* Tue Nov 10 2020 Remi Collet <remi@remirepo.net> - 8.5.9-1
+- update to 8.5.9
+- raise dependency on doctrine/instantiator 1.3.1
+- raise dependency on myclabs/deep-copy 1.10.0
+- raise dependency on phpspec/prophecy 1.10.3
+- raise dependency on phpunit/php-code-coverage 7.0.10
+- raise dependency on sebastian/environment 4.2.2
+- raise dependency on sebastian/exporter 3.1.2
+
 * Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 8.5.8-2
 - cleanup dependencies