From 54ae3a456302b1e91a1998bb6d47467aa6772c9c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 18 Aug 2022 07:40:56 +0200
Subject: update to 2.3.0

---
 composer.json       |  8 ++++----
 php-sabre-uri2.spec | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 859c3c0..0e0cf2d 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "homepage": "http://sabre.io/uri/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^7.4 || ^8.0"
     },
     "authors": [
         {
@@ -37,9 +37,9 @@
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.19.3",
-        "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
+        "friendsofphp/php-cs-fixer": "^3.9",
+        "phpstan/phpstan": "^1.8",
+        "phpunit/phpunit" : "^9.0"
     },
     "scripts": {
         "phpstan": [
diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec
index ec9ed1f..6915bf5 100644
--- a/php-sabre-uri2.spec
+++ b/php-sabre-uri2.spec
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    cd2476fc4ca13e39bf00df605d91b1c22cc9d24d
+%global gh_commit    4e84208b86d351e8a439613f318feda7a0152b48
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   uri
@@ -24,7 +24,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Summary:        Functions for making sense out of URIs
-Version:        2.2.3
+Version:        2.3.0
 Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -35,11 +35,11 @@ Source1:        makesrc.sh
 
 BuildArch:      noarch
 %if %{with tests}
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 7.4
 # From composer.json, "require-dev": {
-#        "friendsofphp/php-cs-fixer": "~2.17.1",
-#        "phpstan/phpstan": "^0.12",
-#        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
+#        "friendsofphp/php-cs-fixer": "^3.9",
+#        "phpstan/phpstan": "^1.8",
+#        "phpunit/phpunit" : "^9.0"
 BuildRequires:  php-pcre
 BuildRequires:  phpunit9
 %global phpunit %{_bindir}/phpunit9
@@ -48,8 +48,8 @@ BuildRequires:  phpunit9
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require" : {
-#        "php": "^7.1 || ^8.0"
-Requires:       php(language) > 7.1
+#        "php": "^7.4 || ^8.0"
+Requires:       php(language) > 7.4
 # From phpcompatinfo report for version 2.1.2
 Requires:       php-pcre
 # Autoloader
@@ -113,7 +113,7 @@ mkdir vendor
 ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php
 
 cd tests
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -136,6 +136,9 @@ exit $ret
 
 
 %changelog
+* Thu Aug 18 2022 Remi Collet <remi@remirepo.net> - 2.3.0-1
+- update to 2.3.0
+
 * Thu Aug 18 2022 Remi Collet <remi@remirepo.net> - 2.2.3-1
 - update to 2.2.3
 
-- 
cgit