From f7f93fc9f0035ad9b5eea553c4dfd4e906fd2a73 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Feb 24 2020 14:03:55 +0000
Subject: disable test suite where mockery < 1 is broken


---

diff --git a/php-swiftmailer6.spec b/php-swiftmailer6.spec
index b509b62..85a4324 100644
--- a/php-swiftmailer6.spec
+++ b/php-swiftmailer6.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-swiftmailer6
 #
-# Copyright (c) 2016-2019 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,12 +12,17 @@
 %global gh_project   swiftmailer
 # don't change major version used in package name
 %global major        6
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
+# disable test by default, without mockery < 1
+%global with_tests   0%{?_with_tests:1}
+%else
 %global with_tests   0%{!?_without_tests:1}
+%endif
 %global php_home     %{_datadir}/php
 
 Name:           php-%{gh_project}%{major}
 Version:        6.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Feature-rich PHP Mailer
 
 License:        MIT
@@ -42,13 +47,13 @@ BuildRequires:  php-openssl
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  phpunit6
-BuildRequires:  php-fedora-autoloader-devel
 # From composer.json, "require-dev": {
 #        "mockery/mockery": "~0.9.1",
 #        "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
 BuildRequires: (php-composer(mockery/mockery) >= 0.9.1         with php-composer(mockery/mockery) <  1)
 BuildRequires: (php-composer(symfony/phpunit-bridge) >= 3.4.19 with php-composer(symfony/phpunit-bridge) <  4)
 %endif
+BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require": {
 #        "php": ">=7.0.0",
@@ -133,13 +138,9 @@ EOF
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
-    if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 70400 ]; then
-      $cmd %{_bindir}/phpunit6 --exclude smoke --verbose || ret=1
-    else
-      : ignore because of mockery
-    fi
+    $cmd %{_bindir}/phpunit6 --exclude smoke --verbose || ret=1
   fi
 done
 rm -r $TMPDIR
@@ -156,6 +157,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb 24 2020 Remi Collet <remi@remirepo.net> - 6.2.3-3
+- disable test suite where mockery < 1 is broken
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild