From 28d8b68dd32c459b1e0159add1d0c2eb0900c540 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 15 Jan 2024 22:40:40 +0100
Subject: [PATCH] Add native property types in Translator

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 psalm-baseline.xml | 10 ++++------
 src/Translator.php | 13 +++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d769180a..34476db4 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -998,12 +998,10 @@
     </PossiblyNullArgument>
   </file>
   <file src="src/Translator.php">
-    <DocblockTypeContradiction>
-      <code>self::$loader === null</code>
-    </DocblockTypeContradiction>
-    <RedundantConditionGivenDocblockType>
-      <code>self::$translator !== null</code>
-    </RedundantConditionGivenDocblockType>
+    <RedundantPropertyInitializationCheck>
+      <code>isset(self::$loader)</code>
+      <code>isset(self::$translator)</code>
+    </RedundantPropertyInitializationCheck>
   </file>
   <file src="src/UtfString.php">
     <PossiblyUnusedProperty>
diff --git a/src/Translator.php b/src/Translator.php
index ecb801f0..38234107 100644
--- a/src/Translator.php
+++ b/src/Translator.php
@@ -5,6 +5,7 @@
 namespace PhpMyAdmin\SqlParser;
 
 use PhpMyAdmin\MoTranslator\Loader;
+use PhpMyAdmin\MoTranslator\Translator as MoTranslator;
 
 use function class_exists;
 
@@ -15,24 +16,20 @@ class Translator
 {
     /**
      * The MoTranslator loader object.
-     *
-     * @var Loader
      */
-    private static $loader;
+    private static Loader $loader;
 
     /**
      * The MoTranslator translator object.
-     *
-     * @var \PhpMyAdmin\MoTranslator\Translator
      */
-    private static $translator;
+    private static MoTranslator $translator;
 
     /**
      * Loads translator.
      */
     public static function load(): void
     {
-        if (self::$loader === null) {
+        if (! isset(self::$loader)) {
             // Create loader object
             self::$loader = new Loader();
 
@@ -48,7 +45,7 @@ public static function load(): void
             self::$loader->bindtextdomain('sqlparser', __DIR__ . '/../locale/');
         }
 
-        if (self::$translator !== null) {
+        if (isset(self::$translator)) {
             return;
         }