From 05e6866c5f7b5ab807ee13523fd0a3a1745ea4e3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 23 Mar 2021 10:29:49 +0100
Subject: update to 2.0.2 switch to phpunit9 with yoast/phpunit-polyfills

---
 php-consolidation-log.spec | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'php-consolidation-log.spec')

diff --git a/php-consolidation-log.spec b/php-consolidation-log.spec
index e100f23..facd095 100644
--- a/php-consolidation-log.spec
+++ b/php-consolidation-log.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-consolidation-log
 #
-# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
 
 %global github_owner     consolidation
 %global github_name      log
-%global github_version   2.0.1
-%global github_commit    ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf
+%global github_version   2.0.2
+%global github_commit    82a2aaaa621a7b976e50a745a8d249d5085ee2b1
 
 %global composer_vendor  consolidation
 %global composer_project log
@@ -28,10 +28,13 @@
 %global symfony_min_ver 4.0
 %global symfony_max_ver 6.0
 
-# "phpunit/phpunit": "^6"
-%global phpunit_require phpunit6
-%global phpunit_min_ver 6
-%global phpunit_exec    phpunit6
+# "phpunit/phpunit": ">=7.5.20"
+%global phpunit_require phpunit9
+%global phpunit_min_ver 9
+%global phpunit_exec    phpunit9
+# "yoast/phpunit-polyfills": "^0.2.0"
+%global polyfills_min_ver 0.2
+%global polyfills_max_ver 1
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -63,10 +66,13 @@ BuildRequires: %{phpunit_require} >= %{phpunit_min_ver}
 %if %{with_range_dependencies}
 BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
 BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+BuildRequires: (php-composer(yoast/phpunit-polyfills) >= %{polyfills_min_ver} with php-composer(yoast/phpunit-polyfills) < %{polyfills_max_ver})
 %else
 BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
 BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
 BuildRequires: php-symfony4-console  >= %{symfony_min_ver}
+BuildRequires: php-composer(yoast/phpunit-polyfills) <  %{polyfills_max_ver}
+BuildRequires: php-composer(yoast/phpunit-polyfills) >= %{polyfills_min_ver}
 %endif
 ## phpcompatinfo (computed from version 2.0.1)
 BuildRequires: php-pcre
@@ -135,18 +141,23 @@ cp -rp src %{buildroot}%{phpdir}/Consolidation/Log
 %check
 %if %{with_tests}
 : Create tests bootstrap
-cat <<'BOOTSTRAP' | tee bootstrap.php
+mkdir vendor
+cat <<'BOOTSTRAP' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{phpdir}/Consolidation/Log/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('Consolidation\\TestUtils\\', __DIR__.'/tests/src');
+\Fedora\Autoloader\Autoload::addPsr4('Consolidation\\TestUtils\\', dirname(__DIR__).'/tests/src');
+
+\Fedora\Autoloader\Dependencies::required([
+    '%{phpdir}/Yoast/PHPUnitPolyfills/autoload.php',
+]);
 BOOTSTRAP
 
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which %{phpunit_exec})
-for PHP_EXEC in "" php72 php73 php74; do
+for PHP_EXEC in "" php73 php74 php80; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
-        $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
+        $PHP_EXEC $PHPUNIT --verbose --no-coverage \
             || RETURN_CODE=1
     fi
 done
@@ -166,6 +177,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Mar 23 2021 Remi Collet <remi@remirepo.net> - 2.0.2-1
+- update to 2.0.2
+- switch to phpunit9 with yoast/phpunit-polyfills
+
 * Mon Sep 07 2020 Shawn Iwinski <shawn@iwin.ski> - 2.0.1-1
 - Update to 2.0.1 (RHBZ #1850810)
 
-- 
cgit