From b87810c7b8f59eee653083b79a4b3095d8282382 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 7 Dec 2022 09:18:29 +0100
Subject: update to 1.2.14

---
 composer.json                         | 25 ++++++++++++++++++-------
 php-williamdes-mariadb-mysql-kbs.spec | 17 ++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 094063d..00bcfef 100644
--- a/composer.json
+++ b/composer.json
@@ -40,11 +40,11 @@
         }
     ],
     "scripts": {
-        "build": "./src/merge.php",
-        "test": "./vendor/bin/phpunit",
-        "phpstan": "./vendor/bin/phpstan",
-        "phpcs": "./vendor/bin/phpcs --no-cache",
-        "phpcbf": "./vendor/bin/phpcbf"
+        "build": "@php ./src/merge.php",
+        "test": "@php phpunit",
+        "phpstan": "@php phpstan",
+        "phpcs": "@php phpcs",
+        "phpcbf": "@php phpcbf"
     },
     "require": {
         "php": "^7.1 || ^8.0"
@@ -52,7 +52,7 @@
     "require-dev": {
         "phpunit/phpunit": "^7 || ^8 || ^9",
         "phpstan/phpstan": "^1.2",
-        "wdes/coding-standard": "^3",
+        "wdes/coding-standard": "^3.2.1",
         "swaggest/json-schema": "^0.12.29"
     },
     "autoload": {
@@ -67,5 +67,16 @@
     },
     "non-feature-branches": [
         "update/*"
-    ]
+    ],
+    "config": {
+        "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 008ce44..31f35e0 100644
--- a/php-williamdes-mariadb-mysql-kbs.spec
+++ b/php-williamdes-mariadb-mysql-kbs.spec
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    f5c1b00d4bcfb27c06595ae172aa69da1815bfa9
+%global gh_commit    d829a96ad07d79065fbc818a3bd01f2266c3890b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     williamdes
 %global gh_project   mariadb-mysql-kbs
@@ -23,7 +23,7 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        1.2.13
+Version:        1.2.14
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        An index of the MariaDB and MySQL Knowledge bases
 
@@ -36,14 +36,14 @@ Source1:        makesrc.sh
 Patch0:         %{name}-layout.patch
 
 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-json
 BuildRequires:  php-pcre
 # For tests, from composer.json "require-dev": {
 #        "phpunit/phpunit": "^7 || ^8 || ^9",
 #        "phpstan/phpstan": "^1.2",
-#        "wdes/coding-standard": "^3",
+#        "wdes/coding-standard": "^3.2.1",
 #        "swaggest/json-schema": "^0.12.29"
 BuildRequires:  phpunit9
 %global phpunit %{_bindir}/phpunit9
@@ -113,7 +113,7 @@ cp -pr schemas %{buildroot}%{_datadir}/%{name}/schemas
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
@@ -125,7 +125,7 @@ EOF
 export RPM_BUILDROOT=%{buildroot}
 
 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} --no-coverage --verbose || ret=1
@@ -146,7 +146,7 @@ exit $ret
 %dir     %{_datadir}/php/%{ns_vendor}/
          %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}
 %exclude %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/merge.php
-%exclude %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/*.js
+%exclude %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/rust
 %dir     %{_datadir}/%{name}/
          %{_datadir}/%{name}/dist
 %doc     %{_datadir}/%{name}/data
@@ -154,6 +154,9 @@ exit $ret
 
 
 %changelog
+* Wed Dec  7 2022 Remi Collet <remi@remirepo.net> - 1.2.14-1
+- update to 1.2.14
+
 * Mon Dec 20 2021 Remi Collet <remi@remirepo.net> - 1.2.13-1
 - update to 1.2.13
 
-- 
cgit