From 8695386782adcbcbd8caa2f777dbb4f71913be46 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 1 Feb 2020 07:48:06 +0100
Subject: update to 5.1.0 raise dependency on PHP 7.1 switch to phpunit8

---
 composer.json         |  6 +++---
 php-sabre-event5.spec | 28 +++++++++++++++++-----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index d7a13c5..1447041 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     "homepage": "http://sabre.io/event/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=7.0"
+        "php": "^7.1"
     },
     "authors": [
         {
@@ -41,8 +41,8 @@
         ]
     },
     "require-dev": {
-        "sabre/cs": "~1.0.0",
-        "phpunit/phpunit" : ">=6"
+        "friendsofphp/php-cs-fixer": "~2.16.1",
+        "phpunit/phpunit" : "^7 || ^8"
     },
     "config" : {
         "bin-dir" : "bin/"
diff --git a/php-sabre-event5.spec b/php-sabre-event5.spec
index 9ab9836..322ae73 100644
--- a/php-sabre-event5.spec
+++ b/php-sabre-event5.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 # Github
-%global gh_commit    f5cf802d240df1257866d8813282b98aee3bc548
+%global gh_commit    d00a17507af0e7544cfe17096372f5d733e3b276
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   event
@@ -23,8 +23,8 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Summary:        Lightweight library for event-based programming
-Version:        5.0.3
-Release:        3%{?dist}
+Version:        5.1.0
+Release:        1%{?dist}
 
 URL:            http://sabre.io/event
 License:        BSD
@@ -33,19 +33,19 @@ Source1:        makesrc.sh
 
 BuildArch:      noarch
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.0
+BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "sabre/cs": "~1.0.0",
-#        "phpunit/phpunit" : ">=6"
-BuildRequires:  phpunit6
+#        "friendsofphp/php-cs-fixer": "~2.16.1",
+#        "phpunit/phpunit" : "^7 || ^8"
+BuildRequires:  phpunit8
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require": {
-#        "php": ">=7.0"
-Requires:       php(language) >= 7.0
+#        "php": "^7.1"
+Requires:       php(language) >= 7.1
 # From phpcompatinfo report for version 5.0.2
 Requires:       php-spl
 # Autoloader
@@ -97,10 +97,11 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}
 %if %{with_tests}
 : Run upstream test suite against installed library
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit6 \
+    $cmd %{_bindir}/phpunit8 \
       --bootstrap=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
+      --configuration tests/phpunit.xml \
       --verbose || ret=1
   fi
 done
@@ -120,6 +121,11 @@ exit $ret
 
 
 %changelog
+* Sat Feb  1 2020 Remi Collet <remi@remirepo.net> - 5.1.0-1
+- update to 5.1.0
+- raise dependency on PHP 7.1
+- switch to phpunit8
+
 * Fri Jul  5 2019 Remi Collet <remi@remirepo.net> - 5.0.3-3
 - fix autoloader
 
-- 
cgit