top-think / framework

src/think/db/Query.php

Spacing +35 added lines, -35 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -161,15 +161,15 @@ 
             $name = App::parseName(substr($method, 5));
             array_unshift($args, $name);
             return call_user_func_array([$this, 'where'], $args);
-        } elseif ($this->model && method_exists($this->model, 'scope' . $method)) {
+        } elseif ($this->model && method_exists($this->model, 'scope'.$method)) {
             // 动态调用命名范围
-            $method = 'scope' . $method;
+            $method = 'scope'.$method;
             array_unshift($args, $this);
 
             call_user_func_array([$this->model, $method], $args);
             return $this;
         } else {
-            throw new Exception('method not exist:' . static::class . '->' . $method);
+            throw new Exception('method not exist:'.static::class.'->'.$method);
         }
     }
 
@@ -289,7 +289,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . App::parseName($name);
+        return $this->prefix.App::parseName($name);
     }
 
     /**
@@ -559,7 +559,7 @@ 
             // 支持GROUP
             $options = $this->getOptions();
             $subSql  = $this->options($options)
-                ->field('count(' . $field . ') AS think_count')
+                ->field('count('.$field.') AS think_count')
                 ->bind($this->bind)
                 ->buildSql();
 
@@ -854,10 +854,10 @@ 
         $prefix = $prefix ?: $tableName;
         foreach ($field as $key => &$val) {
             if (is_numeric($key) && $alias) {
-                $field[$prefix . '.' . $val] = $alias . $val;
+                $field[$prefix.'.'.$val] = $alias.$val;
                 unset($field[$key]);
             } elseif (is_numeric($key)) {
-                $val = $prefix . '.' . $val;
+                $val = $prefix.'.'.$val;
             }
         }
 
@@ -911,7 +911,7 @@ 
             // 延迟写入
             $condition = $this->options['where'] ?? [];
 
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->connection->lazyWrite($op, $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -970,7 +970,7 @@ 
         $table  = $this->getJoinTable($join, $alias);
 
         if (true === $field) {
-            $fields = $alias . '.*';
+            $fields = $alias.'.*';
         } else {
             if (is_string($field)) {
                 $field = explode(',', $field);
@@ -978,17 +978,17 @@ 
 
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $fields[] = $alias . '.' . $val;
+                    $fields[] = $alias.'.'.$val;
 
-                    $this->options['map'][$val] = $alias . '.' . $val;
+                    $this->options['map'][$val] = $alias.'.'.$val;
                 } else {
                     if (preg_match('/[,=\.\'\"\(\s]/', $key)) {
                         $name = $key;
                     } else {
-                        $name = $alias . '.' . $key;
+                        $name = $alias.'.'.$key;
                     }
 
-                    $fields[] = $name . ' AS ' . $val;
+                    $fields[] = $name.' AS '.$val;
 
                     $this->options['map'][$val] = $name;
                 }
@@ -1041,7 +1041,7 @@ 
             foreach ($this->options['where'] as $logic => &$where) {
                 foreach ($where as $key => &$val) {
                     if (is_array($val) && !strpos($val[0], '.')) {
-                        $val[0] = $via . '.' . $val[0];
+                        $val[0] = $via.'.'.$val[0];
                     }
                 }
             }
@@ -1351,7 +1351,7 @@ 
         $logic = strtoupper($logic);
 
         if (is_string($field) && !empty($this->options['via']) && false === strpos($field, '.')) {
-            $field = $this->options['via'] . '.' . $field;
+            $field = $this->options['via'].'.'.$field;
         }
 
         if ($field instanceof Raw) {
@@ -1550,7 +1550,7 @@ 
      */
     public function limit(int $offset, int $length = null)
     {
-        $this->options['limit'] = $offset . ($length ? ',' . $length : '');
+        $this->options['limit'] = $offset.($length ? ','.$length : '');
 
         return $this;
     }
@@ -1746,7 +1746,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
             if (strpos($field, ',')) {
                 $field = array_map('trim', explode(',', $field));
@@ -1756,9 +1756,9 @@ 
         } elseif (!empty($this->options['via'])) {
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $field[$key] = $this->options['via'] . '.' . $val;
+                    $field[$key] = $this->options['via'].'.'.$val;
                 } else {
-                    $field[$this->options['via'] . '.' . $key] = $val;
+                    $field[$this->options['via'].'.'.$key] = $val;
                     unset($field[$key]);
                 }
             }
