From e6fc5d96bcaeaf3cc6f714cf30e71d08fbb7b23f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 4 Jun 2019 19:15:39 +0200
Subject: - update to 4.3.2 - add php-phpmyadmin-sql-parser-tokenize-query
 command

---
 php-phpmyadmin-sql-parser-autoload.patch | 53 ++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 10 deletions(-)

(limited to 'php-phpmyadmin-sql-parser-autoload.patch')

diff --git a/php-phpmyadmin-sql-parser-autoload.patch b/php-phpmyadmin-sql-parser-autoload.patch
index 0772d08..3cea924 100644
--- a/php-phpmyadmin-sql-parser-autoload.patch
+++ b/php-phpmyadmin-sql-parser-autoload.patch
@@ -1,6 +1,6 @@
-diff -up bin/highlight-query.rpm bin/highlight-query
---- bin/highlight-query.rpm	2017-01-23 14:31:05.207518012 +0100
-+++ bin/highlight-query	2017-01-23 14:30:38.429411132 +0100
+diff -up ./bin/highlight-query.rpm ./bin/highlight-query
+--- ./bin/highlight-query.rpm	2019-06-03 14:32:07.000000000 +0200
++++ ./bin/highlight-query	2019-06-04 19:06:37.085484476 +0200
 @@ -1,29 +1,7 @@
  #!/usr/bin/env php
  <?php
@@ -32,9 +32,9 @@ diff -up bin/highlight-query.rpm bin/highlight-query
  
  $cli = new PhpMyAdmin\SqlParser\Utils\CLI();
  exit($cli->runHighlight());
-diff -up bin/lint-query.rpm bin/lint-query
---- bin/lint-query.rpm	2017-01-23 14:29:14.954077962 +0100
-+++ bin/lint-query	2017-01-23 14:31:11.744544102 +0100
+diff -up ./bin/lint-query.rpm ./bin/lint-query
+--- ./bin/lint-query.rpm	2019-06-03 14:32:07.000000000 +0200
++++ ./bin/lint-query	2019-06-04 19:06:37.085484476 +0200
 @@ -1,29 +1,7 @@
  #!/usr/bin/env php
  <?php
@@ -66,10 +66,43 @@ diff -up bin/lint-query.rpm bin/lint-query
  
  $cli = new PhpMyAdmin\SqlParser\Utils\CLI();
  exit($cli->runLint());
-
-diff -up src/Translator.php.rpm src/Translator.php
---- src/Translator.php.rpm	2017-01-23 15:20:46.092415469 +0100
-+++ src/Translator.php	2017-01-23 15:21:01.738477917 +0100
+diff -up ./bin/tokenize-query.rpm ./bin/tokenize-query
+--- ./bin/tokenize-query.rpm	2019-06-04 19:08:04.886758030 +0200
++++ ./bin/tokenize-query	2019-06-04 19:08:09.025766484 +0200
+@@ -1,29 +1,7 @@
+ #!/usr/bin/env php
+ <?php
+ 
+-$files = array(
+-    __DIR__ . "/../vendor/autoload.php",
+-    __DIR__ . "/../../vendor/autoload.php",
+-    __DIR__ . "/../../../autoload.php",
+-    "vendor/autoload.php"
+-);
+-
+-$found = false;
+-foreach ($files as $file) {
+-    if (file_exists($file)) {
+-        require_once $file;
+-        $found = true;
+-        break;
+-    }
+-}
+-
+-if (!$found) {
+-    die(
+-        "You need to set up the project dependencies using the following commands:" . PHP_EOL .
+-        "curl -sS https://getcomposer.org/installer | php" . PHP_EOL .
+-        "php composer.phar install" . PHP_EOL
+-    );
+-}
++require '/usr/share/php/PhpMyAdmin/SqlParser/autoload.php';
+ 
+ $cli = new PhpMyAdmin\SqlParser\Utils\CLI();
+ exit($cli->runTokenize());
+diff -up ./src/Translator.php.rpm ./src/Translator.php
+--- ./src/Translator.php.rpm	2019-06-03 14:32:07.000000000 +0200
++++ ./src/Translator.php	2019-06-04 19:06:37.085484476 +0200
 @@ -40,7 +40,7 @@ class Translator
              self::$loader->textdomain('sqlparser');
  
-- 
cgit