Completed
Pull Request — 6.0 (#1862)
by liu
16:03 queued 11:20
created
src/think/db/concern/UpdateCheck.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                 $alias = $this->options['alias'][$table];
73 73
             }
74 74
 
75
-            $key = isset($alias) ? $alias . '.' . $pk : $pk;
75
+            $key = isset($alias) ? $alias.'.'.$pk : $pk;
76 76
             // 根据主键查询
77 77
             if (is_array($data)) {
78 78
                 $this->where($key, 'in', $data);
Please login to merge, or discard this patch.
src/think/db/concern/ModelRelationQuery.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
         if ($this->model) {
113 113
             // 检查模型类的查询范围方法
114 114
             foreach ($scope as $name) {
115
-                $method = 'scope' . trim($name);
115
+                $method = 'scope'.trim($name);
116 116
 
117 117
                 if (method_exists($this->model, $method)) {
118 118
                     call_user_func_array([$this->model, $method], $args);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
             } elseif ($this->model) {
155 155
                 // 检测搜索器
156 156
                 $fieldName = is_numeric($key) ? $field : $key;
157
-                $method    = 'search' . App::parseName($fieldName, 1) . 'Attr';
157
+                $method    = 'search'.App::parseName($fieldName, 1).'Attr';
158 158
 
159 159
                 if (method_exists($this->model, $method)) {
160 160
                     $this->model->$method($this, $data[$field] ?? null, $data, $prefix);
@@ -234,10 +234,10 @@  discard block
 block discarded – undo
234 234
                     ->getRelationCountQuery($closure, $aggregate, $field, $aggregateField);
235 235
 
236 236
                 if (empty($aggregateField)) {
237
-                    $aggregateField = App::parseName($relation) . '_' . $aggregate;
237
+                    $aggregateField = App::parseName($relation).'_'.$aggregate;
238 238
                 }
239 239
 
240
-                $this->field(['(' . $count . ')' => $aggregateField]);
240
+                $this->field(['('.$count.')' => $aggregateField]);
241 241
             }
242 242
         }
243 243
 
Please login to merge, or discard this patch.
src/think/db/concern/ParamsBind.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      */
48 48
     public function bindValue($value, int $type = null, string $name = null)
49 49
     {
50
-        $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_';
50
+        $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_';
51 51
 
52 52
         $this->bind[$name] = [$value, $type ?: PDO::PARAM_STR];
53 53
         return $name;
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
             }
82 82
 
83 83
             if (is_numeric($key)) {
84
-                $sql = substr_replace($sql, ':' . $name, strpos($sql, '?'), 1);
84
+                $sql = substr_replace($sql, ':'.$name, strpos($sql, '?'), 1);
85 85
             } else {
86
-                $sql = str_replace(':' . $key, ':' . $name, $sql);
86
+                $sql = str_replace(':'.$key, ':'.$name, $sql);
87 87
             }
88 88
         }
89 89
     }
Please login to merge, or discard this patch.
src/think/db/concern/WhereQuery.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             foreach ($this->options['where'] as $logic => &$where) {
53 53
                 foreach ($where as $key => &$val) {
54 54
                     if (is_array($val) && !strpos($val[0], '.')) {
55
-                        $val[0] = $via . '.' . $val[0];
55
+                        $val[0] = $via.'.'.$val[0];
56 56
                     }
57 57
                 }
58 58
             }
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
         $logic = strtoupper($logic);
363 363
 
364 364
         if (is_string($field) && !empty($this->options['via']) && false === strpos($field, '.')) {
365
-            $field = $this->options['via'] . '.' . $field;
365
+            $field = $this->options['via'].'.'.$field;
366 366
         }
367 367
 
368 368
         if ($field instanceof Raw) {
Please login to merge, or discard this patch.
src/think/db/concern/TimeFieldQuery.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
             $op    = 'between';
62 62
         }
63 63
 
64
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
64
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
65 65
     }
66 66
 
67 67
     /**
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     public function whereTimeInterval(string $field, string $start, string $interval = 'day', int $step = 1, string $logic = 'AND')
78 78
     {
79 79
         $startTime = strtotime($start);
80
-        $endTime   = strtotime(($step > 0 ? '+' : '-') . abs($step) . ' ' . $interval . (abs($step) > 1 ? 's' : ''), $startTime);
80
+        $endTime   = strtotime(($step > 0 ? '+' : '-').abs($step).' '.$interval.(abs($step) > 1 ? 's' : ''), $startTime);
81 81
 
82 82
         return $this->whereTime($field, 'between', $step > 0 ? [$startTime, $endTime] : [$endTime, $startTime], $logic);
83 83
     }
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             $year = date('Y', strtotime($year));
134 134
         }
135 135
 
136
-        return $this->whereTimeInterval($field, $year . '-1-1', 'year', $step, $logic);
136
+        return $this->whereTimeInterval($field, $year.'-1-1', 'year', $step, $logic);
137 137
     }
138 138
 
139 139
     /**
Please login to merge, or discard this patch.
src/think/db/concern/AggregateQuery.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
             // 支持GROUP
43 43
             $options = $this->getOptions();
44 44
             $subSql  = $this->options($options)
45
-                ->field('count(' . $field . ') AS think_count')
45
+                ->field('count('.$field.') AS think_count')
46 46
                 ->bind($this->bind)
47 47
                 ->buildSql();
48 48
 
Please login to merge, or discard this patch.
src/think/db/concern/TableFieldInfo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
Please login to merge, or discard this patch.
src/think/db/concern/PDOQuery.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\db\concern;
14 14
 
Please login to merge, or discard this patch.