From 515fa99cb092a16b9310f894fce04a0fad1c5150 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 1 Nov 2018 08:04:53 +0100
Subject: update to 4.2.5 switch to phpunit6

---
 composer.json                  |  5 +++--
 php-phpmyadmin-sql-parser.spec | 25 ++++++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 16054d7..d6e1c09 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "phpmyadmin/sql-parser",
     "description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "keywords": ["sql", "lexer", "parser", "analysis"],
     "homepage": "https://github.com/phpmyadmin/sql-parser",
     "authors": [
@@ -20,8 +20,9 @@
         "symfony/polyfill-mbstring": "^1.3"
     },
     "require-dev": {
+        "sami/sami": "^4.0",
         "phpunit/php-code-coverage": "*",
-        "phpunit/phpunit": "~4.8 || ~5.7"
+        "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5"
     },
     "conflict": {
         "phpmyadmin/motranslator": "<3.0"
diff --git a/php-phpmyadmin-sql-parser.spec b/php-phpmyadmin-sql-parser.spec
index ca4eedb..b1e887f 100644
--- a/php-phpmyadmin-sql-parser.spec
+++ b/php-phpmyadmin-sql-parser.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 
-%global gh_commit    10f4e571ba3903593ea7e2c4ec5304f3c0323a98
+%global gh_commit    a156028d60b4b9e11f43cc432f0a19507e87c658
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpmyadmin
 #global gh_date      20150820
@@ -17,8 +17,8 @@
 %global ns_project   SqlParser
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        4.2.4
-Release:        3%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
+Version:        4.2.5
+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+
@@ -36,8 +36,14 @@ BuildRequires:  php-composer(phpmyadmin/motranslator) >= 3.0
 BuildRequires:  php-mbstring
 # For tests, from composer.json "require-dev": {
 #        "phpunit/php-code-coverage": "*",
-#        "phpunit/phpunit": "~4.8 || ~5.7"
+#        "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5"
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:  phpunit6 >= 6.5
+%global phpunit %{_bindir}/phpunit6
+%else
 BuildRequires:  php-composer(phpunit/phpunit)
+%global phpunit %{_bindir}/phpunit
+%endif
 %endif
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader)
@@ -131,9 +137,10 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
-   if which $cmd; then
-      $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
+for cmdarg in "php %{phpunit}" php70 php71 php72 php73; do
+   if which $cmdarg; then
+      set $cmdarg
+      $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1
    fi
 done
 exit $ret
@@ -167,6 +174,10 @@ exit $ret
 
 
 %changelog
+* Thu Nov  1 2018 Remi Collet <remi@remirepo.net> - 4.2.5-1
+- update to 4.2.5
+- switch to phpunit6
+
 * Wed Feb 21 2018 Remi Collet <remi@remirepo.net> - 4.2.4-3
 - allow motranslator v4
 
-- 
cgit