From 5a31ce612736e8c56024b76f429cd02e562ba82c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 12 Oct 2020 13:58:47 +0200
Subject: update to 3.6.0 switch to phpunit9

---
 composer.json         | 10 +++++++---
 php-opis-closure.spec | 32 ++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 31953f5..5d7d77a 100644
--- a/composer.json
+++ b/composer.json
@@ -15,11 +15,11 @@
         }
     ],
     "require": {
-        "php": "^5.4 || ^7.0"
+        "php": "^5.4 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "jeremeamia/superclosure": "^2.0",
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,7 +34,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.5.x-dev"
+            "dev-master": "3.6.x-dev"
         }
+    },
+    "config": {
+        "preferred-install": "dist",
+        "sort-packages": true
     }
 }
diff --git a/php-opis-closure.spec b/php-opis-closure.spec
index d560b96..3aa3d4b 100644
--- a/php-opis-closure.spec
+++ b/php-opis-closure.spec
@@ -12,8 +12,8 @@
 
 %global github_owner      opis
 %global github_name       closure
-%global github_version    3.5.6
-%global github_commit     e8d34df855b0a0549a300cb8cb4db472556e8aa9
+%global github_version    3.6.0
+%global github_commit     c547f8262a5fa9ff507bd06cc394067b83a75085
 
 %global composer_vendor   opis
 %global composer_project  closure
@@ -21,24 +21,24 @@
 %global namespace_vendor  Opis
 %global namespace_project Closure
 
-# "php": "^5.4 || ^7.0"
+# "php": "^5.4 || ^7.0 || ^8.0"
 %global php_min_ver 5.4
 # "jeremeamia/superclosure": "^2.0"
 %global jeremeamia_superclosure_min_ver 2.0
 %global jeremeamia_superclosure_max_ver 3.0
 
 # PHPUnit
-## v7
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-%global phpunit_require phpunit7
-%global phpunit_exec    phpunit7
+## v9 (PHP 7.3)
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 9
+%global phpunit_require phpunit9
+%global phpunit_exec    phpunit9
 %else
-## v6
-%if 0%{?fedora} >= 26
-%global phpunit_require phpunit6
-%global phpunit_exec    phpunit6
+## v8 (PHP 7.2)
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
+%global phpunit_require phpunit8
+%global phpunit_exec    phpunit8
 %else
-## Pre-v6
+## Pre-v8
 %global phpunit_require php-composer(phpunit/phpunit)
 %global phpunit_exec    phpunit
 %endif
@@ -58,7 +58,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}%{?namespace_version}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       A library that can be used to serialize closures and arbitrary objects
 
 License:       MIT
@@ -156,7 +156,7 @@ BOOTSTRAP
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which %{phpunit_exec})
-for PHP_EXEC in "" %{?rhel:php55 php56 php70} php71 php72 php73 php74; do
+for PHP_EXEC in "" %{?rhel:php55 php56 php70 php71 php72} php73 php74 php80; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php || RETURN_CODE=1
     fi
@@ -178,6 +178,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Oct 12 2020 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+- switch to phpunit9
+
 * Fri Aug 21 2020 Shawn Iwinski <shawn@iwin.ski> - 3.5.6-2
 - Update SCL tests per review (RHBZ #1869433)
 
-- 
cgit