@@ -2132,7 +2132,7 @@ 
         if ($this->model) {
             // 检查模型类的查询范围方法
             foreach ($scope as $name) {
-                $method = 'scope' . trim($name);
+                $method = 'scope'.trim($name);
 
                 if (method_exists($this->model, $method)) {
                     call_user_func_array([$this->model, $method], $args);
@@ -2184,7 +2184,7 @@ 
             $op    = 'between';
         }
 
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
     }
 
     /**
@@ -2200,7 +2200,7 @@ 
     public function whereTimeInterval(string $field, string $start, string $interval = 'day', int $step = 1, string $logic = 'AND')
     {
         $startTime = strtotime($start);
-        $endTime   = strtotime(($step > 0 ? '+' : '-') . abs($step) . ' ' . $interval . (abs($step) > 1 ? 's' : ''), $startTime);
+        $endTime   = strtotime(($step > 0 ? '+' : '-').abs($step).' '.$interval.(abs($step) > 1 ? 's' : ''), $startTime);
 
         return $this->whereTime($field, 'between', $step > 0 ? [$startTime, $endTime] : [$endTime, $startTime], $logic);
     }
@@ -2256,7 +2256,7 @@ 
             $year = date('Y', strtotime($year));
         }
 
-        return $this->whereTimeInterval($field, $year . '-1-1', 'year', $step, $logic);
+        return $this->whereTimeInterval($field, $year.'-1-1', 'year', $step, $logic);
     }
 
     /**
@@ -2367,7 +2367,7 @@ 
      */
     public function bindValue($value, int $type = null, string $name = null)
     {
-        $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_';
+        $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_';
 
         $this->bind[$name] = [$value, $type ?: PDO::PARAM_STR];
         return $name;
@@ -2401,9 +2401,9 @@ 
             }
 
             if (is_numeric($key)) {
-                $sql = substr_replace($sql, ':' . $name, strpos($sql, '?'), 1);
+                $sql = substr_replace($sql, ':'.$name, strpos($sql, '?'), 1);
             } else {
-                $sql = str_replace(':' . $key, ':' . $name, $sql);
+                $sql = str_replace(':'.$key, ':'.$name, $sql);
             }
         }
     }
@@ -2564,7 +2564,7 @@ 
             } elseif ($this->model) {
                 // 检测搜索器
                 $fieldName = is_numeric($key) ? $field : $key;
-                $method    = 'search' . App::parseName($fieldName, 1) . 'Attr';
+                $method    = 'search'.App::parseName($fieldName, 1).'Attr';
 
                 if (method_exists($this->model, $method)) {
                     $this->model->$method($this, $data[$field] ?? null, $data, $prefix);
@@ -2611,10 +2611,10 @@ 
                     ->getRelationCountQuery($closure, $aggregate, $field, $aggregateField);
 
                 if (empty($aggregateField)) {
-                    $aggregateField = App::parseName($relation) . '_' . $aggregate;
+                    $aggregateField = App::parseName($relation).'_'.$aggregate;
                 }
 
-                $this->field(['(' . $count . ')' => $aggregateField]);
+                $this->field(['('.$count.')' => $aggregateField]);
             }
         }
 
@@ -3243,11 +3243,11 @@ 
     {
         if (!empty($this->model)) {
             $class = get_class($this->model);
-            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $this->options);
+            throw new ModelNotFoundException('model data Not Found:'.$class, $class, $this->options);
         }
 
         $table = $this->getTable();
-        throw new DataNotFoundException('table data not Found:' . $table, $table, $this->options);
+        throw new DataNotFoundException('table data not Found:'.$table, $table, $this->options);
     }
 
     /**
@@ -3362,7 +3362,7 @@ 
      */
     public function buildSql(bool $sub = true): string
     {
-        return $sub ? '( ' . $this->fetchSql()->select() . ' )' : $this->fetchSql()->select();
+        return $sub ? '( '.$this->fetchSql()->select().' )' : $this->fetchSql()->select();
     }
 
     /**
@@ -3464,7 +3464,7 @@ 
                 $alias = $this->options['alias'][$table];
             }
 
-            $key = isset($alias) ? $alias . '.' . $pk : $pk;
+            $key = isset($alias) ? $alias.'.'.$pk : $pk;
             // 根据主键查询
             if (is_array($data)) {
                 $this->where($key, 'in', $data);
@@ -3528,7 +3528,7 @@ 
             $page                  = $page > 0 ? $page : 1;
             $listRows              = $listRows ?: (is_numeric($options['limit']) ? $options['limit'] : 20);
             $offset                = $listRows * ($page - 1);
-            $options['limit']      = $offset . ',' . $listRows;
+            $options['limit']      = $offset.','.$listRows;
         }
 
         $this->options = $options;