Code improvement

src/fbt/Transform/FbtTransform/FbtUtils.php

@@ -397,6 +397,7 @@ public static function filterEmptyNodes(array $nodes): array
      * Does the token substitution fbt() but without the string lookup.
      * Used for in-place substitutions in translation mode.
      *
+     * @return string|array
      * @throws \fbt\Exceptions\FbtException
      */
     public static function substituteTokens($template, $_args)

src/fbt/Transform/FbtTransform/Translate/FBLocaleToLang.php

@@ -41,7 +41,7 @@ class FBLocaleToLang
         "qt_US" => "tli",
     ];
 
-    public static function get($locale): string
+    public static function get(string $locale): string
     {
         // If given an fb-locale ("xx_XX"), try to map it to a language.  Otherwise
         // return "xx".  If no '_' is found, return locale as-is.

src/fbt/Transform/FbtTransform/Translate/FbtSite.php

@@ -125,14 +125,12 @@ public static function fromScan($json): FbtSite
             ];
         }
 
-        $fbtSite = new FbtSite(
+        return new FbtSite(
             $json['type'],
             $json['hashToText'],
             $tableData,
             $json['project']
         );
-
-        return $fbtSite;
     }
 
     public function serialize(): array

src/fbt/Transform/FbtTransform/Translate/FbtSiteMetaEntry.php

@@ -60,9 +60,9 @@ public function getVariationMask()
 
         if ($this->_type === null) {
             return $this->_mask;
-        } else {
-            return self::getVariationMaskFromType($this->_type);
         }
+
+        return self::getVariationMaskFromType($this->_type);
     }
 
     public function unwrap(): array

src/fbt/Transform/FbtTransform/Translate/Gender/IntlGenderType.php

@@ -21,10 +21,10 @@ class IntlGenderType
     ];
 
     /**
-     * @param $lang
+     * @param string $lang
      * @return IntlDefaultGenderType|IntlMergedUnknownGenderType
      */
-    public static function forLanguage($lang)
+    public static function forLanguage(string $lang)
     {
         if (array_key_exists($lang, self::MERGED_LANGS)) {
             return new IntlMergedUnknownGenderType();
@@ -34,10 +34,10 @@ public static function forLanguage($lang)
     }
 
     /**
-     * @param $locale
+     * @param string $locale
      * @return IntlDefaultGenderType|IntlMergedUnknownGenderType
      */
-    public static function forLocale($locale)
+    public static function forLocale(string $locale)
     {
         if (array_key_exists($locale, self::MERGED_LOCALES)) {
             return new IntlMergedUnknownGenderType();

src/fbt/Transform/FbtTransform/Translate/TranslationConfig.php

@@ -21,7 +21,7 @@ public function __construct($numberType, $genderType)
     }
 
     public function getTypesFromMask(
-        $mask // IntlVariationType
+        int $mask // IntlVariationType
     ): array {
         if ($mask === IntlVariations::INTL_FBT_VARIATION_TYPE['NUMBER']) {
             $types = $this->numberType->getNumberVariations();

src/fbt/fbs.php

@@ -40,6 +40,7 @@ public function __toString(): string
             $attributes['desc'] = $this->description;
         }
         $attributes += $this->options;
+
         foreach ($attributes as $attribute => $value) {
             if (array_key_exists($attribute, FbtUtils::SHORT_BOOL_CANDIDATES)) {
                 $attributes[$attribute] = $value === true ? 'true' : 'false';

src/fbt/fbt.php

@@ -92,14 +92,14 @@ public static function sameParam(string $name): string
         ]);
     }
 
-    public static function c(string $name, array $options = [])
+    public static function c(string $name, array $options = []): fbs
     {
         return new fbs($name, $options + [
             'common' => true,
         ]);
     }
 
-    public function _trace(array $trace): void
+    public function _trace(array $trace)
     {
         $this->trace = $trace;
     }
@@ -118,6 +118,7 @@ public function __toString(): string
         $attributes = [
             'desc' => $this->description,
         ] + $this->options;
+
         foreach ($attributes as $attribute => $value) {
             if (array_key_exists($attribute, FbtUtils::SHORT_BOOL_CANDIDATES)) {
                 $attributes[$attribute] = $value === true ? 'true' : 'false';

src/fbt/helpers.php

@@ -146,7 +146,6 @@ function rsearch($folder, $pattern): \Generator
         $ite = new \RecursiveIteratorIterator($dir);
         $files = new \RegexIterator($ite, $pattern, \RegexIterator::MATCH);
 
-
         foreach ($files as $file) {
             yield $file->getPathName();
         }