supernova-ws / SuperNova

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -261,11 +261,13 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field      = $location_info[P_ID];
     $table_name    = $location_info[P_TABLE_NAME];
-    if ($result = self::$db->doquery("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}", false)) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = self::$db->doquery("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}", false)) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
         DBStaticUnit::cache_clear();
+    }
       }
     }
 
@@ -295,9 +297,11 @@ 
     $set        = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = self::$db->doquery("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = SN::$db->db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -317,10 +321,12 @@ 
     $id_field      = $location_info[P_ID];
     $table_name    = $location_info[P_TABLE_NAME];
     if ($result = self::$db->doquery("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         DBStaticUnit::cache_clear();
       }
+      }
     }
 
     return $result;
@@ -334,11 +340,13 @@ 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
     if ($result = self::$db->doquery("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         DBStaticUnit::cache_clear();
       }
+      }
     }
 
     return $result;

classes/Planet/DBStaticPlanet.php

Spacing +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
     $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
     $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
     $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type);

classes/Core/Autoloader.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
   protected static $autoloaderRegistered = false;
 
   protected static function _constructorStatic() {
-    if(!static::$autoloaderRegistered) {
+    if (!static::$autoloaderRegistered) {
       spl_autoload_register(array(__CLASS__, 'autoloader'));
       static::$autoloaderRegistered = true;
     }
@@ -36,17 +36,17 @@ 
   public static function autoloader($class) {
     static::_constructorStatic();
 
-    foreach(static::$folders as $data) {
+    foreach (static::$folders as $data) {
       $theClassFile = $class;
 
-      if($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
+      if ($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
         $theClassFile = substr($class, strlen($data[static::P_PREFIX]));
       }
 
       $classFullFileName = str_replace('\\', '/', $data[static::P_FOLDER] . $theClassFile) . DOT_PHP_EX;
-      if(file_exists($classFullFileName) && is_file($classFullFileName)) {
+      if (file_exists($classFullFileName) && is_file($classFullFileName)) {
         require_once($classFullFileName);
-        if(method_exists($class, '_constructorStatic')) {
+        if (method_exists($class, '_constructorStatic')) {
           $class::_constructorStatic();
         }
       }
@@ -62,13 +62,13 @@ 
 
     $absoluteClassRoot = str_replace('\\', '/', SN_ROOT_PHYSICAL . $absoluteClassRoot);
 
-    if(!($absoluteClassRoot = realpath($absoluteClassRoot))) {
+    if (!($absoluteClassRoot = realpath($absoluteClassRoot))) {
       // TODO - throw new \Exception("There is some error when installing autoloader for '{$absoluteClassRoot}' class prefix '{$classPrefix}'");
       return;
     }
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot) . '/';
 
-    if($classPrefix && substr($classPrefix, -1) != '\\') {
+    if ($classPrefix && substr($classPrefix, -1) != '\\') {
       $classPrefix .= '\\';
     }
 

classes/Core/Updater.php

Spacing +3 added lines, -3 removed lines

@@ -206,7 +206,7 @@ 
    * @return bool|mysqli_result|null
    */
   public function indexDropIfExists($table, $index) {
-    return $this->upd_alter_table($table, ["DROP KEY `{$index}`",], $this->isIndexExists($table, $index));
+    return $this->upd_alter_table($table, ["DROP KEY `{$index}`", ], $this->isIndexExists($table, $index));
   }
 
   /**
@@ -216,7 +216,7 @@ 
    * @return bool|mysqli_result|null
    */
   public function constraintDropIfExists($table, $constraint) {
-    return $this->upd_alter_table($table, ["DROP FOREIGN KEY `{$constraint}`",], $this->isConstrainExists($table, $constraint));
+    return $this->upd_alter_table($table, ["DROP FOREIGN KEY `{$constraint}`", ], $this->isConstrainExists($table, $constraint));
   }
 
   /**
@@ -239,7 +239,7 @@ 
     }
 
     $this->indexDropIfExists($table, $index);
-    $queryFields = implode(',', array_map(function ($value) { return "`{$value}`"; }, $fields));
+    $queryFields = implode(',', array_map(function($value) { return "`{$value}`"; }, $fields));
     if ($queryFields) {
       $this->upd_alter_table(
         $table,

classes/Core/SnBootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 class SnBootstrap {
 
   public static function install_benchmark() {
-    register_shutdown_function(function () {
+    register_shutdown_function(function() {
       if (defined('IN_AJAX')) {
         return;
       }
@@ -103,9 +103,9 @@ 
     // Declaring PHP-constants from server config
     /** @see \classConfig::$DEBUG_SQL_FILE_LOG */
     foreach ([
-      'DEBUG_SQL_FILE_LOG'     => ['DEBUG_SQL_ERROR' => true, 'DEBUG_SQL_COMMENT_LONG' => true,],
-      'DEBUG_SQL_ERROR'        => ['DEBUG_SQL_COMMENT' => true,],
-      'DEBUG_SQL_COMMENT_LONG' => ['DEBUG_SQL_COMMENT' => true,],
+      'DEBUG_SQL_FILE_LOG'     => ['DEBUG_SQL_ERROR' => true, 'DEBUG_SQL_COMMENT_LONG' => true, ],
+      'DEBUG_SQL_ERROR'        => ['DEBUG_SQL_COMMENT' => true, ],
+      'DEBUG_SQL_COMMENT_LONG' => ['DEBUG_SQL_COMMENT' => true, ],
       'DEBUG_SQL_COMMENT'      => []
     ] as $constantName => $implications) {
       if (!empty(SN::$config->$constantName) && !defined($constantName)) {

classes/DBAL/db_mysql.php

Spacing +2 added lines, -2 removed lines

@@ -290,7 +290,7 @@ 
 
     $result = [];
     while ($row = $this->db_fetch($queryResult)) {
-      $result[] = $asArray ? $row : (object)$row;
+      $result[] = $asArray ? $row : (object) $row;
     }
 
     return $result;
@@ -762,7 +762,7 @@ 
         // Detecting primary key name
         $idFieldName = !empty(static::TABLE_ID_FIELD[$tableName]) ? static::TABLE_ID_FIELD[$tableName] : 'id';
         // Making ID mysql-safe
-        array_walk($lockedIds, function (&$id) { $id = idval($id); });
+        array_walk($lockedIds, function(&$id) { $id = idval($id); });
         /** @noinspection SqlResolve */
         $query[] = "(SELECT 1 FROM `{{{$tableName}}}` WHERE `{$idFieldName}` IN (" . implode(',', $lockedIds) . ") FOR UPDATE)";
       }

classes/Fleet/FleetWatchdog.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
       return self::TASK_ALREADY_LOCKED;
     }
 
-    register_shutdown_function(function () use ($runLock) {
+    register_shutdown_function(function() use ($runLock) {
 //      $this->log_file('Shutting down');
       $timeLock = $runLock->isLocked();
       if ($timeLock > 0 || $timeLock === 0) {

classes/Fleet/FleetDispatchEvent.php

Spacing +30 added lines, -35 removed lines

@@ -43,17 +43,17 @@ 
   public $fleetIdsToLock = [];
 
   public static $MISSIONS = [
-    MT_ATTACK    => [self::IS_TRANSPORT => false, self::IS_ATTACK => true,],
-    MT_AKS       => [self::IS_TRANSPORT => false, self::IS_ATTACK => true,],
-    MT_DESTROY   => [self::IS_TRANSPORT => false, self::IS_ATTACK => true,],
-    MT_HOLD      => [self::IS_TRANSPORT => false,],
-    MT_SPY       => [self::IS_TRANSPORT => false, self::IS_LOCK_SOURCE => true, 'AJAX' => true,],
-    MT_TRANSPORT => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true,],
-    MT_RELOCATE  => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true,],
-    MT_RECYCLE   => [self::IS_TRANSPORT => false, 'AJAX' => true,],
-    MT_EXPLORE   => [self::IS_TRANSPORT => false,],
-    MT_COLONIZE  => [self::IS_TRANSPORT => true,],
-    MT_MISSILE   => [self::IS_TRANSPORT => false, 'AJAX' => true,],
+    MT_ATTACK    => [self::IS_TRANSPORT => false, self::IS_ATTACK => true, ],
+    MT_AKS       => [self::IS_TRANSPORT => false, self::IS_ATTACK => true, ],
+    MT_DESTROY   => [self::IS_TRANSPORT => false, self::IS_ATTACK => true, ],
+    MT_HOLD      => [self::IS_TRANSPORT => false, ],
+    MT_SPY       => [self::IS_TRANSPORT => false, self::IS_LOCK_SOURCE => true, 'AJAX' => true, ],
+    MT_TRANSPORT => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true, ],
+    MT_RELOCATE  => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true, ],
+    MT_RECYCLE   => [self::IS_TRANSPORT => false, 'AJAX' => true, ],
+    MT_EXPLORE   => [self::IS_TRANSPORT => false, ],
+    MT_COLONIZE  => [self::IS_TRANSPORT => true, ],
+    MT_MISSILE   => [self::IS_TRANSPORT => false, 'AJAX' => true, ],
   ];
 
   public function __construct($fleetRow, $eventType) {
@@ -66,19 +66,18 @@ 
 
     $this->srcPlanetOwnerId = $fleetRow[self::F_FLEET_OWNER_ID];
 
-    $this->missionId      = (int)$this->fleet[FleetDispatcher::F_FLEET_MISSION];
+    $this->missionId      = (int) $this->fleet[FleetDispatcher::F_FLEET_MISSION];
     $this->missionInfoNew = self::$MISSIONS[$this->missionId];
 
-    $this->eventTimeStamp = (int)$this->fleet[$this->event === EVENT_FLT_ARRIVE ? 'fleet_start_time' :
-      ($this->event === EVENT_FLT_ACCOMPLISH ? 'fleet_end_stay' : /* EVENT_FLT_RETURN */
+    $this->eventTimeStamp = (int) $this->fleet[$this->event === EVENT_FLT_ARRIVE ? 'fleet_start_time' : ($this->event === EVENT_FLT_ACCOMPLISH ? 'fleet_end_stay' : /* EVENT_FLT_RETURN */
         'fleet_end_time')];
 
     /** @var Fleet $fleetObject */
-    $fleetObject = (object)$this->fleet;
+    $fleetObject = (object) $this->fleet;
 
     // Always locking flying fleet and fleet owner
-    $this->userIdsToLock   = [(int)$fleetObject->fleet_owner ?: 0 => true,];
-    $this->fleetIdsToLock  = [(int)$fleetObject->fleet_id => true,];
+    $this->userIdsToLock   = [(int) $fleetObject->fleet_owner ?: 0 => true, ];
+    $this->fleetIdsToLock  = [(int) $fleetObject->fleet_id => true, ];
     $this->planetIdsToLock = [];
 
     // Some locks make sense only on specific event types
@@ -98,10 +97,10 @@ 
       // If the fleet is a part of existing fleet group - locking also fleets in group and their respected owners
       // Only doing it for EVENT_FLT_ARRIVE - currently no other event types does trigger fleet group actions
       if (!empty($fleetObject->fleet_group) && $this->event === EVENT_FLT_ARRIVE) {
-        $fleetGroupId = (int)$fleetObject->fleet_group;
+        $fleetGroupId = (int) $fleetObject->fleet_group;
         foreach (DbFleetStatic::db_fleet_list("`fleet_group` = {$fleetGroupId}") as $fleetInGroup) {
-          $this->userIdsToLock[(int)$fleetInGroup[self::F_FLEET_OWNER_ID] ?: 0] = true;
-          $this->fleetIdsToLock[(int)$fleetInGroup[self::F_FLEET_ID] ?: 0]      = true;
+          $this->userIdsToLock[(int) $fleetInGroup[self::F_FLEET_OWNER_ID] ?: 0] = true;
+          $this->fleetIdsToLock[(int) $fleetInGroup[self::F_FLEET_ID] ?: 0]      = true;
         }
       }
 
@@ -124,8 +123,8 @@ 
         $this->eventTimeStamp
       );
       foreach ($fleetsOnHold as $aFleet) {
-        $this->userIdsToLock[(int)$aFleet[self::F_FLEET_OWNER_ID] ?: 0] = true;
-        $this->fleetIdsToLock[(int)$aFleet[self::F_FLEET_ID] ?: 0]      = true;
+        $this->userIdsToLock[(int) $aFleet[self::F_FLEET_OWNER_ID] ?: 0] = true;
+        $this->fleetIdsToLock[(int) $aFleet[self::F_FLEET_ID] ?: 0]      = true;
       }
     }
 
@@ -170,18 +169,14 @@ 
   }
 
   public static function sortEvents(&$eventList) {
-    uasort($eventList, function (FleetDispatchEvent $a, FleetDispatchEvent $b) {
+    uasort($eventList, function(FleetDispatchEvent $a, FleetDispatchEvent $b) {
       return
         // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-          $a->eventTimeStamp > $b->eventTimeStamp ? 1 : ($a->eventTimeStamp < $b->eventTimeStamp ? -1 :
-          // Если время - одинаковое, сравниваем события флотов
+          $a->eventTimeStamp > $b->eventTimeStamp ? 1 : ($a->eventTimeStamp < $b->eventTimeStamp ? -1 : // Если время - одинаковое, сравниваем события флотов
           // Если события - одинаковые, то флоты равны
-          ($a->event == $b->event ? 0 :
-            // Если события разные - первыми считаем прибывающие флоты
-            ($a->event == EVENT_FLT_ARRIVE ? 1 : ($b->event == EVENT_FLT_ARRIVE ? -1 :
-              // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-              ($a->event == EVENT_FLT_ACCOMPLISH ? 1 : ($b->event == EVENT_FLT_ACCOMPLISH ? -1 :
-                // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+          ($a->event == $b->event ? 0 : // Если события разные - первыми считаем прибывающие флоты
+            ($a->event == EVENT_FLT_ARRIVE ? 1 : ($b->event == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+              ($a->event == EVENT_FLT_ACCOMPLISH ? 1 : ($b->event == EVENT_FLT_ACCOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
                 // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
                 (
                 0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -236,10 +231,10 @@ 
 //    $this->srcPlanetRow = is_array($srcPlanetRow) ? $srcPlanetRow : DBStaticPlanet::db_planet_by_vector($this->fleet, 'fleet_start_');
     $this->srcPlanetRow = $srcPlanetRow;
 
-    $this->srcPlanetId = !empty($this->srcPlanetRow[self::F_PLANET_ID]) ? (int)$this->srcPlanetRow[self::F_PLANET_ID] : 0;
+    $this->srcPlanetId = !empty($this->srcPlanetRow[self::F_PLANET_ID]) ? (int) $this->srcPlanetRow[self::F_PLANET_ID] : 0;
     // Starting planet can change owner while fleet mission - and even change planet ID
     // It can happen due to teleport shenanigans or because of planet capturing (in certain game modes)
-    $this->srcPlanetOwnerId = !empty($this->srcPlanetRow[self::F_PLANET_OWNER_ID]) ? (int)$this->srcPlanetRow[self::F_PLANET_OWNER_ID] : $this->srcPlanetOwnerId;
+    $this->srcPlanetOwnerId = !empty($this->srcPlanetRow[self::F_PLANET_OWNER_ID]) ? (int) $this->srcPlanetRow[self::F_PLANET_OWNER_ID] : $this->srcPlanetOwnerId;
 
     return $this->srcPlanetRow;
   }
@@ -261,9 +256,9 @@ 
   public function updateDstPlanetRow($dstPlanetRow = null) {
     $this->dstPlanetRow = $dstPlanetRow;
 
-    $this->dstPlanetId = !empty($this->dstPlanetRow[self::F_PLANET_ID]) ? (int)$this->dstPlanetRow[self::F_PLANET_ID] : 0;
+    $this->dstPlanetId = !empty($this->dstPlanetRow[self::F_PLANET_ID]) ? (int) $this->dstPlanetRow[self::F_PLANET_ID] : 0;
     // Retrieving destination owner ID
-    $this->dstPlanetOwnerId = !empty($this->dstPlanetRow[self::F_PLANET_OWNER_ID]) ? (int)$this->dstPlanetRow[self::F_PLANET_OWNER_ID] : 0;
+    $this->dstPlanetOwnerId = !empty($this->dstPlanetRow[self::F_PLANET_OWNER_ID]) ? (int) $this->dstPlanetRow[self::F_PLANET_OWNER_ID] : 0;
 
     return $this->dstPlanetRow;
   }

classes/Fleet/Fleet.php

Spacing +3 added lines, -3 removed lines

@@ -290,7 +290,7 @@ 
     $result = [];
 
     foreach ($this->getShipListArray() as $unit_id => $unit_amount) {
-      $shipsLost        = ceil($unit_amount * $multiplier);
+      $shipsLost = ceil($unit_amount * $multiplier);
       $result[$unit_id] += $shipsLost;
     }
 
@@ -436,8 +436,8 @@ 
   protected function getTravelData() {
     $travel_data = flt_travel_data(
       $this->getFleetOwnerRecord(),
-      ['galaxy' => $this->fleet_start_galaxy, 'system' => $this->fleet_start_system, 'planet' => $this->fleet_start_planet,],
-      ['galaxy' => $this->fleet_end_galaxy, 'system' => $this->fleet_end_system, 'planet' => $this->fleet_end_planet,],
+      ['galaxy' => $this->fleet_start_galaxy, 'system' => $this->fleet_start_system, 'planet' => $this->fleet_start_planet, ],
+      ['galaxy' => $this->fleet_end_galaxy, 'system' => $this->fleet_end_system, 'planet' => $this->fleet_end_planet, ],
       $this->getShipListArray(),
       $this->speedPercentTenth
     );