From 6fab05debb2bedd9cb935868bacad441e33fafa3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 3 Jan 2023 08:29:15 +0100
Subject: update to 5.6.0

---
 php-phpmyadmin-sql-parser5.spec | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'php-phpmyadmin-sql-parser5.spec')

diff --git a/php-phpmyadmin-sql-parser5.spec b/php-phpmyadmin-sql-parser5.spec
index ff1e4a2..3eea8a5 100644
--- a/php-phpmyadmin-sql-parser5.spec
+++ b/php-phpmyadmin-sql-parser5.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpmyadmin-sql-parser5
 #
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2023 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    b210e219a54df9b9822880780bb3ba0fffa1f542
+%global gh_commit    63f2f77847586864a661ef009ae687dbdda0a9f1
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpmyadmin
 #global gh_date      20150820
@@ -19,8 +19,8 @@
 %global major        5
 
 Name:           php-%{gh_owner}-%{gh_project}%{major}
-Version:        5.4.2
-Release:        3%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
+Version:        5.6.0
+Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A validating SQL lexer and parser with a focus on MySQL dialect
 
 License:        GPLv2+
@@ -29,8 +29,6 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 
 # Use our autoloader and locale relocation
 Patch0:         %{name}-autoload.patch
-# Upstream patches for PHP 8.1
-Patch1:         %{name}-php81.patch
 
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -40,15 +38,19 @@ BuildRequires:  php-composer(phpmyadmin/motranslator) >= 3.0
 BuildRequires:  php-mbstring
 BuildRequires:  php-spl
 # For tests, from composer.json "require-dev": {
-#        "phpmyadmin/coding-standard": "^2.1.1",
+#        "phpmyadmin/coding-standard": "^3.0",
 #        "phpmyadmin/motranslator": "^4.0 || ^5.0",
-#        "phpstan/extension-installer": "^1.0",
-#        "phpstan/phpstan": "^0.12.54",
-#        "phpstan/phpstan-phpunit": "^0.12.16",
+#        "phpstan/extension-installer": "^1.1",
+#        "phpstan/phpstan": "^1.2",
+#        "phpstan/phpstan-phpunit": "^1.0",
 #        "phpunit/php-code-coverage": "*",
-#        "phpunit/phpunit": "^7.4 || ^8 || 9"
-BuildRequires:  phpunit9
+#        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+#        "psalm/plugin-phpunit": "^0.16.1",
+#        "vimeo/psalm": "^4.11",
+#        "zumba/json-serializer": "^3.0"
+BuildRequires:  phpunit9 >= 9.5
 %global phpunit %{_bindir}/phpunit9
+BuildRequires:  php-composer(zumba/json-serializer) >= 3.0
 %endif
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader)
@@ -90,8 +92,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %patch0 -p0 -b .rpm
 find src -name \*rpm -exec rm {} \;
-%patch1 -p1 -b .php81
-find src -name \*php81 -exec rm {} \;
 
 : Create autoloader
 cat <<'AUTOLOAD' | tee src/autoload.php
@@ -143,13 +143,16 @@ cat << 'EOF' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\', dirname(__DIR__).'/tests');
+\Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/Zumba/JsonSerializer/autoload.php',
+]);
 EOF
 
 : fix commands
 sed -e 's:%{_datadir}/php:%{buildroot}%{_datadir}/php:' -i bin/*query
 
 ret=0
-for cmdarg in "php %{phpunit}" php73 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
@@ -190,6 +193,12 @@ exit $ret
 
 
 %changelog
+* Tue Jan  3 2023 Remi Collet <remi@remirepo.net> - 5.6.0-1
+- update to 5.6.0
+
+* Thu Dec  9 2021 Remi Collet <remi@remirepo.net> - 5.5.0-1
+- update to 5.5.0
+
 * Fri Oct 29 2021 Remi Collet <remi@remirepo.net> - 5.4.2-3
 - add upstream patches for PHP 8.1
 
-- 
cgit