supernova-ws / SuperNova

includes/classes/EntityModel.php

Doc Comments +4 added lines

@@ -63,6 +63,10 @@
    */
   protected $accessors = array();
 
+  /**
+   * @param string $varName
+   * @param string $type
+   */
   protected function assignAccessor($varName, $type, $callable) {
     if (empty($callable)) {
       return;

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  *
  * @property int|float|string $dbId EntityModel unique ID for entire entities' set
  */
-class EntityModel  {
+class EntityModel {
   /**
    * Link to DB which used by this EntityModel
    *
@@ -71,7 +71,7 @@ 
     if (is_callable($callable)) {
       $this->accessors[$varName][$type] = $callable;
     } else {
-      throw new \Exception('Error assigning callable in ' . get_called_class() . '! Callable typed [' . $type . '] is not a callable or not accessible in the scope');
+      throw new \Exception('Error assigning callable in '.get_called_class().'! Callable typed ['.$type.'] is not a callable or not accessible in the scope');
     }
   }
 

includes/classes/Common/GlobalContainer.php

Spacing +12 added lines, -12 removed lines

@@ -34,56 +34,56 @@
     $gc = $this;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       classSupernova::$db = $db = new \db_mysql($c);
       $db->sn_db_connect();
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new \debug();
     };
 
-    $gc->types = function ($c) {
+    $gc->types = function($c) {
       return new \Common\Types();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new \classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new \classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (GlobalContainer $c) {
+    $gc->localePlayer = function(GlobalContainer $c) {
       return new \classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbRowOperator = function ($c) {
+    $gc->dbRowOperator = function($c) {
       return new \DbRowDirectOperator($c);
     };
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new \DbQueryConstructor($c->db);
     });
 
-    $gc->cacheOperator = function (GlobalContainer $gc) {
+    $gc->cacheOperator = function(GlobalContainer $gc) {
       return new \SnDbCachedOperator($gc);
     };
 
     $gc->snCacheClass = 'SnCache';
-    $gc->snCache = function (GlobalContainer $gc) {
+    $gc->snCache = function(GlobalContainer $gc) {
       return $gc->db->snCache;
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddyModel = function (GlobalContainer $c) {
+    $gc->buddyModel = function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     };
 
-    $gc->unitModel = function (GlobalContainer $c) {
+    $gc->unitModel = function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     };
   }

includes/classes/Buddy/BuddyParams.php

Spacing +4 added lines, -4 removed lines

@@ -36,14 +36,14 @@
 
     $this->playerArray = $user;
 
-    $this->playerId = function (BuddyParams $cBuddy) {
+    $this->playerId = function(BuddyParams $cBuddy) {
       return $cBuddy->playerArray['id'];
     };
-    $this->playerName = function (BuddyParams $cBuddy) {
+    $this->playerName = function(BuddyParams $cBuddy) {
       return $cBuddy->playerArray['username'];
     };
-    $this->playerNameAndCoordinates = function (BuddyParams $cBuddy) {
-      return "{$cBuddy->playerArray['username']} " . uni_render_coordinates($cBuddy->playerArray);
+    $this->playerNameAndCoordinates = function(BuddyParams $cBuddy) {
+      return "{$cBuddy->playerArray['username']} ".uni_render_coordinates($cBuddy->playerArray);
     };
   }
 

includes/classes/DBStaticMessages.php

Spacing +8 added lines, -8 removed lines

@@ -113,7 +113,7 @@ 
         sys_user_options_unpack($owner_row);
 
         if ($force || !$message_class['switchable'] || $owner_row["opt_{$message_class_name}"]) {
-          $insert_values[] = "('" . idval($owner) . "', '{$sender}', '{$timestamp}', '{$message_type}', '" . db_escape($from_unsafe) . "', '" . db_escape($subject_unsafe) . "', '" . db_escape($text_unsafe) . "')";
+          $insert_values[] = "('".idval($owner)."', '{$sender}', '{$timestamp}', '{$message_type}', '".db_escape($from_unsafe)."', '".db_escape($subject_unsafe)."', '".db_escape($text_unsafe)."')";
         }
 
         // TODO - allow sending HTML email only from admin
@@ -153,7 +153,7 @@ 
         array(),
         array(
           // TODO DANGER
-          '`id` IN (' . implode(',', $owners) . ')',
+          '`id` IN ('.implode(',', $owners).')',
         )
       );
     }
@@ -172,7 +172,7 @@ 
     $sendList = array();
     $list = '';
     $query = DBStaticUser::db_user_list(
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
       false, 'id, username');
     foreach ($query as $u) {
       $sendList[] = $u['id'];
@@ -261,7 +261,7 @@ 
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
       $re++;
     }
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
 
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
 
@@ -437,7 +437,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT * FROM {{messages}}
         WHERE
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -481,7 +481,7 @@ 
 FROM
   {{messages}} AS m
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
       "ORDER BY
   `message_id` DESC
 LIMIT
@@ -494,7 +494,7 @@ 
     $subject_safe = db_escape($subject_unsafe);
     $text_safe = db_escape($text_unsafe);
 
-    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type_safe}, '{$from_safe}', '{$subject_safe}', '{$text_safe}' FROM {{users}}");
   }
 
@@ -504,7 +504,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public static function db_message_count_by_type($int_type_selected) {
-    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
+    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
 
     return $page_max;
   }