PHPCS fixes, and phpstan fixes

photogabble · Apr 9, 2020 · e5ddaf1 · e5ddaf1
1 parent 88d5d14
commit e5ddaf1
Show file tree

Hide file tree

Showing 103 changed files with 375 additions and 324 deletions.
diff --git a/admin.php b/admin.php
@@ -76,7 +76,7 @@
                 {
                     $button_main = true;
                     $module_name = substr($filename[$i]['file'], 0, -4);
-                    include_once './admin/'. $filename[$i]['file'];
+                    include_once './admin/' . $filename[$i]['file'];
                 }
             }
         }

diff --git a/admin/bans_editor.php b/admin/bans_editor.php
@@ -226,10 +226,10 @@
          "<td><font size=2 color=white>" . $langvars['l_admin_ip_only'] . ": " . $ip . "</td>" .
          "<tr><td>" .
          "<input type=radio name=class value=A>" .
-         "<td><font size=2 color=white>" . $langvars['l_admin_class_a'] . ": " . $ipparts[0].$ipparts[1].$ipparts[2] . ".*</td>" .
+         "<td><font size=2 color=white>" . $langvars['l_admin_class_a'] . ": " . $ipparts[0] . $ipparts[1] . $ipparts[2] . ".*</td>" .
          "<tr><td>" .
          "<input type=radio name=class value=B>" .
-         "<td><font size=2 color=white>" . $langvars['l_admin_class_b'] . ": " . $ipparts[0].$ipparts[1] . ".*</td>" .
+         "<td><font size=2 color=white>" . $langvars['l_admin_class_b'] . ": " . $ipparts[0] . $ipparts[1] . ".*</td>" .
          "<tr><td><td><br><input type=submit value=" . $langvars['l_admin_ban'] . ">" .
          "</table>" .
          "</form>";

diff --git a/attack.php b/attack.php
@@ -19,7 +19,7 @@
 
 require_once './common.php';
 
-$login = new Tki\Login;
+$login = new Tki\Login();
 $login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_att_title'];

diff --git a/beacon.php b/beacon.php
@@ -30,7 +30,7 @@
 
 echo "<h1>" . $title . "</h1>\n";
 
-$login = new Tki\Login;
+$login = new Tki\Login();
 $login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Get playerinfo from database

diff --git a/bounty.php b/bounty.php
@@ -19,7 +19,7 @@
 
 require_once './common.php';
 
-$login = new Tki\Login;
+$login = new Tki\Login();
 $login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
@@ -376,7 +376,7 @@
                 $stmt->execute();
                 $details = $stmt->fetch(PDO::FETCH_ASSOC);
                 echo "<tr bgcolor=\"$color\">";
-                echo "<td><a href=bounty.php?bounty_on=" . $bounties[$i]['bounty_on'] . "&response=display>". $details['character_name'] . "</a></td>";
+                echo "<td><a href=bounty.php?bounty_on=" . $bounties[$i]['bounty_on'] . "&response=display>" . $details['character_name'] . "</a></td>";
                 echo "<td>" . $bounties[$i]['total_bounty'] . "</td>";
                 echo "</tr>";
 

diff --git a/check_mines.php b/check_mines.php
@@ -166,13 +166,13 @@
                         $resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0, engines=0, power=0, sensors=0, computer=0, beams=0, torp_launchers=0, torps=0, armor=0, armor_pts=100, cloak=0, shields=0, sector=1, ship_organics=0, ship_ore=0, ship_goods=0, ship_energy=?, ship_colonists=0, ship_fighters=100, dev_warpedit=0, dev_genesis=0, dev_beacon=0, dev_emerwarp=0, dev_escapepod='N', dev_fuelscoop='N', dev_minedeflector=0, on_planet='N', rating=?, cleared_defenses=' ', dev_lssd='N' WHERE ship_id=?", array(100, $rating, $playerinfo['ship_id']));
                         Tki\Db::logDbErrors($pdo_db, $resx, __LINE__, __FILE__);
 
