add minimal patch for PHP 8 and ignore some tests

2 files changed, 134 insertions, 7 deletions

diff --git a/phpunit7-php8.patch b/phpunit7-php8.patch
new file mode 100644
index 0000000..d2a286e
--- /dev/null
+++ b/phpunit7-php8.patch
@@ -0,0 +1,114 @@
+diff -up ./src/Framework/MockObject/Builder/Match.php.php8 ./src/Framework/MockObject/Builder/Match.php
+--- ./src/Framework/MockObject/Builder/Match.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./src/Framework/MockObject/Builder/Match.php	2021-03-24 14:30:25.218737051 +0100
+@@ -12,7 +12,7 @@ namespace PHPUnit\Framework\MockObject\B
+ /**
+  * Builder interface for invocation order matches.
+  */
+-interface Match extends Stub
++interface Match_ extends Stub
+ {
+     /**
+      * Defines the expectation which must occur before the current is valid.
+diff -up ./src/Framework/MockObject/Builder/NamespaceMatch.php.php8 ./src/Framework/MockObject/Builder/NamespaceMatch.php
+--- ./src/Framework/MockObject/Builder/NamespaceMatch.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./src/Framework/MockObject/Builder/NamespaceMatch.php	2021-03-24 14:30:25.218737051 +0100
+@@ -33,5 +33,5 @@ interface NamespaceMatch
+      * @param string $id      The identification of the match builder
+      * @param Match  $builder The builder which is being registered
+      */
+-    public function registerId($id, Match $builder);
++    public function registerId($id, Match_ $builder);
+ }
+diff -up ./src/Framework/MockObject/Builder/ParametersMatch.php.php8 ./src/Framework/MockObject/Builder/ParametersMatch.php
+--- ./src/Framework/MockObject/Builder/ParametersMatch.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./src/Framework/MockObject/Builder/ParametersMatch.php	2021-03-24 14:30:25.218737051 +0100
+@@ -14,7 +14,7 @@ use PHPUnit\Framework\MockObject\Matcher
+ /**
+  * Builder interface for parameter matchers.
+  */
+-interface ParametersMatch extends Match
++interface ParametersMatch extends Match_
+ {
+     /**
+      * Sets the parameters to match for, each parameter to this function will
+diff -up ./src/Framework/MockObject/Generator.php.php8 ./src/Framework/MockObject/Generator.php
+diff -up ./src/Framework/MockObject/InvocationMocker.php.php8 ./src/Framework/MockObject/InvocationMocker.php
+--- ./src/Framework/MockObject/InvocationMocker.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./src/Framework/MockObject/InvocationMocker.php	2021-03-24 14:30:25.218737051 +0100
+@@ -12,7 +12,7 @@ namespace PHPUnit\Framework\MockObject;
+ use Exception;
+ use PHPUnit\Framework\ExpectationFailedException;
+ use PHPUnit\Framework\MockObject\Builder\InvocationMocker as BuilderInvocationMocker;
+-use PHPUnit\Framework\MockObject\Builder\Match;
++use PHPUnit\Framework\MockObject\Builder\Match_;
+ use PHPUnit\Framework\MockObject\Builder\NamespaceMatch;
+ use PHPUnit\Framework\MockObject\Matcher\DeferredError;
+ use PHPUnit\Framework\MockObject\Matcher\Invocation as MatcherInvocation;
+@@ -82,7 +82,7 @@ class InvocationMocker implements Invoka
+     /**
+      * @throws RuntimeException
+      */
+-    public function registerId($id, Match $builder): void
++    public function registerId($id, Match_ $builder): void
+     {
+         if (isset($this->builderMap[$id])) {
+             throw new RuntimeException(
+diff -up ./src/Framework/MockObject/MockMethod.php.php8 ./src/Framework/MockObject/MockMethod.php
+--- ./src/Framework/MockObject/MockMethod.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./src/Framework/MockObject/MockMethod.php	2021-03-24 14:30:25.218737051 +0100
+@@ -301,11 +301,11 @@ final class MockMethod
+                     $nullable = '?';
+                 }
+ 
+-                if ($parameter->hasType() && $parameter->getType()->getName() !== 'self') {
++                if ($parameter->hasType() && (($t=$parameter->getType()) instanceof ReflectionNamedType) && $t->getName() !== 'self') {
+                     $typeDeclaration = $parameter->getType()->getName() . ' ';
+                 } else {
+                     try {
+-                        $class = $parameter->getClass();
++                        $class = @$parameter->getClass();
+                     } catch (ReflectionException $e) {
+                         throw new RuntimeException(
+                             \sprintf(
+diff -up ./tests/_files/SingletonClass.php.php8 ./tests/_files/SingletonClass.php
+--- ./tests/_files/SingletonClass.php.php8	2021-03-24 14:33:54.292214558 +0100
++++ ./tests/_files/SingletonClass.php	2021-03-24 14:37:50.093575868 +0100
+@@ -17,11 +17,11 @@ class SingletonClass
+     {
+     }
+ 
+-    private function __sleep()
++    function __sleep()
+     {
+     }
+ 
+-    private function __wakeup()
++    function __wakeup()
+     {
+     }
+ 
+diff -up ./tests/unit/Framework/Constraint/IsTypeTest.php.php8 ./tests/unit/Framework/Constraint/IsTypeTest.php
+--- ./tests/unit/Framework/Constraint/IsTypeTest.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./tests/unit/Framework/Constraint/IsTypeTest.php	2021-03-24 14:30:25.219737049 +0100
+@@ -74,7 +74,7 @@ EOF
+ 
+         $this->assertTrue($constraint->evaluate($resource, '', true));
+ 
+-        @\fclose($resource);
++        if (is_resource($resource)) @\fclose($resource);
+     }
+ 
+     public function resources()
+diff -up ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php.php8 ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
+--- ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php.php8	2020-01-08 09:45:45.000000000 +0100
++++ ./tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php	2021-03-24 14:30:25.219737049 +0100
+@@ -17,7 +17,7 @@ class JsonMatchesErrorMessageProviderTes
+     {
+         return [
+             'JSON_ERROR_NONE'  => [
+-                null, 'json_error_none', '',
++                null, \JSON_ERROR_NONE, '',
+             ],
+             'JSON_ERROR_DEPTH' => [
+                 'Maximum stack depth exceeded', \JSON_ERROR_DEPTH, '',
diff --git a/phpunit7.spec b/phpunit7.spec
index 18421d0..6b33275 100644
--- a/phpunit7.spec
+++ b/phpunit7.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for phpunit7
 #
-# Copyright (c) 2010-2020 Remi Collet
+# Copyright (c) 2010-2021 Remi Collet
 #
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
@@ -25,11 +25,10 @@
 %global ver_major    7
 %global ver_minor    5
 %global ver_patch    20
-%global specrel      2
 
 Name:           %{pk_project}%{ver_major}
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
-Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
+Release:        3%{?dist}
 Summary:        The PHP Unit Testing framework version %{ver_major}
 
 License:        BSD
@@ -38,6 +37,8 @@ Source0:        https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commi
 
 # Fix command for autoload
 Patch0:         %{name}-rpm.patch
+# Minimal fix for PHP 8
+Patch1:         %{name}-php8.patch
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.1
@@ -191,8 +192,10 @@ Documentation: https://phpunit.readthedocs.io/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p0 -b .rpm
+%patch0 -p1 -b .rpm
+%patch1 -p1 -b .php8
 
+find . -name \*.php8 -delete -print
 
 %build
 %{_bindir}/phpab \
@@ -246,14 +249,21 @@ install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd
 
 
 %check
-OPT="--testsuite=unit --no-coverage"
 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 php71 php72 php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
-     if [ $($cmd -r  'echo PHP_VERSION_ID;') -ge 70400 ]; then
+     OPT="--testsuite=unit --no-coverage"
+     VER=$($cmd -r  'echo PHP_VERSION_ID;');
+     if   [ $VER -ge 80000 ]; then
+       FILTER="testStaticAttributesBackupPre|testResourceTypeCanBeAsserted|testNotResourceTypeCanBeAsserted|testCreateMockFromWsdl"
+       FILTER="$FILTER|testCreateNamespacedMockFromWsdl|testCreateTwoMocksOfOneWsdlFile|testCreateMockOfWsdlFileWithSpecialChars"
+       FILTER="$FILTER|testCreateTestForConstructorlessTestClass|testCountTraversable|testConstraintTraversableCheckForObjectIdentityForDefaultCase"
+       OPT="$OPT --filter '^((?!($FILTER)).)*$'"
+
+     elif [ $VER -ge 70400 ]; then
        OPT="$OPT --filter '^((?!(testStaticAttributesBackupPre)).)*$'"
      fi
      $cmd ./phpunit $OPT --verbose || ret=1
@@ -273,6 +283,9 @@ exit $ret
 
 
 %changelog
+* Wed Mar 24 2021 Remi Collet <remi@remirepo.net> - 7.5.20-3
+- add minimal patch for PHP 8 and ignore some tests
+
 * Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 7.5.20-2
 - cleanup dependencies