Improvements thanks to Scrutinizer

photogabble · Sep 20, 2021 · 6cf3412 · 6cf3412
1 parent 68530cf
commit 6cf3412
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/classes/Ships/ShipsGateway.php b/classes/Ships/ShipsGateway.php
@@ -51,7 +51,7 @@ public function updateDestroyedShip(int $ship_id, int $rating = 0): void
         $stmt = $this->pdo_db->prepare($sql);
         $stmt->bindParam(':ship_id', $ship_id, \PDO::PARAM_INT);
         $stmt->bindParam(':rating', $rating, \PDO::PARAM_INT);
-        $result = $stmt->execute();
+        $stmt->execute();
         \Tki\Db::logDbErrors($this->pdo_db, $sql, __LINE__, __FILE__);
     }
 }
diff --git a/classes/Traderoute.php b/classes/Traderoute.php
@@ -302,7 +302,7 @@ public static function engage(\PDO $pdo_db, string $lang, int $tr_repeat, Regist
                     $stmt->execute();
                     $ownerinfo = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-                    if ($playerinfo['ship_id'] != $zoneinfo['owner'] && $playerinfo['team'] == 0 || $playerinfo['team'] != $ownerinfo['team'])
+                    if (($playerinfo['ship_id'] != $zoneinfo['owner'] && $playerinfo['team'] == 0) || ($playerinfo['team'] != $ownerinfo['team']))
                     {
                         \Tki\TraderouteDie::die($pdo_db, $lang, $tkireg, $tkitimer, $template, $langvars['l_tdr_tradesrcportoutsider']);
                     }
@@ -343,7 +343,7 @@ public static function engage(\PDO $pdo_db, string $lang, int $tr_repeat, Regist
                     $stmt->execute();
                     $ownerinfo = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-                    if ($playerinfo['ship_id'] != $zoneinfo['owner'] && $playerinfo['team'] == 0 || $playerinfo['team'] != $ownerinfo['team'])
+                    if (($playerinfo['ship_id'] != $zoneinfo['owner'] && $playerinfo['team'] == 0) || ($playerinfo['team'] != $ownerinfo['team']))
                     {
                         \Tki\TraderouteDie::die($pdo_db, $lang, $tkireg, $tkitimer, $template, $langvars['l_tdr_tradedestportoutsider']);
                     }
@@ -702,7 +702,7 @@ public static function engage(\PDO $pdo_db, string $lang, int $tr_repeat, Regist
                     $stmt->bindParam(':goods_buy', $goods_buy, \PDO::PARAM_INT);
                     $stmt->bindParam(':organics_buy', $organics_buy, \PDO::PARAM_INT);
                     $stmt->bindParam(':sector_id', $source['sector_id'], \PDO::PARAM_INT);
-                    $result = $stmt->execute();
+                    $stmt->execute();
                     \Tki\Db::logDbErrors($pdo_db, $sql, __LINE__, __FILE__);
                 }
 
@@ -740,7 +740,7 @@ public static function engage(\PDO $pdo_db, string $lang, int $tr_repeat, Regist
                     $stmt->bindParam(':goods_buy', $goods_buy, \PDO::PARAM_INT);
                     $stmt->bindParam(':organics_buy', $organics_buy, \PDO::PARAM_INT);
                     $stmt->bindParam(':sector_id', $source['sector_id'], \PDO::PARAM_INT);
-                    $result = $stmt->execute();
+                    $stmt->execute();
                     \Tki\Db::logDbErrors($pdo_db, $sql, __LINE__, __FILE__);
                 }
 
@@ -767,7 +767,7 @@ public static function engage(\PDO $pdo_db, string $lang, int $tr_repeat, Regist
                     $stmt->bindParam(':ship_organics', $playerinfo['ship_organics'], \PDO::PARAM_INT);
                     $stmt->bindParam(':ship_energy', $dist['ship_energy'], \PDO::PARAM_INT);
                     $stmt->bindParam(':ship_id', $playerinfo['ship_id'], \PDO::PARAM_INT);
-                    $result = $stmt->execute();
+                    $stmt->execute();
                     \Tki\Db::logDbErrors($pdo_db, $sql, __LINE__, __FILE__);
                 }
             }
@@ -856,7 +856,7 @@ public static function engage(\PDO $pdo_db, string $lang, int $tr_repeat, Regist
                 $stmt->bindParam(':goods_buy', $goods_buy, \PDO::PARAM_INT);
                 $stmt->bindParam(':organics_buy', $organics_buy, \PDO::PARAM_INT);
                 $stmt->bindParam(':planet_id', $source['planet_id'], \PDO::PARAM_INT);
-                $result = $stmt->execute();
+                $stmt->execute();
                 \Tki\Db::logDbErrors($pdo_db, $sql, __LINE__, __FILE__);
             }
             // Destination is a planet, so load colonists and weapons

diff --git a/classes/Translate.php b/classes/Translate.php
@@ -64,7 +64,7 @@ public static function load(\PDO $pdo_db, string $language, array $categories):
         {
             $ini_file = './languages/' . $language . '.ini';
             $ini_keys = parse_ini_file($ini_file, true, INI_SCANNER_TYPED);
-            if (is_array($ini_keys))
+            if ($ini_keys !== false)
             {
                 foreach ($ini_keys as $config_line)
                 {

diff --git a/port2.php b/port2.php
@@ -68,7 +68,7 @@
             $players_gateway = new \Tki\Players\PlayersGateway($pdo_db);
             $ownerinfo = $players_gateway->selectPlayerInfoById($zoneinfo['owner']);
 
-            if ($playerinfo['ship_id'] != $zoneinfo['owner'] && $playerinfo['team'] == 0 || $playerinfo['team'] != $ownerinfo['team'])
+            if (($playerinfo['ship_id'] != $zoneinfo['owner'] && $playerinfo['team'] == 0) || ($playerinfo['team'] != $ownerinfo['team']))
             {
                 $title = $langvars['l_no_trade'];
                 echo "<h1>" . $title . "</h1>\n";