Reduce coupling for $langvar / translate related methods

classes/Ibank.php

@@ -94,8 +94,9 @@ public static function ibankBorrow(\PDO $pdo_db, string $lang, Reg $tkireg, Time
         \Tki\Db::logDbErrors($pdo_db, $sql, __LINE__, __FILE__);
     }
 
-    public static function ibankLogin(array $langvars, array $playerinfo, array $account): void
+    public static function ibankLogin(\PDO $pdo_db, string $lang, array $playerinfo, array $account): void
     {
+        $langvars = Translate::load($pdo_db, $lang, array('ibank', 'regional'));
         echo "<tr><td colspan=2 align=center valign=top>" . $langvars['l_ibank_welcometoibank'] . "<br>---------------------------------</td></tr>" .
             "<tr valign=top>" .
              "<td width=150 align=right>" . $langvars['l_ibank_accountholder'] . " :<br><br>" . $langvars['l_ibank_shipaccount'] . " :<br>" . $langvars['l_ibank_ibankaccount'] . "&nbsp;&nbsp;:</td>" .
@@ -107,8 +108,9 @@ public static function ibankLogin(array $langvars, array $playerinfo, array $acc
              "</tr>";
     }
 
-    public static function ibankLoans(\PDO $pdo_db, array $langvars, Reg $tkireg, array $playerinfo, array $account): void
+    public static function ibankLoans(\PDO $pdo_db, string $lang, Reg $tkireg, array $playerinfo, array $account): void
     {
+        $langvars = Translate::load($pdo_db, $lang, array('ibank', 'regional'));
         $playerinfo['ship_id'] = (int) $playerinfo['ship_id'];
         echo "<tr><td colspan=2 align=center valign=top>" . $langvars['l_ibank_loanstatus'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top><td>" . $langvars['l_ibank_shipaccount'] . " :</td><td align=right>" . number_format($playerinfo['credits'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " C</td></tr>" .

classes/IbankTransferMain.php

@@ -26,8 +26,9 @@
 
 class IbankTransferMain
 {
-    public static function main(\PDO $pdo_db, array $langvars, array $playerinfo, Reg $tkireg): void
+    public static function main(\PDO $pdo_db, string $lang, array $playerinfo, Reg $tkireg): void
     {
+        $langvars = Translate::load($pdo_db, $lang, array('ibank', 'regional'));
         $sql = "SELECT * FROM ::prefix::ships WHERE email not like '%@kabal' AND ship_destroyed ='N' AND turns_used > :ibank_min_turns ORDER BY character_name ASC";
         $stmt = $pdo_db->prepare($sql);
         $stmt->bindParam(':ibank_min_turns', $tkireg->ibank_min_turns, \PDO::PARAM_INT);

classes/IbankWithdraw.php

@@ -26,8 +26,9 @@
 
 class IbankWithdraw
 {
-    public static function before(array $langvars, array $account): void
+    public static function before(\PDO $pdo_db, $lang, array $account): void
     {
+        $langvars = Translate::load($pdo_db, $lang, array('ibank', 'regional'));
         echo "<tr><td colspan=2 align=center valign=top>" . $langvars['l_ibank_withdrawfunds'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
              "<td>" . $langvars['l_ibank_fundsavailable'] . ":</td>" .

classes/PlanetProduction.php

@@ -26,8 +26,9 @@
 
 class PlanetProduction
 {
-    public static function productionChange(\PDO $pdo_db, $old_db, array $langvars, array $prodpercentarray, Reg $tkireg): void
+    public static function productionChange(\PDO $pdo_db, $old_db, string $lang, array $prodpercentarray, Reg $tkireg): void
     {
+        $langvars = Translate::load($pdo_db, $lang, array('common', 'planet_report'));
         //  Declare default production values from the config.php file
         //
         //  We need to track what the player_id is and what team they belong to if they belong to a team,

classes/Traderoute.php

@@ -26,7 +26,7 @@
 
 class Traderoute
 {
-    public static function engage(\PDO $pdo_db, $old_db, string $lang, int $tr_repeat, array $langvars, Reg $tkireg, Timer $tkitimer, array $playerinfo, int $engage, array $traderoutes, ?int $portfull, Smarty $template): void
+    public static function engage(\PDO $pdo_db, $old_db, string $lang, int $tr_repeat, Reg $tkireg, Timer $tkitimer, array $playerinfo, int $engage, array $traderoutes, ?int $portfull, Smarty $template): void
     {
         $langvars = Translate::load($pdo_db, $lang, array('regional', 'traderoutes'));
         $traderoute = array();

composer.json

@@ -38,7 +38,7 @@
     "scripts": {
         "tests": [
             "phpcs --standard=/var/www/html/tki/vendor/bin/phpcs.xml . --ignore=templates,vendor",
-            "phpstan analyze --memory-limit 1G --no-progress --no-ansi -l 2 -c vendor/bin/phpstan.neon .",
+            "phpstan analyze --memory-limit=1G --no-progress --no-ansi -l 2 -c vendor/bin/phpstan.neon .",
             "psalm -c vendor/bin/psalm.xml --no-progress ."
             ],
         "disabled-due-to-php8-problems-tests": [

ibank.php

@@ -96,11 +96,11 @@
 
 if ($command == 'login') // Main menu
 {
-    Tki\Ibank::ibankLogin($langvars, $playerinfo, $bank_account);
+    Tki\Ibank::ibankLogin($pdo_db, $tkireg, $playerinfo, $bank_account);
 }
 elseif ($command == 'withdraw') // Withdraw menu
 {
-    Tki\IbankWithdraw::before($langvars, $bank_account);
+    Tki\IbankWithdraw::before($pdo_db, $lang, $bank_account);
 }
 elseif ($command == 'withdraw2') // Withdraw operation
 {
@@ -116,7 +116,7 @@
 }
 elseif ($command == 'transfer') // Main transfer menu
 {
-    Tki\IbankTransferMain::main($pdo_db, $langvars, $playerinfo, $tkireg);
+    Tki\IbankTransferMain::main($pdo_db, $lang, $playerinfo, $tkireg);
 }
 elseif ($command == 'transfer2') // Specific transfer menu (ship or planet)
 {
@@ -128,7 +128,7 @@
 }
 elseif ($command == 'loans') // Loans menu
 {
-    Tki\Ibank::ibankLoans($pdo_db, $langvars, $tkireg, $playerinfo, $bank_account);
+    Tki\Ibank::ibankLoans($pdo_db, $lang, $tkireg, $playerinfo, $bank_account);
 }
 elseif ($command == 'borrow') // Borrow operation
 {

planet_report.php

@@ -63,7 +63,7 @@
 {
     $title = $title . ": Production";
     echo "<h1>" . $title . "</h1>\n";
-    Tki\PlanetProduction::productionChange($pdo_db, $old_db, $langvars, $sort, $tkireg);
+    Tki\PlanetProduction::productionChange($pdo_db, $old_db, $lang, $sort, $tkireg);
 }
 elseif ($preptype == 0)                  // For typing in manually to get a report menu
 {

planet_report_ce.php

@@ -60,7 +60,7 @@
 }
 else
 {
-    Tki\PlanetProduction::productionChange($pdo_db, $old_db, $langvars, $_POST, $tkireg);
+    Tki\PlanetProduction::productionChange($pdo_db, $old_db, $lang, $_POST, $tkireg);
 }
 
 echo '<br><br>';

traderoute.php

@@ -269,7 +269,7 @@
         // Get playerinfo from database
         $players_gateway = new \Tki\Players\PlayersGateway($pdo_db);
         $playerinfo = $players_gateway->selectPlayerInfo($_SESSION['username']);
-        \Tki\Traderoute::engage($pdo_db, $old_db, $lang, $tr_repeat, $langvars, $tkireg, $tkitimer, $playerinfo, $engage, $traderoutes, $portfull, $template);
+        \Tki\Traderoute::engage($pdo_db, $old_db, $lang, $tr_repeat, $tkireg, $tkitimer, $playerinfo, $engage, $traderoutes, $portfull, $template);
         $tr_repeat--;
     }
 }