supernova-ws / SuperNova

classes/Pimple/Container.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 
         $factory = $this->values[$id];
 
-        $extended = function ($c) use ($callable, $factory) {
+        $extended = function($c) use ($callable, $factory) {
             return $callable($factory($c), $c);
         };
 

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  *
  * @author  Fabien Potencier
  */
-class Container implements \ArrayAccess
-{
+class Container implements \ArrayAccess {
     private $values = array();
     private $factories;
     private $protected;
@@ -47,8 +46,7 @@ 
      *
      * @param array $values The parameters or objects.
      */
-    public function __construct(array $values = array())
-    {
+    public function __construct(array $values = array()) {
         $this->factories = new \SplObjectStorage();
         $this->protected = new \SplObjectStorage();
 
@@ -71,8 +69,7 @@ 
      *
      * @throws \RuntimeException Prevent override of a frozen service
      */
-    public function offsetSet($id, $value)
-    {
+    public function offsetSet($id, $value) {
         if (isset($this->frozen[$id])) {
             throw new \RuntimeException(sprintf('Cannot override frozen service "%s".', $id));
         }
@@ -90,8 +87,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function offsetGet($id)
-    {
+    public function offsetGet($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -125,8 +121,7 @@ 
      *
      * @return bool
      */
-    public function offsetExists($id)
-    {
+    public function offsetExists($id) {
         return isset($this->keys[$id]);
     }
 
@@ -135,8 +130,7 @@ 
      *
      * @param string $id The unique identifier for the parameter or object
      */
-    public function offsetUnset($id)
-    {
+    public function offsetUnset($id) {
         if (isset($this->keys[$id])) {
             if (is_object($this->values[$id])) {
                 unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
@@ -155,8 +149,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function factory($callable)
-    {
+    public function factory($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Service definition is not a Closure or invokable object.');
         }
@@ -177,8 +170,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function protect($callable)
-    {
+    public function protect($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Callable is not a Closure or invokable object.');
         }
@@ -197,8 +189,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function raw($id)
-    {
+    public function raw($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -223,8 +214,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined or not a service definition
      */
-    public function extend($id, $callable)
-    {
+    public function extend($id, $callable) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -256,8 +246,7 @@ 
      *
      * @return array An array of value names
      */
-    public function keys()
-    {
+    public function keys() {
         return array_keys($this->values);
     }
 
@@ -269,8 +258,7 @@ 
      *
      * @return static
      */
-    public function register(ServiceProviderInterface $provider, array $values = array())
-    {
+    public function register(ServiceProviderInterface $provider, array $values = array()) {
         $provider->register($this);
 
         foreach ($values as $key => $value) {

classes/Unit.php

Spacing +5 added lines, -5 removed lines

@@ -154,15 +154,15 @@ 
    * @param string $group_name
    */
   public static function _init($group_name = '') {
-    if(static::$_is_static_init) {
+    if (static::$_is_static_init) {
       return;
     }
 
-    if($group_name) {
+    if ($group_name) {
       static::$_sn_group_name = $group_name;
     }
 
-    if(static::$_sn_group_name) {
+    if (static::$_sn_group_name) {
       static::$_group_unit_id_list = sn_get_groups(static::$_sn_group_name);
       empty(static::$_group_unit_id_list) ? static::$_group_unit_id_list = array() : false;
     }
@@ -187,7 +187,7 @@ 
     // TODO - Reset combat stats??
     $this->_unitId = $unitId;
 
-    if($this->_unitId) {
+    if ($this->_unitId) {
       $this->info = get_unit_param($this->_unitId);
       $this->_type = $this->info[P_UNIT_TYPE];
     } else {
@@ -198,7 +198,7 @@ 
 
   protected function setCount($value) {
     // TODO - Reset combat stats??
-    if($value < 0) {
+    if ($value < 0) {
       classSupernova::$debug->error('Can not set Unit::$count to negative value');
     }
     $this->_count = $value;

classes/V2Unit/V2UnitList.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
 
   }
 
+  /**
+   * @param integer $snId
+   */
   public function unitAdd($snId, $level) {
     if($this->indexIsSet($snId)) {
       $this->indexGetObject($snId)->$level += $level;

classes/V2Fleet/V2FleetModel.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 
 use Common\V2Location;
 use DBStatic\DBStaticFleetACS;
-use V2Unit\V2UnitList;
 use Vector\Vector;
 use Entity\KeyedModel;
 

Spacing +13 added lines, -13 removed lines

@@ -93,28 +93,28 @@ 
   public function __construct(\Common\GlobalContainer $gc) {
     parent::__construct($gc);
 
-    $this->accessors->set(P_CONTAINER_SET, 'dbId', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'dbId', function(V2FleetContainer $that, $value) {
       $that->setDirect('dbId', $value);
       $that->location->setLocationId($value);
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'ownerId', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'ownerId', function(V2FleetContainer $that, $value) {
       $that->setDirect('ownerId', $value);
       $that->location->setLocationPlayerId($value);
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'owner', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'owner', function(V2FleetContainer $that, $value) {
       $that->owner = $value;
-      if(isset($value['id'])) {
+      if (isset($value['id'])) {
         $that->ownerId = $value['id'];
       } else {
         $that->ownerId = 0;
       }
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'departure', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'departure', function(V2FleetContainer $that, $value) {
       $that->departure = $value;
-      if(isset($value['id'])) {
+      if (isset($value['id'])) {
         $that->departurePlanetId = $value['id'];
         $that->vectorDeparture = $value;
       } else {
@@ -122,20 +122,20 @@ 
       }
     });
 
-    $this->accessors->set(P_CONTAINER_GET, 'vectorDeparture', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'vectorDeparture', function(V2FleetContainer $that) {
       $vector = new Vector();
       $that->setDirect('vectorDeparture', $vector);
 
       return $vector;
     }, ACCESSOR_SHARED);
-    $this->accessors->set(P_CONTAINER_SET, 'vectorDeparture', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'vectorDeparture', function(V2FleetContainer $that, $value) {
       $vector = $that->vectorDeparture;
 
-      if(is_array($value)) {
+      if (is_array($value)) {
         $value = Vector::convertToVector($value);
       }
 
-      if($value instanceof Vector) {
+      if ($value instanceof Vector) {
         $vector->readFromVector($value);
       } else {
         throw new \Exception('V2Fleet::vectorDeparture setter - value is not a Vector or array!', ERR_ERROR);
@@ -148,7 +148,7 @@ 
     $this->accessors->set(P_CONTAINER_EXPORT, 'vectorArrive', array($this, 'exportVector'));
 
 
-    $this->accessors->set(P_CONTAINER_GET, 'location', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'location', function(V2FleetContainer $that) {
 //      if (is_null($location = $that->getDirect('location'))) {}
       $location = new V2Location(LOC_FLEET);
       $that->setDirect('location', $location);
@@ -156,7 +156,7 @@ 
       return $location;
     }, ACCESSOR_SHARED);
 
-    $this->accessors->set(P_CONTAINER_GET, 'units', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'units', function(V2FleetContainer $that) {
 //      if (is_null($units = $that->getDirect('units'))) {}
       $units = \classSupernova::$gc->unitList;
       $that->setDirect('units', $units);
@@ -164,7 +164,7 @@ 
       return $units;
     }, ACCESSOR_SHARED);
 
-    $this->accessors->set(P_CONTAINER_GET, 'isReturning', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'isReturning', function(V2FleetContainer $that) {
       return $that->status == FLEET_FLAG_RETURNING;
     });
 

Doc Comments +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
   /**
    * @param int|string $dbId
    *
-   * @return V2FleetContainer|false
+   * @return V2FleetContainer
    */
   public function loadById($dbId) {
     /**

classes/Common/ObjectCollection.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
    * @since 5.0.0
    */
   public function offsetUnset($offset) {
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       parent::offsetUnset($this->offsetGet($offset));
     }
   }

classes/Common/Invoker.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
   }
 
   public static function build($callable) {
-    if(is_array($callable) && count($callable) == 2 && is_object($callable[0])) {
+    if (is_array($callable) && count($callable) == 2 && is_object($callable[0])) {
       return new static($callable);
     } else {
       return false;

includes/includes/flt_mission_transport.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
   $source_planet = &$mission_data->src_planet;
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner'])) {
+  if (empty($destination_planet['id_owner'])) {
     $objFleet->markReturnedAndSave();
 
     return $result;
@@ -33,7 +33,7 @@ 
     $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium']);
   DBStaticMessages::msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_transport'], $Message);
 
-  if($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
+  if ($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
     DBStaticMessages::msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_transport'], $Message);
   }
 

includes/includes/flt_flying_fleet_handler2.php

Doc Comments -1 removed lines

@@ -14,7 +14,6 @@
  *
  * @param Fleet $objFleet
  * @param bool  $start
- * @param null  $result
  *
  * @return mixed
  */

Spacing +7 added lines, -11 removed lines

@@ -23,15 +23,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
     // Если события - одинаковые, то флоты равны
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-      // Если события разные - первыми считаем прибывающие флоты
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
           (
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -55,7 +51,7 @@ 
 // ------------------------------------------------------------------
 function flt_flying_fleet_handler($skip_fleet_update = false) {
   if (true) {
-    if(!defined('IN_AJAX')) {
+    if (!defined('IN_AJAX')) {
       print('<div style="color: red; font-size: 300%">Fleet handler is disabled</div>');
       pdump('Fleet handler is disabled');
     }
@@ -190,7 +186,7 @@ 
     // Watchdog timer
     // If flying fleet handler works more then 10 seconds - stopping it
     // Let next run handle rest of fleets
-    if(time() - SN_TIME_NOW > 10) {
+    if (time() - SN_TIME_NOW > 10) {
       $debug->warning('Flying fleet handler standard routine works more then 10 seconds - watchdog unlocked', 'FFH Warning', 504);
       break;
     }
@@ -256,7 +252,7 @@ 
     $objMission->fleet_event = $fleet_event['fleet_event'];
 
     // Fleet that have planet destination is returned
-    if($mission_data['dst_planet'] && empty($objMission->dst_planet['id_owner'])) {
+    if ($mission_data['dst_planet'] && empty($objMission->dst_planet['id_owner'])) {
       $objFleet->markReturnedAndSave();
       sn_db_transaction_commit();
       continue;

classes/FleetList.php

Doc Comments +5 added lines

@@ -64,6 +64,10 @@ 
    *
    */
   // DEPRECATED
+
+  /**
+   * @param boolean $for_update
+   */
   public static function dbGetFleetList($where_safe = '', $for_update = DB_SELECT_FOR_UPDATE) {
     $fleetList = new static();
     $fleetList->dbLoadWhere($where_safe, $for_update);
@@ -246,6 +250,7 @@ 
    * LIST - Get missile attack list by condition
    *
    * @param string $where
+   * @param boolean $for_update
    */
   public function dbMergeMissileList($where, $for_update = DB_SELECT_FOR_UPDATE) {
     $query = classSupernova::$db->doSelect(

Spacing +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@ 
       (!empty($where_safe) ? " WHERE {$where_safe}" : '') .
       " FOR UPDATE;"
     );
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       /**
        * @var Fleet $fleet
        */
       $fleet = $this->_createElement();
       $fleet->dbRowParse($row);
 
-      if(isset($this[$fleet->dbId])) {
+      if (isset($this[$fleet->dbId])) {
         // Нужно ли ????
         classSupernova::$debug->error('Fleet list already set');
       }
@@ -170,7 +170,7 @@ 
    * @return static
    */
   public static function dbGetFleetListAndMissileByCoordinates($coordinates, $for_phalanx = false) {
-    if(empty($coordinates) || !is_array($coordinates)) {
+    if (empty($coordinates) || !is_array($coordinates)) {
       return array();
     }
 
@@ -199,8 +199,8 @@ 
      * @var Fleet[] $array_of_Fleet
      */
     $array_of_Fleet = array();
-    if(!empty($fleet_db_list) && $fleet_db_list->count()) {
-      foreach($fleet_db_list->_container as $fleet_id => $objFleet) {
+    if (!empty($fleet_db_list) && $fleet_db_list->count()) {
+      foreach ($fleet_db_list->_container as $fleet_id => $objFleet) {
         $array_of_Fleet[$fleet_id] = $objFleet;
       }
       $planet_fleets = flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet);
@@ -249,7 +249,7 @@ 
       "SELECT * FROM `{{iraks}}`" .
       (!empty($where) ? " WHERE {$where}" : '') .
       " FOR UPDATE;");
-    while($missile_db_row = db_fetch($query)) {
+    while ($missile_db_row = db_fetch($query)) {
       /**
        * @var Fleet $objFleet
        */
@@ -271,7 +271,7 @@ 
    */
   public static function dbGetFleetListAndMissileINCOMING($owner_id) {
     $owner_id_safe = idval($owner_id);
-    if(empty($owner_id_safe)) {
+    if (empty($owner_id_safe)) {
       return array();
     }
 
@@ -305,7 +305,7 @@ 
    */
   public static function fleet_count_flying($player_id, $mission_id = 0) {
     $player_id_safe = idval($player_id);
-    if(!empty($player_id_safe)) {
+    if (!empty($player_id_safe)) {
       $mission_id_safe = intval($mission_id);
       $result = static::db_fleet_count(
         "`fleet_owner` = {$player_id_safe}" .