Merge pull request phpmyadmin#19507 from MauricioFauth/tcpdf-language…

…-array Replace $GLOBALS['l'] with TCPDF::setLanguageArray()
liviuconcioiu · Jan 11, 2025 · db2635c · db2635c
2 parents 5a10863 + 5ac0d3c
commit db2635c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 27 deletions.
diff --git a/libraries/classes/Language.php b/libraries/classes/Language.php
@@ -4,7 +4,6 @@
 
 namespace PhpMyAdmin;
 
-use function __;
 use function _bindtextdomain;
 use function _setlocale;
 use function _textdomain;
@@ -192,17 +191,6 @@ public function activate(): void
             $GLOBALS['text_dir'] = 'ltr';
         }
 
-        /* TCPDF */
-        $GLOBALS['l'] = [];
-
-        /* TCPDF settings */
-        $GLOBALS['l']['a_meta_charset'] = 'UTF-8';
-        $GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir'];
-        $GLOBALS['l']['a_meta_language'] = $this->code;
-
-        /* TCPDF translations */
-        $GLOBALS['l']['w_page'] = __('Page number:');
-
         /* Show possible warnings from langauge selection */
         LanguageManager::getInstance()->showWarnings();
     }

diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php
@@ -60,6 +60,12 @@ public function __construct(
         $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
         $this->setFont(self::PMA_PDF_FONT, '', 14);
         $this->setFooterFont([self::PMA_PDF_FONT, '', 14]);
+        $this->setLanguageArray([
+            'a_meta_charset' => 'UTF-8',
+            'a_meta_dir' => $GLOBALS['text_dir'],
+            'a_meta_language' => $GLOBALS['lang'],
+            'w_page' => __('Page number:'),
+        ]);
     }
 
     /**

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -22180,21 +22180,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Language.php
 
-		-
-			message: "#^Cannot access offset 'a_meta_dir' on mixed\\.$#"
-			count: 1
-			path: libraries/classes/Language.php
-
-		-
-			message: "#^Cannot access offset 'a_meta_language' on mixed\\.$#"
-			count: 1
-			path: libraries/classes/Language.php
-
-		-
-			message: "#^Cannot access offset 'w_page' on mixed\\.$#"
-			count: 1
-			path: libraries/classes/Language.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1

diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -93,6 +93,7 @@ protected function setUp(): void
         $GLOBALS['db'] = '';
         $GLOBALS['table'] = '';
         $GLOBALS['PMA_PHP_SELF'] = '';
+        $GLOBALS['lang'] = 'en';
 
         // Config before DBI
         $this->setGlobalConfig();

diff --git a/test/classes/Html/SecurityTest.php b/test/classes/Html/SecurityTest.php
@@ -30,6 +30,7 @@ protected function tearDown(): void
 
     public function testInjectCodeUsingTemplate(): void
     {
+        $GLOBALS['lang'] = '';
         self::assertSame('?db=%3Cscript%3Ealert%28%27%26%3D%21%3A%3B%27%29%3B%3C%2Fscr'
         . 'ipt%3E&amp;table=%26mytable%3E1%3F&amp;server=12'
         . "\n"