From cccbf03229a2f95d08be703de7fc59337be0e5fe Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 26 Oct 2022 15:15:30 +0200
Subject: update to 2.11.0

raise dependency on PHP 8.0
---
 composer.json                |  8 +++-----
 php-laminas-progressbar.spec | 29 +++++++++++++++--------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index ae2fc0b..9f8512f 100644
--- a/composer.json
+++ b/composer.json
@@ -19,17 +19,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "laminas/laminas-stdlib": "^3.2.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-json": "^3.0.0",
-        "laminas/laminas-session": "^2.8.5",
-        "phpunit/phpunit": "^9.3"
+        "laminas/laminas-session": "^2.13",
+        "phpunit/phpunit": "^9.5.25"
     },
     "suggest": {
-        "laminas/laminas-json": "Laminas\\Json component",
         "laminas/laminas-session": "To support progressbar persistent"
     },
     "autoload": {
diff --git a/php-laminas-progressbar.spec b/php-laminas-progressbar.spec
index b7f70fa..c9c0e01 100644
--- a/php-laminas-progressbar.spec
+++ b/php-laminas-progressbar.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    cb57c459f3c2cef516e6d36218b70f780289d383
+%global gh_commit    f4ab187791a64370825e9012b756e49d568230ea
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-progressbar
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.10.1
+Version:        2.11.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -34,7 +34,7 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.3
+BuildRequires:  php(language) >= 8.0
 BuildRequires:  php-date
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
@@ -44,29 +44,26 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.2.
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0     with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "require-dev": {
 #        "laminas/laminas-coding-standard": "~1.0.0",
-#        "laminas/laminas-json": "^3.0.0",
-#        "laminas/laminas-session": "^2.8.5",
-#        "phpunit/phpunit": "^9.3"
+#        "laminas/laminas-session": "^2.23",
+#        "phpunit/phpunit": "^9.5.25"
 # ignore max version
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-json)                  >= 3.0.0   with php-autoloader(%{gh_owner}/laminas-json)                  < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)               >= 2.8.5   with php-autoloader(%{gh_owner}/laminas-session)               < 3)
-# remirepo:6
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)               >= 2.13    with php-autoloader(%{gh_owner}/laminas-session)               < 3)
+# remirepo:5
 %else
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
-BuildRequires:  php-laminas-json
 BuildRequires:  php-laminas-session
 %endif
 %global phpunit %{_bindir}/phpunit9
-BuildRequires:  phpunit9 >= 9.3
+BuildRequires:  phpunit9 >= 9.5.25
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
 #        "laminas/laminas-stdlib": "^3.2.1"
-Requires:       php(language) >= 7.3
+Requires:       php(language) >= 8.0
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -170,7 +167,7 @@ exit (class_exists("\\Zend\\%{library}\\ProgressBar") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php80 php81 php82; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -193,6 +190,10 @@ exit $ret
 
 
 %changelog
+* Wed Oct 26 2022 Remi Collet <remi@remirepo.net> - 2.11.0-1
+- update to 2.11.0
+- raise dependency on PHP 8.0
+
 * Mon Aug  1 2022 Remi Collet <remi@remirepo.net> - 2.10.1-1
 - update to 2.10.1
 
-- 
cgit