From a2f19dbde477d77569c2eae02a617cfbf9f11b11 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Mar 2021 14:52:53 +0100
Subject: add minimal patch for PHP 8 and ignore some tests

---
 phpunit7.spec | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'phpunit7.spec')

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
 
-- 
cgit