Merge branch 'QA_5_0'

ChangeLog

@@ -23,6 +23,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

composer.json

@@ -50,6 +50,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",
@@ -57,7 +58,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"
     },

libraries/classes/Twig/I18n/NodeTrans.php

@@ -8,8 +8,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;
 

libraries/classes/Twig/I18n/TokenParserTrans.php

@@ -8,8 +8,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;
 
@@ -23,7 +22,7 @@ class TokenParserTrans extends TransTokenParser
      *
      * @param Token $token Twig token to parse
      *
-     * @return TransNode
+     * @return NodeTrans
      *
      * @throws Twig_Error_Syntax
      */

libraries/classes/Twig/I18nExtension.php

@@ -8,8 +8,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;