update to 1.3.0HEADmaster

2 files changed, 21 insertions, 33 deletions

diff --git a/composer.json b/composer.json
index 00bcfef..9afbaa1 100644
--- a/composer.json
+++ b/composer.json
@@ -47,13 +47,13 @@
         "phpcbf": "@php phpcbf"
     },
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^7.2 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7 || ^8 || ^9",
-        "phpstan/phpstan": "^1.2",
-        "wdes/coding-standard": "^3.2.1",
-        "swaggest/json-schema": "^0.12.29"
+        "phpunit/phpunit": "^8 || ^9 || ^10 || ^11",
+        "phpstan/phpstan": "^1.10",
+        "wdes/coding-standard": "^3.3.2",
+        "swaggest/json-schema": "^0.12.42"
     },
     "autoload": {
         "psr-4": {
@@ -72,11 +72,5 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
-    },
-    "archive": {
-        "exclude": [
-            "/test",
-            "/phpunit.xml"
-        ]
     }
 }
diff --git a/php-williamdes-mariadb-mysql-kbs.spec b/php-williamdes-mariadb-mysql-kbs.spec
index 31f35e0..7579ba8 100644
--- a/php-williamdes-mariadb-mysql-kbs.spec
+++ b/php-williamdes-mariadb-mysql-kbs.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-williamdes-mariadb-mysql-kbs
 #
-# Copyright (c) 2019-2021 Remi Collet
+# Copyright (c) 2019-2024 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    d829a96ad07d79065fbc818a3bd01f2266c3890b
+%global gh_commit    07106dab252127c329cc206cd79cf2f51f989e5e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     williamdes
 %global gh_project   mariadb-mysql-kbs
@@ -23,11 +23,11 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        1.2.14
+Version:        1.3.0
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        An index of the MariaDB and MySQL Knowledge bases
 
-License:        MPLv2.0
+License:        MPL-2.0
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # pull from github to retrieve full data
 Source0:        %{name}-%{version}-%{?gh_short}.tgz
@@ -37,31 +37,24 @@ Patch0:         %{name}-layout.patch
 
 BuildArch:      noarch
 %if %{with tests}
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-json
 BuildRequires:  php-pcre
 # For tests, from composer.json "require-dev": {
-#        "phpunit/phpunit": "^7 || ^8 || ^9",
+#        "phpunit/phpunit": "^8 || ^9 || ^10 || ^11"",
 #        "phpstan/phpstan": "^1.2",
 #        "wdes/coding-standard": "^3.2.1",
 #        "swaggest/json-schema": "^0.12.29"
-BuildRequires:  phpunit9
-%global phpunit %{_bindir}/phpunit9
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:  phpunit10
+%global phpunit %{_bindir}/phpunit10
 BuildRequires: (php-composer(swaggest/json-schema)    >= 0.12.29 with php-composer(swaggest/json-schema)    < 1)
-# remirepo:4
-%else
-BuildRequires:  php-swaggest-json-schema    <  1
-BuildRequires:  php-swaggest-json-schema    >= 0.12.29
-%endif
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require": {
-#        "php": "^7.1 || ^8.0"
-Requires:       php(language) >= 7.1
+#        "php": "^7.2 || ^8.0"
+Requires:       php(language) >= 7.2
 # From phpcompatinfo report for 1.2.7
 Requires:       php-json
 Requires:       php-pcre
@@ -81,7 +74,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1 -b .rpm
+%patch -P0 -p1 -b .rpm
 find src -name \*.rpm -delete
 
 : Create autoloader
@@ -125,10 +118,10 @@ EOF
 export RPM_BUILDROOT=%{buildroot}
 
 ret=0
-for cmdarg in "php %{phpunit}" php80 php81 php82; do
+for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do
    if which $cmdarg; then
       set $cmdarg
-      $1 ${2:-%{_bindir}/phpunit9} --no-coverage --verbose || ret=1
+      $1 ${2:-%{_bindir}/phpunit10} --no-coverage || ret=1
    fi
 done
 exit $ret
@@ -138,8 +131,6 @@ exit $ret
 
 
 %files
-# remirepo:1
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
 %doc *.md
@@ -154,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Mon Jul  8 2024 Remi Collet <remi@remirepo.net> - 1.3.0-1
+- update to 1.3.0
+
 * Wed Dec  7 2022 Remi Collet <remi@remirepo.net> - 1.2.14-1
 - update to 1.2.14