Completed
Push — 6.0 ( 482461...384317 )
by liu
05:47
created
src/think/db/concern/ResultOperation.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
 
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
     {
211 211
         if (!empty($this->model)) {
212 212
             $class = get_class($this->model);
213
-            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $this->options);
213
+            throw new ModelNotFoundException('model data Not Found:'.$class, $class, $this->options);
214 214
         }
215 215
 
216 216
         $table = $this->getTable();
217
-        throw new DataNotFoundException('table data not Found:' . $table, $table, $this->options);
217
+        throw new DataNotFoundException('table data not Found:'.$table, $table, $this->options);
218 218
     }
219 219
 
220 220
     /**
Please login to merge, or discard this patch.
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/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.
src/think/Route.php 1 patch
Spacing   +12 added lines, -12 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;
14 14
 
@@ -175,9 +175,9 @@  discard block
 block discarded – undo
175 175
             $this->cache = $this->app->cache->store(true === $this->config['route_check_cache'] ? '' : $this->config['route_check_cache']);
176 176
         }
177 177
 
178
-        if (is_file($this->app->getRuntimePath() . 'route.php')) {
178
+        if (is_file($this->app->getRuntimePath().'route.php')) {
179 179
             // 读取路由映射文件
180
-            $this->import(include $this->app->getRuntimePath() . 'route.php');
180
+            $this->import(include $this->app->getRuntimePath().'route.php');
181 181
         }
182 182
     }
183 183
 
@@ -390,13 +390,13 @@  discard block
 block discarded – undo
390 390
         if (is_null($domain)) {
391 391
             $domain = $this->host;
392 392
         } elseif (false === strpos($domain, '.')) {
393
-            $domain .= '.' . $this->request->rootDomain();
393
+            $domain .= '.'.$this->request->rootDomain();
394 394
         }
395 395
 
396 396
         $subDomain = $this->request->subDomain();
397 397
 
398 398
         if (strpos($subDomain, '.')) {
399
-            $name = '*' . strstr($subDomain, '.');
399
+            $name = '*'.strstr($subDomain, '.');
400 400
         }
401 401
 
402 402
         if (isset($this->bind[$domain])) {
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
         $this->init();
728 728
 
729 729
         if ($withRoute) {
730
-            $checkCallback = function () use ($request, $withRoute) {
730
+            $checkCallback = function() use ($request, $withRoute) {
731 731
                 //加载路由
732 732
                 $withRoute();
733 733
                 return $this->check();
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 
747 747
         $dispatch->init($this->app);
748 748
 
749
-        $this->app->middleware->add(function () use ($dispatch) {
749
+        $this->app->middleware->add(function() use ($dispatch) {
750 750
             try {
751 751
                 $response = $dispatch->run();
752 752
             } catch (HttpResponseException $exception) {
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
             $closure  = $this->config['route_check_cache_key'];
771 771
             $routeKey = $closure($request);
772 772
         } else {
773
-            $routeKey = md5($request->baseUrl(true) . ':' . $request->method());
773
+            $routeKey = md5($request->baseUrl(true).':'.$request->method());
774 774
         }
775 775
 
776 776
         return $routeKey;
@@ -820,10 +820,10 @@  discard block
 block discarded – undo
820 820
             $path = $pathinfo;
821 821
         } elseif ($suffix) {
822 822
             // 去除正常的URL后缀
823
-            $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
823
+            $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
824 824
         } else {
825 825
             // 允许任何后缀访问
826
-            $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo);
826
+            $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo);
827 827
         }
828 828
 
829 829
         return $path;
@@ -866,9 +866,9 @@  discard block
 block discarded – undo
866 866
                 $item = $this->domains[$this->host];
867 867
             } elseif (isset($this->domains[$subDomain])) {
868 868
                 $item = $this->domains[$subDomain];
869
-            } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) {
869
+            } elseif (isset($this->domains['*.'.$domain2]) && !empty($domain3)) {
870 870
                 // 泛三级域名
871
-                $item      = $this->domains['*.' . $domain2];
871
+                $item      = $this->domains['*.'.$domain2];
872 872
                 $panDomain = $domain3;
873 873
             } elseif (isset($this->domains['*']) && !empty($domain2)) {
874 874
                 // 泛二级域名
Please login to merge, or discard this patch.