phpmyadmin
diff --git a/‎psalm-baseline.xml‎
Lines changed: 0 additions & 5 deletions b/‎psalm-baseline.xml‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎src/Template.php‎
Lines changed: 5 additions & 2 deletions b/‎src/Template.php‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/Twig/PmaGlobalVariable.php‎
Lines changed: 0 additions & 28 deletions b/‎src/Twig/PmaGlobalVariable.php‎
Lines changed: 0 additions & 28 deletions
diff --git a/‎tests/unit/Twig/PmaGlobalVariableTest.php‎
Lines changed: 5 additions & 26 deletions b/‎tests/unit/Twig/PmaGlobalVariableTest.php‎
Lines changed: 5 additions & 26 deletions
@@ -8129,11 +8129,6 @@
       <code><![CDATA[empty($_POST['item_timing'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Twig/PmaGlobalVariable.php">
-    <UnusedParam>
-      <code><![CDATA[$arguments]]></code>
-    </UnusedParam>
-  </file>
   <file src="src/TwoFactor.php">
     <DeprecatedMethod>
       <code><![CDATA[Config::getInstance()]]></code>
 
@@ -7,10 +7,10 @@
 use PhpMyAdmin\Container\ContainerBuilder;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Html\MySQLDocumentation;
+use PhpMyAdmin\I18n\LanguageManager;
 use PhpMyAdmin\Theme\ThemeManager;
 use PhpMyAdmin\Twig\I18nExtension;
 use PhpMyAdmin\Twig\MessageExtension;
-use PhpMyAdmin\Twig\PmaGlobalVariable;
 use PhpMyAdmin\Utils\Gis;
 use RuntimeException;
 use Throwable;
@@ -61,7 +61,10 @@ public static function getTwigEnvironment(string|null $cacheDir, bool $isDevEnv)
             $twig->disableStrictVariables();
         }
 
-        $twig->addGlobal('pma', new PmaGlobalVariable());
+        $twig->addGlobal('pma', [
+            'version' => Version::VERSION,
+            'text_dir' => LanguageManager::$textDirection->value,
+        ]);
         $twig->addExtension(new AttributeExtension(Core::class));
         $twig->addExtension(new AttributeExtension(FlashMessenger::class));
         $twig->addExtension(new AttributeExtension(Generator::class));
 
@@ -9,15 +9,13 @@
 use PhpMyAdmin\I18n\TextDirection;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
-use PhpMyAdmin\Twig\PmaGlobalVariable;
 use PhpMyAdmin\Version;
 use PHPUnit\Framework\Attributes\CoversClass;
 use ReflectionProperty;
-use RuntimeException;
 use Twig\Error\RuntimeError;
 use Twig\Loader\FilesystemLoader;
 
-#[CoversClass(PmaGlobalVariable::class)]
+#[CoversClass(Template::class)]
 final class PmaGlobalVariableTest extends AbstractTestCase
 {
     protected function setUp(): void
@@ -36,32 +34,13 @@ protected function tearDown(): void
         (new ReflectionProperty(Template::class, 'twig'))->setValue(null, null);
     }
 
-    public function testUndefinedVariable(): void
-    {
-        self::expectException(RuntimeException::class);
-        self::expectExceptionMessage('The "pma.undefined_variable" variable is not available.');
-        /**
-         * @psalm-suppress UndefinedMagicMethod
-         * @phpstan-ignore-next-line
-         */
-        (new PmaGlobalVariable())->undefined_variable();
-    }
-
-    public function testVersion(): void
-    {
-        self::assertSame(Version::VERSION, (new PmaGlobalVariable())->version());
-    }
-
-    public function testTextDir(): void
-    {
-        LanguageManager::$textDirection = TextDirection::LeftToRight;
-        self::assertSame('ltr', (new PmaGlobalVariable())->text_dir());
-    }
-
     public function testUndefinedVariableFromTwig(): void
     {
         self::expectException(RuntimeError::class);
-        self::expectExceptionMessage('The "pma.undefined_variable" variable is not available.');
+        self::expectExceptionMessage(
+            'Key "undefined_variable" for sequence/mapping with keys "version, text_dir" does not exist'
+            . ' in "pma_global_variable/undefined_variable.twig" at line 1.',
+        );
         (new Template(new Config()))->render('pma_global_variable/undefined_variable', []);
     }