From f53d462fd585bc15c11699f9aca602c7bea30cd7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 18 Mar 2021 12:05:32 +0100
Subject: update to 1.1.0 raise dependency to PHP 7.1 switch to phpunit9

---
 composer.json             |  8 ++++----
 php-league-tactician.spec | 35 ++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 49cce09..689882a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,12 +10,12 @@
         }
     ],
     "require": {
-        "php":  ">=5.5"
+        "php":  ">=7.1"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9",
-        "phpunit/phpunit": "^4.8.35",
-        "squizlabs/php_codesniffer": "~2.3"
+        "mockery/mockery": "^1.3",
+        "phpunit/phpunit": "^7.5.20 || ^9.3.8",
+        "squizlabs/php_codesniffer": "^3.5.8"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-league-tactician.spec b/php-league-tactician.spec
index e510634..fbe8004 100644
--- a/php-league-tactician.spec
+++ b/php-league-tactician.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-league-tactician
 #
-# Copyright (c) 2019 Remi Collet
+# Copyright (c) 2019-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 # Github
-%global gh_commit    d0339e22fd9252fb0fa53102b488d2c514483b8a
+%global gh_commit    e79f763170f3d5922ec29e85cffca0bac5cd8975
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     thephpleague
 %global gh_project   tactician
@@ -19,7 +19,7 @@
 %global ns_project   Tactician
 
 Name:           php-%{pk_vendor}-%{pk_name}
-Version:        1.0.3
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        A small, flexible command bus
 
@@ -30,27 +30,27 @@ Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-date
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "mockery/mockery": "~0.9",
-#        "phpunit/phpunit": "^4.8.35",
-#        "squizlabs/php_codesniffer": "~2.3"
+#        "mockery/mockery": "^1.3",
+#        "phpunit/phpunit": "^7.5.20 || ^9.3.8",
+#        "squizlabs/php_codesniffer": "^3.5.8"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(mockery/mockery) >= 0.9   with php-composer(mockery/mockery) < 1)
+BuildRequires: (php-composer(mockery/mockery) >= 1.3   with php-composer(mockery/mockery) < 2)
 # remirepo:3
 %else
-BuildRequires:  php-deepend-Mockery >= 0.9
+BuildRequires:  php-mockery >= 1.3
 %endif
-BuildRequires:  php-composer(phpunit/phpunit) >= 4.0
+BuildRequires:  phpunit9 >= 9.3.8
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require": {
-#        "php":  ">=5.5"
-Requires:       php(language) >= 5.5
+#        "php":  ">=7.1"
+Requires:       php(language) >= 7.1
 # From phpcompatifo report for 1.0.3
 Requires:       php-spl
 # Autoloader
@@ -92,15 +92,15 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('League\\Tactician\\Tests\\', dirname(__DIR__).'/tests');
 \Fedora\Autoloader\Dependencies::required([
     dirname(__DIR__).'/tests/Fixtures/Command/CommandWithoutNamespace.php',
-    '%{_datadir}/php/Mockery/autoload.php',
+    '%{_datadir}/php/Mockery1/autoload.php',
 ]);
 EOF
 
 : Run upstream test suite
 ret=0
-for cmd in php php70 php72 php73; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose || ret=1
+    $cmd %{_bindir}/phpunit9 --verbose || ret=1
   fi
 done
 exit $ret
@@ -116,6 +116,11 @@ exit $ret
 
 
 %changelog
+* Thu Mar 18 2021 Remi Collet <remi@remirepo.net> - 1.1.0-1
+- update to 1.1.0
+- raise dependency to PHP 7.1
+- switch to phpunit9
+
 * Thu Jan  3 2019 Remi Collet <remi@remirepo.net> - 1.0.3-1
 - initial package, version 1.0.3
 
-- 
cgit