From 3eace57ebabb8c94776d0818551a8cffd36823b8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 26 Mar 2019 09:59:21 +0100
Subject: [PATCH] update phpunitgoodpractices/polyfill to 1.2.0 update
 phpunitgoodpractices/traits to 1.8.0 allow PHPUnit 8

(cherry picked from commit 1b3d13b2fcc0dba6855953f0d0897c368fd1f7ae)
---
 .gitignore                             |  2 ++
 php-phpunitgoodpractices-polyfill.spec | 23 +++++++++++++++--------
 sources                                |  4 ++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2f5b65..e0f6dfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /php-phpunitgoodpractices-traits-1.5.1-10d22ad.tgz
 /php-phpunitgoodpractices-traits-1.6.0-d3d74de.tgz
 /php-phpunitgoodpractices-traits-1.7.0-d7864f7.tgz
+/php-phpunitgoodpractices-polyfill-1.2.0-1613c59.tgz
+/php-phpunitgoodpractices-traits-1.8.0-7bdb460.tgz
diff --git a/php-phpunitgoodpractices-polyfill.spec b/php-phpunitgoodpractices-polyfill.spec
index ac1a5cb..4bfc778 100644
--- a/php-phpunitgoodpractices-polyfill.spec
+++ b/php-phpunitgoodpractices-polyfill.spec
@@ -7,8 +7,9 @@
 # Please, preserve the changelog entries
 #
 
-# Github
-%global gh_commit    f7c9b779e5c14ad37d27b108f2a370bb3c0312e8
+# Polyfill
+# https://github.com/PHPUnitGoodPractices/polyfill/releases
+%global gh_commit    1613c59be473c6b238c119607de820b9274c81fd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     PHPUnitGoodPractices
 %global gh_project   polyfill
@@ -21,16 +22,16 @@
 %global php_home     %{_datadir}/php
 %global with_tests   0%{!?_without_tests:1}
 # Traits
-%global tr_commit    d7864f7d8eb9ee2e84eebc45baf3eace73ce2c4b
+# https://github.com/PHPUnitGoodPractices/Traits/releases
+%global tr_commit    7bdb460da0f9d4cfa2f11ca1ecb69a6d7f126925
 %global tr_short     %(c=%{tr_commit}; echo ${c:0:7})
-%global tr_version   1.7.0
+%global tr_version   1.8.0
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.1.0
-Release:        5%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Lacking future-compat polyfills for PHPUnit
 
-Group:          Development/Tools
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to get upstream test suite (none for now)
@@ -53,7 +54,7 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "php": "^5.5 || ^7.0",
 #        "phpunit/phpunit": ""~4.0.0 || ~4.1.0 || ~4.2.0 || ~4.3.0 || ~4.4.0 || ~4.5.0 || ~4.6.0 || ~4.8.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0 || ~6.0.0 || ~6.1.0 || ~6.2.0 || ~6.3.0 || ~6.4.0 || ~6.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.6 || ~7.3.0 || ~7.4.0 || ~7.5.0"
 Requires:       php(language) >= 5.5
-Requires:      (phpunit7 or phpunit6 or php-phpunit-PHPUnit)
+Requires:      (phpunit8 or phpunit7 or phpunit6 or php-phpunit-PHPUnit)
 # From phpcompatinfo report for version 1.0.0
 # nothing
 # Autoloader
@@ -87,6 +88,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
 if (!class_exists('PHPUnit\\Framework\\TestCase')) { // Call outside of phpunit command
     \Fedora\Autoloader\Dependencies::required([
         [
+            '%{php_home}/PHPUnit8/autoload.php',
             '%{php_home}/PHPUnit7/autoload.php',
             '%{php_home}/PHPUnit6/autoload.php',
             '%{php_home}/PHPUnit/Autoload.php',
@@ -140,6 +142,11 @@ if (!class_exists("PHPUnitGoodPractices\\Traits\\PHPUnitVersionRetriever")) {
 
 
 %changelog
+* Tue Mar 26 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update phpunitgoodpractices/polyfill to 1.2.0
+- update phpunitgoodpractices/traits to 1.8.0
+- allow PHPUnit 8
+
 * Sat Dec 29 2018 Remi Collet <remi@remirepo.net> - 1.1.0-5
 - update phpunitgoodpractices/traits to 1.7.0
 
diff --git a/sources b/sources
index 7f57e9c..2febaa1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-phpunitgoodpractices-polyfill-1.1.0-f7c9b77.tgz) = a79effb99ddd092ab89a6b734ecac53f0458b480535b7801ae74b645a38331dbde3365f702395c3589e6582749fc839c02db32b74fe6d2e89080065d1402395a
-SHA512 (php-phpunitgoodpractices-traits-1.7.0-d7864f7.tgz) = 63bdfd5a2666f9c954da540f38aa07c8928219913497b83741654b3b5442d82ec324446b14be5927cd2a720ebcaae95c68d13cd34fdfecdd35074dcf0352cb77
+SHA512 (php-phpunitgoodpractices-polyfill-1.2.0-1613c59.tgz) = 2c2494f948a3fb235c474fbcb7d70530a06c5973f1616aa0291094dc197ca42874aeee38563479d8e538f4fbebcebc84da114db2a51b4593f129913e14409afb
+SHA512 (php-phpunitgoodpractices-traits-1.8.0-7bdb460.tgz) = 00e74a5fc639e718370d238259d2e3727197d5893e91915082eab83776b1d76682e62157fd873eb383e312182a8ca1e3093fe547d3e34fd6ef6d9632768bd289