v9.4.1

2 files changed, 51 insertions, 46 deletions

diff --git a/composer.json b/composer.json
index 010b9d8..10d681d 100644
--- a/composer.json
+++ b/composer.json
@@ -32,23 +32,23 @@
         "myclabs/deep-copy": "^1.10.1",
         "phar-io/manifest": "^2.0.1",
         "phar-io/version": "^3.0.2",
-        "phpspec/prophecy": "^1.11.1",
+        "phpspec/prophecy": "^1.12.1",
         "phpunit/php-code-coverage": "^9.2",
-        "phpunit/php-file-iterator": "^3.0.4",
-        "phpunit/php-invoker": "^3.1",
-        "phpunit/php-text-template": "^2.0.2",
-        "phpunit/php-timer": "^5.0.1",
-        "sebastian/cli-parser": "^1.0",
-        "sebastian/code-unit": "^1.0.5",
-        "sebastian/comparator": "^4.0.3",
-        "sebastian/diff": "^4.0.2",
-        "sebastian/environment": "^5.1.2",
-        "sebastian/exporter": "^4.0.2",
-        "sebastian/global-state": "^5.0",
-        "sebastian/object-enumerator": "^4.0.2",
-        "sebastian/resource-operations": "^3.0.2",
-        "sebastian/type": "^2.2.1",
-        "sebastian/version": "^3.0.1"
+        "phpunit/php-file-iterator": "^3.0.5",
+        "phpunit/php-invoker": "^3.1.1",
+        "phpunit/php-text-template": "^2.0.3",
+        "phpunit/php-timer": "^5.0.2",
+        "sebastian/cli-parser": "^1.0.1",
+        "sebastian/code-unit": "^1.0.6",
+        "sebastian/comparator": "^4.0.5",
+        "sebastian/diff": "^4.0.3",
+        "sebastian/environment": "^5.1.3",
+        "sebastian/exporter": "^4.0.3",
+        "sebastian/global-state": "^5.0.1",
+        "sebastian/object-enumerator": "^4.0.3",
+        "sebastian/resource-operations": "^3.0.3",
+        "sebastian/type": "^2.3",
+        "sebastian/version": "^3.0.2"
     },
     "require-dev": {
         "ext-PDO": "*",
diff --git a/phpunit9.spec b/phpunit9.spec
index 9cf4f56..35b45dc 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    ef533467a7974c4b6c354f3eff42a115910bd4e5
+%global gh_commit    1f09a12726593737e8a228ebb1c8647305d07c41
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -27,7 +27,7 @@
 %global specrel      1
 
 Name:           %{pk_project}%{ver_major}
-Version:        9.4.0
+Version:        9.4.1
 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}
 
@@ -47,7 +47,7 @@ BuildRequires:  (php-composer(doctrine/instantiator) >= 1.3.1         with php-c
 BuildRequires:  (php-composer(myclabs/deep-copy) >= 1.10.1            with php-composer(myclabs/deep-copy) <  2)
 BuildRequires:  (php-composer(phar-io/manifest) >= 2.0.1              with php-composer(phar-io/manifest) < 3)
 BuildRequires:  (php-composer(phar-io/version) >= 3.0.2               with php-composer(phar-io/version) <  4)
-BuildRequires:  (php-composer(phpspec/prophecy) >= 1.11.1             with php-composer(phpspec/prophecy) <  2)
+BuildRequires:  (php-composer(phpspec/prophecy) >= 1.12.1             with php-composer(phpspec/prophecy) <  2)
 BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 9.2       with php-composer(phpunit/php-code-coverage) <  10)
 BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 3.0.4     with php-composer(phpunit/php-file-iterator) <  4)
 BuildRequires:  (php-composer(phpunit/php-invoker) >= 3.1             with php-composer(phpunit/php-invoker) <  4)
@@ -55,14 +55,14 @@ BuildRequires:  (php-composer(phpunit/php-text-template) >= 2.0.2     with php-c
 BuildRequires:  (php-composer(phpunit/php-timer) >= 5.0.1             with php-composer(phpunit/php-timer) < 6)
 BuildRequires:  (php-composer(sebastian/cli-parser) >= 1.0            with php-composer(sebastian/cli-parser) < 2)
 BuildRequires:  (php-composer(sebastian/code-unit) >= 1.0.5           with php-composer(sebastian/code-unit) < 2)
-BuildRequires:  (php-composer(sebastian/comparator) >= 4.0.3          with php-composer(sebastian/comparator) <  5)
+BuildRequires:  (php-composer(sebastian/comparator) >= 4.0.5          with php-composer(sebastian/comparator) <  5)
 BuildRequires:  (php-composer(sebastian/diff) >= 4.0.2                with php-composer(sebastian/diff) <  5)
 BuildRequires:  (php-composer(sebastian/environment) >= 5.1.2         with php-composer(sebastian/environment) <  6)
 BuildRequires:  (php-composer(sebastian/exporter) >= 4.0.2            with php-composer(sebastian/exporter) <  5)
 BuildRequires:  (php-composer(sebastian/global-state) >= 5.0          with php-composer(sebastian/global-state) <  6)
 BuildRequires:  (php-composer(sebastian/object-enumerator) >= 4.0.2   with php-composer(sebastian/object-enumerator) <  5)
 BuildRequires:  (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
-BuildRequires:  (php-composer(sebastian/type) >= 2.2.1                with php-composer(sebastian/type) <  3)
+BuildRequires:  (php-composer(sebastian/type) >= 2.3                  with php-composer(sebastian/type) <  3)
 BuildRequires:  (php-composer(sebastian/version) >= 3.0.1             with php-composer(sebastian/version) <  4)
 # remirepo:23
 %else
@@ -70,7 +70,7 @@ BuildRequires:  php-doctrine-instantiator                   >= 1.3.1
 BuildRequires:  php-myclabs-deep-copy                       >= 1.10.1
 BuildRequires:  php-phar-io-manifest2                       >= 2.0.1
 BuildRequires:  php-phar-io-version3                        >= 3.0.2
-BuildRequires:  php-phpspec-prophecy                        >= 1.11.1
+BuildRequires:  php-phpspec-prophecy                        >= 1.12.1
 BuildRequires:  php-phpunit-php-code-coverage9              >= 9.2
 BuildRequires:  php-phpunit-php-file-iterator3              >= 3.0.4
 BuildRequires:  php-phpunit-php-invoker3                    >= 3.1
@@ -78,14 +78,14 @@ BuildRequires:  php-phpunit-php-text-template2              >= 2.0.2
 BuildRequires:  php-phpunit-php-timer5                      >= 5.0.1
 BuildRequires:  php-sebastian-cli-parser                    >= 1.0
 BuildRequires:  php-sebastian-code-unit                     >= 1.0.5
-BuildRequires:  php-sebastian-comparator4                   >= 4.0.3
+BuildRequires:  php-sebastian-comparator4                   >= 4.0.5
 BuildRequires:  php-sebastian-diff4                         >= 4.0.2
 BuildRequires:  php-sebastian-environment5                  >= 5.1.2
 BuildRequires:  php-sebastian-exporter4                     >= 4.0.2
 BuildRequires:  php-sebastian-global-state5                 >= 5.0
 BuildRequires:  php-sebastian-object-enumerator4            >= 4.0.2
 BuildRequires:  php-sebastian-resource-operations3          >= 3.0.2
-BuildRequires:  php-sebastian-type2                         >= 2.2.1
+BuildRequires:  php-sebastian-type2                         >= 2.3
 BuildRequires:  php-sebastian-version3                      >= 3.0.1
 %endif
 BuildRequires:  php-dom
@@ -109,23 +109,23 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 #        "myclabs/deep-copy": "^1.10.1",
 #        "phar-io/manifest": "^2.0.1",
 #        "phar-io/version": "^3.0.2",
-#        "phpspec/prophecy": "^1.11.1",
+#        "phpspec/prophecy": "^1.12.1",
 #        "phpunit/php-code-coverage": "^9.2",
-#        "phpunit/php-file-iterator": "^3.0.4",
-#        "phpunit/php-invoker": "^3.1",
-#        "phpunit/php-text-template": "^2.0.2",
-#        "phpunit/php-timer": "^5.0.1",
-#        "sebastian/cli-parser": "^1.0",
-#        "sebastian/code-unit": "^1.0.5",
-#        "sebastian/comparator": "^4.0.3",
-#        "sebastian/diff": "^4.0.2",
-#        "sebastian/environment": "^5.1.2",
-#        "sebastian/exporter": "^4.0.2",
-#        "sebastian/global-state": "^5.0",
-#        "sebastian/object-enumerator": "^4.0.2",
-#        "sebastian/resource-operations": "^3.0.2",
-#        "sebastian/type": "^2.2.1",
-#        "sebastian/version": "^3.0.1"
+#        "phpunit/php-file-iterator": "^3.0.5",
+#        "phpunit/php-invoker": "^3.1.1",
+#        "phpunit/php-text-template": "^2.0.3",
+#        "phpunit/php-timer": "^5.0.2",
+#        "sebastian/cli-parser": "^1.0.1",
+#        "sebastian/code-unit": "^1.0.6",
+#        "sebastian/comparator": "^4.0.5",
+#        "sebastian/diff": "^4.0.3",
+#        "sebastian/environment": "^5.1.3",
+#        "sebastian/exporter": "^4.0.3",
+#        "sebastian/global-state": "^5.0.1",
+#        "sebastian/object-enumerator": "^4.0.3",
+#        "sebastian/resource-operations": "^3.0.3",
+#        "sebastian/type": "^2.3",
+#        "sebastian/version": "^3.0.2"
 Requires:       php(language) >= 7.3
 Requires:       php-cli
 Requires:       php-dom
@@ -140,7 +140,7 @@ Requires:       (php-composer(doctrine/instantiator) >= 1.3.1         with php-c
 Requires:       (php-composer(myclabs/deep-copy) >= 1.10.1            with php-composer(myclabs/deep-copy) <  2)
 Requires:       (php-composer(phar-io/manifest) >= 2.0.1              with php-composer(phar-io/manifest) < 3)
 Requires:       (php-composer(phar-io/version) >= 3.0.2               with php-composer(phar-io/version) < 4)
-Requires:       (php-composer(phpspec/prophecy) >= 1.11.1             with php-composer(phpspec/prophecy) <  2)
+Requires:       (php-composer(phpspec/prophecy) >= 1.12.1             with php-composer(phpspec/prophecy) <  2)
 Requires:       (php-composer(phpunit/php-code-coverage) >= 9.2       with php-composer(phpunit/php-code-coverage) <  10)
 Requires:       (php-composer(phpunit/php-file-iterator) >= 3.0.4     with php-composer(phpunit/php-file-iterator) <  4)
 Requires:       (php-composer(phpunit/php-invoker) >= 3.1             with php-composer(phpunit/php-invoker) <  4)
@@ -148,14 +148,14 @@ Requires:       (php-composer(phpunit/php-text-template) >= 2.0.2     with php-c
 Requires:       (php-composer(phpunit/php-timer) >= 5.0.1             with php-composer(phpunit/php-timer) < 6)
 Requires:       (php-composer(sebastian/cli-parser) >= 1.0            with php-composer(sebastian/cli-parser) < 2)
 Requires:       (php-composer(sebastian/code-unit) >= 1.0.5           with php-composer(sebastian/code-unit) < 2)
-Requires:       (php-composer(sebastian/comparator) >= 4.0.3          with php-composer(sebastian/comparator) <  5)
+Requires:       (php-composer(sebastian/comparator) >= 4.0.5          with php-composer(sebastian/comparator) <  5)
 Requires:       (php-composer(sebastian/diff) >= 4.0.2                with php-composer(sebastian/diff) <  5)
 Requires:       (php-composer(sebastian/environment) >= 5.1.2         with php-composer(sebastian/environment) <  6)
 Requires:       (php-composer(sebastian/exporter) >= 4.0.2            with php-composer(sebastian/exporter) <  5)
 Requires:       (php-composer(sebastian/global-state) >= 5.0          with php-composer(sebastian/global-state) <  6)
 Requires:       (php-composer(sebastian/object-enumerator) >= 4.0.2   with php-composer(sebastian/object-enumerator) <  5)
 Requires:       (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) <  4)
-Requires:       (php-composer(sebastian/type) >= 2.2.1                with php-composer(sebastian/type) <  3)
+Requires:       (php-composer(sebastian/type) >= 2.3                  with php-composer(sebastian/type) <  3)
 Requires:       (php-composer(sebastian/version) >= 3.0.1             with php-composer(sebastian/version) <  4)
 # From composer.json, "suggest": {
 #        "ext-soap": "*",
@@ -168,7 +168,7 @@ Requires:       php-doctrine-instantiator                   >= 1.3.1
 Requires:       php-myclabs-deep-copy                       >= 1.10.1
 Requires:       php-phar-io-manifest2                       >= 2.0.1
 Requires:       php-phar-io-version3                        >= 3.0.2
-Requires:       php-phpspec-prophecy                        >= 1.11.1
+Requires:       php-phpspec-prophecy                        >= 1.12.1
 Requires:       php-phpunit-php-code-coverage9              >= 9.2
 Requires:       php-phpunit-php-file-iterator3              >= 3.0.4
 Requires:       php-phpunit-php-invoker3                    >= 3.1
@@ -176,14 +176,14 @@ Requires:       php-phpunit-php-text-template2              >= 2.0.2
 Requires:       php-phpunit-php-timer5                      >= 5.0.1
 Requires:       php-sebastian-cli-parser                    >= 1.0
 Requires:       php-sebastian-code-unit                     >= 1.0.5
-Requires:       php-sebastian-comparator4                   >= 4.0.3
+Requires:       php-sebastian-comparator4                   >= 4.0.5
 Requires:       php-sebastian-diff4                         >= 4.0.2
 Requires:       php-sebastian-environment5                  >= 5.1.2
 Requires:       php-sebastian-exporter4                     >= 4.0.2
 Requires:       php-sebastian-global-state5                 >= 5.0
 Requires:       php-sebastian-object-enumerator4            >= 4.0.2
 Requires:       php-sebastian-resource-operations3          >= 3.0.2
-Requires:       php-sebastian-type2                         >= 2.2.1
+Requires:       php-sebastian-type2                         >= 2.3
 Requires:       php-sebastian-version3                      >= 3.0.1
 %endif
 # Autoloader
@@ -284,6 +284,8 @@ sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i php
 ret=0
 for cmd in php php73 php74 php80; do
   if which $cmd; then
+     VER=$($cmd -r 'echo PHP_VERSION_ID;')
+     [ $VER -ge 80000 ] && OPT="$OPT --filter '^((?!(testStaticReturnTypeIsDoubledCorrectly|testNullableStaticReturnTypeIsDoubledCorrectly|testUnionReturnTypeWithStaticIsDoubledCorrectly)).)*$'"
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
 done
@@ -301,6 +303,9 @@ exit $ret
 
 
 %changelog
+* Mon Oct 12 2020 Remi Collet <remi@remirepo.net> - 9.4.1-1
+- update to 9.4.1
+
 * Fri Oct  2 2020 Remi Collet <remi@remirepo.net> - 9.4.0-1
 - update to 9.4.0
 - raise dependency on phpunit/php-code-coverage 9.2