Merge pull request #530 from kamil-tekiela/types-in-Translator

Add native property types in Translator

Author: MauricioFauth

psalm-baseline.xml

@@ -984,12 +984,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>

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;
         }