supernova-ws / SuperNova

includes/classes/DbQueryConstructor.php

Doc Comments +8 added lines, -1 removed lines

@@ -155,10 +155,17 @@ 
     return $this->field(DbSqlLiteral::build($this->db)->literal($field));
   }
 
+  /**
+   * @param string $functionName
+   * @param string $alias
+   */
   public function fieldSingleFunction($functionName, $field = '*', $alias = DbSqlLiteral::SQL_LITERAL_ALIAS_NONE) {
     return $this->field(DbSqlLiteral::build($this->db)->buildSingleArgument($functionName, $field, $alias));
   }
 
+  /**
+   * @param string $alias
+   */
   public function fieldCount($field = '*', $alias = DbSqlLiteral::SQL_LITERAL_ALIAS_NONE) {
     return $this->field(DbSqlLiteral::build($this->db)->count($field, $alias));
   }
@@ -240,7 +247,7 @@ 
 
   /**
    * @param db_mysql|null $db
-   * @param string|object|DBStaticRecord|DbSqlAware $className
+   * @param string $className
    *
    * @return static
    */

Spacing +10 added lines, -10 removed lines

@@ -228,7 +228,7 @@ 
   // TODO - rewrite
   public function getParamsFromStaticClass($className) {
     if (is_string($className) && $className && class_exists($className)) {
-      if(method_exists($className, 'getDb')) {
+      if (method_exists($className, 'getDb')) {
         $this->setDb($className::getDb());
       }
       $this->from($className::$_table);
@@ -317,9 +317,9 @@ 
   }
 
   protected function compileFrom() {
-    $this->_compiledQuery[] = 'FROM `{{' . $this->escapeString($this->table) . '}}`';
+    $this->_compiledQuery[] = 'FROM `{{'.$this->escapeString($this->table).'}}`';
     if (!empty($this->alias)) {
-      $this->_compiledQuery[] = 'AS `' . $this->escapeString($this->alias) . '`';
+      $this->_compiledQuery[] = 'AS `'.$this->escapeString($this->alias).'`';
     }
   }
 
@@ -329,29 +329,29 @@ 
 
   protected function compileWhere() {
     // TODO - fields should be escaped !!
-    !empty($this->where) ? $this->_compiledQuery[] = 'WHERE ' . implode(' AND ', $this->where) : false;
+    !empty($this->where) ? $this->_compiledQuery[] = 'WHERE '.implode(' AND ', $this->where) : false;
   }
 
   protected function compileGroupBy() {
     // TODO - fields should be escaped !!
 //    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY ' . implode(',', $this->arrayEscape($this->groupBy)) : false;
-    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY ' . $this->selectFieldsToString($this->groupBy) : false;
+    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY '.$this->selectFieldsToString($this->groupBy) : false;
   }
 
   protected function compileOrderBy() {
     // TODO - fields should be escaped !!
-    !empty($this->orderBy) ? $this->_compiledQuery[] = 'ORDER BY ' . implode(',', $this->arrayEscape($this->orderBy)) : false;
+    !empty($this->orderBy) ? $this->_compiledQuery[] = 'ORDER BY '.implode(',', $this->arrayEscape($this->orderBy)) : false;
   }
 
   protected function compileHaving() {
     // TODO - fields should be escaped !!
-    !empty($this->having) ? $this->_compiledQuery[] = 'HAVING ' . implode(' AND ', $this->having) : false;
+    !empty($this->having) ? $this->_compiledQuery[] = 'HAVING '.implode(' AND ', $this->having) : false;
   }
 
   protected function compileLimit() {
     // TODO - fields should be escaped !!
     if ($limit = $this->fetchOne ? 1 : $this->limit) {
-      $this->_compiledQuery[] = 'LIMIT ' . $limit . (!empty($this->offset) ? ' OFFSET ' . $this->offset : '');
+      $this->_compiledQuery[] = 'LIMIT '.$limit.(!empty($this->offset) ? ' OFFSET '.$this->offset : '');
     }
   }
 
@@ -395,14 +395,14 @@ 
    */
   protected function processField($fieldName) {
     if (is_bool($fieldName)) {
-      $result = (string)intval($fieldName);
+      $result = (string) intval($fieldName);
     } elseif (is_numeric($fieldName)) {
       $result = $fieldName;
     } elseif (is_null($fieldName)) {
       $result = 'NULL';
     } else {
       // Field has other type - string or should be convertible to string
-      $result = (string)$fieldName;
+      $result = (string) $fieldName;
       if (!$fieldName instanceof DbSqlLiteral) {
         $result = $this->quoteField($fieldName);
       }

includes/classes/DBStaticUser.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
         ->where('`user_as_ally` IS NULL')
         ->orderBy(array('`id` DESC'));
 
-    return (string)$query->selectValue();
+    return (string) $query->selectValue();
   }
 
   /**
@@ -48,15 +48,15 @@ 
       static::buildDBQ()
         ->field('id')
         ->where("`user_as_ally` IS NULL")
-        ->where("`user_bot` = " . USER_BOT_PLAYER)
+        ->where("`user_bot` = ".USER_BOT_PLAYER)
         ->setForUpdate();
 
     return $query->selectIterator();
   }
 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = " . idval($user['id']) .
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')
+    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = ".idval($user['id']).
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')
       . " FOR UPDATE";
 
     static::getDb()->doquery($query);
@@ -69,7 +69,7 @@ 
    */
   public static function db_user_count($online = false) {
     return intval(static::getDb()->doQueryFetchValue(
-      'SELECT COUNT(`id`) AS `user_count` FROM `{{users}}` WHERE `user_as_ally` IS NULL' . ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
+      'SELECT COUNT(`id`) AS `user_count` FROM `{{users}}` WHERE `user_as_ally` IS NULL'.($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
     ));
   }
 
@@ -91,7 +91,7 @@ 
       ->fieldCount('r.id', 'referral_count')
       ->fieldSingleFunction('sum', 'r.dark_matter', 'referral_dm')
       ->join('LEFT JOIN {{referrals}} as r on r.id_partner = u.id')
-      ->where($online ? "`onlinetime` >= " . intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
+      ->where($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
       ->groupBy('u.id')
       ->orderBy("user_as_ally, {$sort} ASC");
 
@@ -109,7 +109,7 @@ 
       ->where('(`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)')
       ->where('`user_as_ally` IS NULL')
       ->having('`days_after_birthday` >= 0')
-      ->having('`days_after_birthday` < ' . intval($config_user_birthday_range))
+      ->having('`days_after_birthday` < '.intval($config_user_birthday_range))
       ->setForUpdate();
 
     $result = $query->selectIterator();
@@ -191,7 +191,7 @@ 
   }
 
   public static function db_user_list_set_mass_mail(&$owners_list, $set) {
-    return classSupernova::db_upd_record_list(LOC_USER, !empty($owners_list) ? '`id` IN (' . implode(',', $owners_list) . ');' : '', $set);
+    return classSupernova::db_upd_record_list(LOC_USER, !empty($owners_list) ? '`id` IN ('.implode(',', $owners_list).');' : '', $set);
   }
 
   public static function db_user_list_set_by_ally_and_rank($ally_id, $ally_rank_id, $set) {

includes/classes/DBStaticRecord.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
     $stmt =
       static::buildDBQ()
         ->fields($fieldList)
-        ->where(static::$_idField . '=' . $recordId);
+        ->where(static::$_idField.'='.$recordId);
 
     if ($forUpdate) {
       $stmt->setForUpdate();
@@ -105,7 +105,7 @@ 
       $query =
         static::buildDBQ()
           ->fields(static::$_idField)
-          ->where(array("`" . static::$_idField . "` IN (" . implode(',', $idList) . ")"))
+          ->where(array("`".static::$_idField."` IN (".implode(',', $idList).")"))
           ->selectIterator();
     } else {
       $query = new DbEmptyIterator();