-                        $bounty = new Tki\Bounty;
+                        $bounty = new Tki\Bounty();
                         $bounty->cancel($pdo_db, $playerinfo['ship_id']);
                     }
                     else
                     {
                         // Or they lose!
-                        $bounty = new Tki\Bounty;
+                        $bounty = new Tki\Bounty();
                         $bounty->cancel($pdo_db, $playerinfo['ship_id']);
 
                         $character_object = new Tki\Character();

diff --git a/classes/Bases.php b/classes/Bases.php
@@ -49,7 +49,7 @@ public function buildBase(\PDO $pdo_db, array $langvars, int $planet_id, int $se
         }
 
         // Build a base
-        $rs_move = new \Tki\Realspace;
+        $rs_move = new \Tki\Realspace();
         $rs_move->realSpaceMove($pdo_db, $langvars, $sector_id, $tkireg);
         echo "<br>";
         echo str_replace("[here]", "<a href='planet.php?planet_id=$planet_id'>" .

diff --git a/classes/BigBang.php b/classes/BigBang.php
@@ -21,7 +21,7 @@
 
 class BigBang
 {
-    public function findStep(string $current_file) : array
+    public function findStep(string $current_file): array
     {
         $num_files = 0;
 

diff --git a/classes/CalcLevels.php b/classes/CalcLevels.php
@@ -34,7 +34,7 @@ public static function energy(int $level_power, Reg $tkireg): float
         return $result;
     }
 
-    public static function planetBeams(\PDO $pdo_db, array $ownerinfo, Reg $tkireg, array $planetinfo) : int
+    public static function planetBeams(\PDO $pdo_db, array $ownerinfo, Reg $tkireg, array $planetinfo): int
     {
         $base_factor = ($planetinfo['base'] == 'Y') ? $tkireg->base_defense : 0;
         $planetbeams = self::abstractLevels($ownerinfo['beams'] + $base_factor, $tkireg->level_factor);
@@ -63,7 +63,7 @@ public static function planetBeams(\PDO $pdo_db, array $ownerinfo, Reg $tkireg,
         return (int) $planetbeams;
     }
 
-    public static function planetShields(\PDO $pdo_db, array $ownerinfo, Reg $tkireg, array $planetinfo) : int
+    public static function planetShields(\PDO $pdo_db, array $ownerinfo, Reg $tkireg, array $planetinfo): int
     {
         $base_factor = ($planetinfo['base'] == 'Y') ? $tkireg->base_defense : 0;
         $planetshields = self::abstractLevels($ownerinfo['shields'] + $base_factor, $tkireg->level_factor);
@@ -92,7 +92,7 @@ public static function planetShields(\PDO $pdo_db, array $ownerinfo, Reg $tkireg
         return (int) $planetshields;
     }
 
-    public static function planetTorps(\PDO $pdo_db, array $ownerinfo, array $planetinfo, Reg $tkireg) : int
+    public static function planetTorps(\PDO $pdo_db, array $ownerinfo, array $planetinfo, Reg $tkireg): int
     {
         $base_factor = ($planetinfo['base'] == 'Y') ? $tkireg->base_defense : 0;
         $torp_launchers = round(pow($tkireg->level_factor, ($ownerinfo['torp_launchers']) + $base_factor)) * 10;

diff --git a/classes/Character.php b/classes/Character.php
@@ -85,7 +85,7 @@ public function kill(\PDO $pdo_db, int $ship_id, array $langvars, Reg $tkireg, b
         $stmt->execute();
         $name = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        $headline = $name['character_name'] .' '. $langvars['l_killheadline'];
+        $headline = $name['character_name'] . ' ' . $langvars['l_killheadline'];
         $newstext = str_replace('[name]', $name['character_name'], $langvars['l_news_killed']);
 
         $sql = "INSERT INTO ::prefix::news (headline, newstext, user_id, date, news_type) " .
@@ -97,7 +97,7 @@ public function kill(\PDO $pdo_db, int $ship_id, array $langvars, Reg $tkireg, b
         $stmt->execute();
     }
 
-    public function getInsignia(\PDO $pdo_db, string $a_username, array $langvars) : string
+    public function getInsignia(\PDO $pdo_db, string $a_username, array $langvars): string
     {
         // Lookup players score.
         $players_gateway = new Players\PlayersGateway($pdo_db); // Build a player gateway object to handle the SQL calls

diff --git a/classes/Combat.php b/classes/Combat.php
@@ -501,7 +501,7 @@ public static function shipToShip(\PDO $pdo_db, array $langvars, int $ship_id, R
             else
             {
                 \Tki\PlayerLog::writeLog($pdo_db, $targetinfo['ship_id'], LogEnums::ATTACK_LOSE, "$playerinfo[character_name]|N");
-                $character_object = new Character;
+                $character_object = new Character();
                 $character_object->kill($pdo_db, $targetinfo['ship_id'], $langvars, $tkireg, false);
                 \Tki\Bounty::collect($pdo_db, $langvars, $playerinfo['ship_id'], $targetinfo['ship_id']);
             }

diff --git a/classes/Db.php b/classes/Db.php
@@ -28,7 +28,7 @@
 
 class Db
 {
-    public static function isActive(\PDO $pdo_db) : bool
+    public static function isActive(\PDO $pdo_db): bool
     {
         // Get the config_values from the DB
         $results = $pdo_db->query("SELECT * FROM ::prefix::gameconfig LIMIT 1");
@@ -82,7 +82,7 @@ public function initDb(string $db_layer)
                 // However ADOdb's postgres driver returns null if postgres insn't installed.
                 if ($db_init_result === false || $db_init_result === 0)
                 {
-                    throw new \Exception;
+                    throw new \Exception();
                 }
                 else
                 {
@@ -97,7 +97,7 @@ public function initDb(string $db_layer)
             {
                 // We need to display the error message onto the screen.
                 $err_msg = 'The Kabal Invasion - General error: Unable to connect to the ' . $db_type .
-                           ' Database. <br>Database Error: '. $db->ErrorNo();
+                           ' Database. <br>Database Error: ' . $db->ErrorNo();
                 throw new \Exception($err_msg);
             }
 
@@ -127,7 +127,7 @@ public function initDb(string $db_layer)
             catch (\PDOException $e)
             {
                 $err_msg = 'The Kabal Invasion - General error: Unable to connect to the ' . $db_type .
-                           ' Database. <br>Database Error: '. $e->getMessage();
+                           ' Database. <br>Database Error: ' . $e->getMessage();
                 throw new \Exception($err_msg);
             }
 

diff --git a/classes/Defense.php b/classes/Defense.php
@@ -64,8 +64,8 @@ public static function defenseVsDefense(\PDO $pdo_db, int $ship_id, array $langv
                             $stmt->bindParam(':defense_id', $tmp_defense['sector_id'], \PDO::PARAM_INT);
                             $stmt->execute();
 
-                            PlayerLog::writeLog($pdo_db, $tmp_other_defense['ship_id'], LogEnums::DEFS_DESTROYED, $tmp_other_defense['quantity'] .'|'. $targetdeftype .'|'. $tmp_defense['sector_id']);
-                            PlayerLog::writeLog($pdo_db, $tmp_defense['ship_id'], LogEnums::DEFS_DESTROYED, $tmp_other_defense['quantity'] .'|'. $deftype .'|'. $tmp_defense['sector_id']);
+                            PlayerLog::writeLog($pdo_db, $tmp_other_defense['ship_id'], LogEnums::DEFS_DESTROYED, $tmp_other_defense['quantity'] . '|' . $targetdeftype . '|' . $tmp_defense['sector_id']);
+                            PlayerLog::writeLog($pdo_db, $tmp_defense['ship_id'], LogEnums::DEFS_DESTROYED, $tmp_other_defense['quantity'] . '|' . $deftype . '|' . $tmp_defense['sector_id']);
                         }
                         else
                         {
@@ -81,8 +81,8 @@ public static function defenseVsDefense(\PDO $pdo_db, int $ship_id, array $langv
                             $stmt->bindParam(':defense_id', $tmp_other_defense['defense_id'], \PDO::PARAM_INT);
                             $stmt->execute();
 
-                            PlayerLog::writeLog($pdo_db, $tmp_other_defense['ship_id'], LogEnums::DEFS_DESTROYED, $qty .'|'. $targetdeftype .'|'. $tmp_defense['sector_id']);
-                            PlayerLog::writeLog($pdo_db, $tmp_defense['ship_id'], LogEnums::DEFS_DESTROYED, $qty .'|'. $deftype .'|'. $tmp_defense['sector_id']);
+                            PlayerLog::writeLog($pdo_db, $tmp_other_defense['ship_id'], LogEnums::DEFS_DESTROYED, $qty . '|' . $targetdeftype . '|' . $tmp_defense['sector_id']);
+                            PlayerLog::writeLog($pdo_db, $tmp_defense['ship_id'], LogEnums::DEFS_DESTROYED, $qty . '|' . $deftype . '|' . $tmp_defense['sector_id']);
                             $qty = 0;
                         }
                     }

diff --git a/classes/File.php b/classes/File.php
@@ -24,7 +24,7 @@
 
 class File
 {
-    public static function iniToDb(\PDO $pdo_db, string $ini_file, string $ini_table, string $section, Reg $tkireg) : bool
+    public static function iniToDb(\PDO $pdo_db, string $ini_file, string $ini_table, string $section, Reg $tkireg): bool
     {
         // This is a loop, that reads a ini file, of the type variable = value.
         // It will loop thru the list of the ini variables, and push them into the db.
@@ -119,7 +119,7 @@ public static function iniToDb(\PDO $pdo_db, string $ini_file, string $ini_table
 
     // Very close to a drop-in replacement for parse_ini_file, although without the second parameter
     // This defaults to the equivalent of "true" for the second param of parse_ini, ie, process sections
-    public static function betterParseIni(string $file) : array
+    public static function betterParseIni(string $file): array
     {
         $ini = file($file, FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES);
 

diff --git a/classes/Game.php b/classes/Game.php
@@ -27,7 +27,7 @@ public function isGameClosed(
         string $lang,
         Smarty $template,
         array $langvars
-    ) : bool
+    ): bool
     {
         if ($tkireg->game_closed)
         {

diff --git a/classes/IbankConsolidate.php b/classes/IbankConsolidate.php
@@ -196,7 +196,7 @@ public static function third(\PDO $pdo_db, array $langvars, array $playerinfo, R
              number_format($tcost, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</td>" .
              "<tr valign=bottom>" .
              "<td><a href='ibank.php?command=login'>" . $langvars['l_ibank_back'] .
-             "</a></td><td align=right>&nbsp;<br><a href=\"main.php\">" . $langvars['l_ibank_logout ']. "</a></td>" .
+             "</a></td><td align=right>&nbsp;<br><a href=\"main.php\">" . $langvars['l_ibank_logout '] . "</a></td>" .
              "</tr>";
 
         if ($minimum != 0)

diff --git a/classes/IbankDeposit.php b/classes/IbankDeposit.php
@@ -52,7 +52,7 @@ public static function before(\PDO $pdo_db, string $lang, array $account, array
              "</td></tr>" .
              "<tr>" .
              "  <td height=30  colspan=2 align=left>" .
-             "    <span style='color:\"#00ff00\";'>You can deposit only ". number_format($credit_space, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " credits.</span><br>" .
+             "    <span style='color:\"#00ff00\";'>You can deposit only " . number_format($credit_space, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " credits.</span><br>" .
              "  </td>" .
              "</tr>" .
              "<tr valign=bottom>" .

diff --git a/classes/KabalToPlanet.php b/classes/KabalToPlanet.php
@@ -36,7 +36,7 @@ public static function planet(\PDO $pdo_db, $db, int $planet_id, Reg $tkireg, ar
         $ownerinfo = $stmt->fetch(\PDO::FETCH_ASSOC);
 
         $base_factor = ($planetinfo['base'] == 'Y') ? $tkireg->base_defense : 0;
-        $character_object = new Character;
+        $character_object = new Character();
 
         // Planet beams
         $targetbeams = \Tki\CalcLevels::abstractLevels($ownerinfo['beams'] + $base_factor, $tkireg);

diff --git a/classes/KabalToSecDef.php b/classes/KabalToSecDef.php
@@ -23,7 +23,7 @@ class KabalToSecDef
 {
     public static function secDef(\PDO $pdo_db, array $langvars, array $playerinfo, int $targetlink, Reg $tkireg): void
     {
-        $character_object = new Character;
+        $character_object = new Character();
 
         // Check for sector defenses
         if ($targetlink > 0)
@@ -197,7 +197,7 @@ public static function secDef(\PDO $pdo_db, array $langvars, array $playerinfo,
                     $langvars['l_sf_sendlog2'] = str_replace("[sector]", (string) $targetlink, $langvars['l_sf_sendlog2']);
                     \Tki\SectorDefense::messageDefenseOwner($pdo_db, $targetlink, $langvars['l_sf_sendlog2']);
 
-                    $bounty = new \Tki\Bounty;
+                    $bounty = new \Tki\Bounty();
                     $bounty->cancel($pdo_db, $playerinfo['ship_id']);
                     $character_object->kill($pdo_db, $playerinfo['ship_id'], $langvars, $tkireg, false);
                     return;
@@ -246,7 +246,7 @@ public static function secDef(\PDO $pdo_db, array $langvars, array $playerinfo,
                             \Tki\SectorDefense::messageDefenseOwner($pdo_db, $targetlink, $langvars['l_chm_hewasdestroyedbyyourmines']);
 
                             // Actually kill the Kabal now
-                            $bounty = new \Tki\Bounty;
+                            $bounty = new \Tki\Bounty();
                             $bounty->cancel($pdo_db, $playerinfo['ship_id']);
                             $character_object->kill($pdo_db, $playerinfo['ship_id'], $langvars, $tkireg, false);
 

diff --git a/classes/KabalToShip.php b/classes/KabalToShip.php
@@ -25,7 +25,7 @@ public static function ship(\PDO $pdo_db, int $ship_id, Reg $tkireg, array $play
     {
         $armor_lost = null;
         $fighters_lost = null;
-        $character_object = new Character;
+        $character_object = new Character();
 
         // Lookup target details
         $sql = "SELECT * FROM ::prefix::ships WHERE ship_id=:ship_id";

diff --git a/classes/Languages.php b/classes/Languages.php
@@ -21,7 +21,7 @@
 
 class Languages
 {
-    public static function listAvailable(\PDO $pdo_db, string $lang) : array
+    public static function listAvailable(\PDO $pdo_db, string $lang): array
     {
         // Get a list of supported languages
         $sql = "SELECT section, name, value FROM ::prefix::languages WHERE " .

diff --git a/classes/Log.php b/classes/Log.php
@@ -21,7 +21,7 @@
 
 class Log
 {
-    public static function logParse(array $langvars, array $entry) : array
+    public static function logParse(array $langvars, array $entry): array
     {
         $log_list = array();
         $retvalue = array();
@@ -351,14 +351,14 @@ public static function getLogInfo(array $log_list, ?int $log_id = null, ?string
 
         if ($log_id < count($log_list))
         {
-            if (array_key_exists("l_log_title_". $log_list[$log_id], $GLOBALS))
+            if (array_key_exists("l_log_title_" . $log_list[$log_id], $GLOBALS))
             {
-                $title = $GLOBALS["l_log_title_". $log_list[$log_id]];
+                $title = $GLOBALS["l_log_title_" . $log_list[$log_id]];
             }
 
-            if (array_key_exists("l_log_text_". $log_list[$log_id], $GLOBALS))
+            if (array_key_exists("l_log_text_" . $log_list[$log_id], $GLOBALS))
             {
-                $text = $GLOBALS["l_log_text_". $log_list[$log_id]];
+                $text = $GLOBALS["l_log_text_" . $log_list[$log_id]];
             }
         }
     }