From 5bc9971e4aea48542cec0a41ffafb068ebb79d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 19 Dec 2019 16:49:58 -0300
Subject: [PATCH] Replace twig/extensions with phpmyadmin/twig-i18n-extension
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 ChangeLog                                        | 1 +
 composer.json                                    | 2 +-
 libraries/classes/Twig/I18n/NodeTrans.php        | 2 +-
 libraries/classes/Twig/I18n/TokenParserTrans.php | 5 ++---
 libraries/classes/Twig/I18nExtension.php         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f42c6bfb3..7b6a846e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - issue        Fixed wrong jQuery function call in table search page
 - issue #15761 Fix uncaught TypeError when using "$cfg['ServerDefault'] = 0;"
 - issue #15780 Fixed unexpected UI of action links (text only mode)
+- issue #15674 Replace twig/extensions with phpmyadmin/twig-i18n-extension
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value
diff --git a/composer.json b/composer.json
index 6ef2747c5e..3e663d8599 100644
--- a/composer.json
+++ b/composer.json
@@ -49,6 +49,7 @@
         "phpmyadmin/motranslator": "^4.0",
         "phpmyadmin/shapefile": "^2.0",
         "phpmyadmin/sql-parser": "^5.0",
+        "phpmyadmin/twig-i18n-extension": "^2.0",
         "phpseclib/phpseclib": "^2.0",
         "symfony/config": "^4.2.8",
         "symfony/dependency-injection": "^4.2.8",
@@ -56,7 +57,6 @@
         "symfony/polyfill-ctype": "^1.8",
         "symfony/polyfill-mbstring": "^1.3",
         "symfony/yaml": "^4.2.8",
-        "twig/extensions": "~1.5.1",
         "twig/twig": "^2.4",
         "williamdes/mariadb-mysql-kbs": "^1.2"
     },
diff --git a/libraries/classes/Twig/I18n/NodeTrans.php b/libraries/classes/Twig/I18n/NodeTrans.php
index 6fae7aa8e8..ed4b271723 100644
--- a/libraries/classes/Twig/I18n/NodeTrans.php
+++ b/libraries/classes/Twig/I18n/NodeTrans.php
@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Twig\I18n;
 
+use PhpMyAdmin\Twig\Extensions\Node\TransNode;
 use Twig\Compiler;
-use Twig\Extensions\Node\TransNode;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Node;
 
diff --git a/libraries/classes/Twig/I18n/TokenParserTrans.php b/libraries/classes/Twig/I18n/TokenParserTrans.php
index 25aade09bf..adcf8c86e5 100644
--- a/libraries/classes/Twig/I18n/TokenParserTrans.php
+++ b/libraries/classes/Twig/I18n/TokenParserTrans.php
@@ -9,8 +9,7 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Twig\I18n;
 
-use Twig\Extensions\Node\TransNode;
-use Twig\Extensions\TokenParser\TransTokenParser;
+use PhpMyAdmin\Twig\Extensions\TokenParser\TransTokenParser;
 use Twig\Token;
 use Twig_Error_Syntax;
 
@@ -26,7 +25,7 @@ class TokenParserTrans extends TransTokenParser
      *
      * @param Token $token Twig token to parse
      *
-     * @return TransNode
+     * @return NodeTrans
      *
      * @throws Twig_Error_Syntax
      */
diff --git a/libraries/classes/Twig/I18nExtension.php b/libraries/classes/Twig/I18nExtension.php
index 4d0c14f949..7d3a9564a9 100644
--- a/libraries/classes/Twig/I18nExtension.php
+++ b/libraries/classes/Twig/I18nExtension.php
@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Twig;
 
+use PhpMyAdmin\Twig\Extensions\I18nExtension as TwigI18nExtension;
 use PhpMyAdmin\Twig\I18n\TokenParserTrans;
-use Twig\Extensions\I18nExtension as TwigI18nExtension;
 use Twig\TokenParser\TokenParserInterface;
 use Twig\TwigFilter;