From 082ab3738fa134831330d11d684a3e204511b170 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Sep 2019 15:15:04 +0200 Subject: - rename to php-phpmyadmin-sql-parser5 - move to /usr/share/php/PhpMyAdmin/SqlParser5 - raise dependency on PHP 7.1 - switch to phpunit7 - add patch for PHP 7.4 from https://github.com/phpmyadmin/sql-parser/pull/258 --- 258.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 258.patch (limited to '258.patch') diff --git a/258.patch b/258.patch new file mode 100644 index 0000000..ba6220a --- /dev/null +++ b/258.patch @@ -0,0 +1,35 @@ +From 579f7445f7cfd8c3ff07f20fe836a1c56518656e Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 2 Sep 2019 15:02:02 +0200 +Subject: [PATCH] fix implode arg. order + +--- + src/Components/Expression.php | 2 +- + src/Components/ExpressionArray.php | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Components/Expression.php b/src/Components/Expression.php +index 9c21def5..108f3350 100644 +--- a/src/Components/Expression.php ++++ b/src/Components/Expression.php +@@ -433,7 +433,7 @@ public static function parse(Parser $parser, TokensList $list, array $options = + public static function build($component, array $options = []) + { + if (is_array($component)) { +- return implode($component, ', '); ++ return implode(', ', $component); + } + + if ($component->expr !== '' && ! is_null($component->expr)) { +diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php +index 2f44d7af..eb05aac9 100644 +--- a/src/Components/ExpressionArray.php ++++ b/src/Components/ExpressionArray.php +@@ -122,6 +122,6 @@ public static function build($component, array $options = []) + $ret[] = $frag::build($frag); + } + +- return implode($ret, ', '); ++ return implode(', ', $ret); + } + } -- cgit