top-think / framework

src/think/model/relation/BelongsToMany.php

Spacing +7 added lines, -7 removed lines

@@ -159,7 +159,7 @@ 
         // 关联查询
         $pk = $this->parent->getPk();
 
-        $condition = ['pivot.' . $localKey, '=', $this->parent->$pk];
+        $condition = ['pivot.'.$localKey, '=', $this->parent->$pk];
 
         return $this->belongsToManyQuery($foreignKey, $localKey, [$condition]);
     }
@@ -294,7 +294,7 @@ 
      */
     public function wherePivot($field, $op = null, $condition = null)
     {
-        $this->query->where('pivot.' . $field, $op, $condition);
+        $this->query->where('pivot.'.$field, $op, $condition);
         return $this;
     }
 
@@ -323,7 +323,7 @@ 
         if (!empty($range)) {
             // 查询关联数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $localKey, 'in', $range],
+                ['pivot.'.$localKey, 'in', $range],
             ], $relation, $subRelation, $closure);
 
             // 关联属性名
@@ -357,7 +357,7 @@ 
             $pk = $result->$pk;
             // 查询管理数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $this->localKey, '=', $pk],
+                ['pivot.'.$this->localKey, '=', $pk],
             ], $relation, $subRelation, $closure);
 
             // 关联数据封装
@@ -394,7 +394,7 @@ 
         }
 
         return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
-            ['pivot.' . $this->localKey, '=', $pk],
+            ['pivot.'.$this->localKey, '=', $pk],
         ])->$aggregate($field);
     }
 
@@ -415,7 +415,7 @@ 
 
         return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
             [
-                'pivot.' . $this->localKey, 'exp', new Raw('=' . $this->parent->db(false)->getTable() . '.' . $this->parent->getPk()),
+                'pivot.'.$this->localKey, 'exp', new Raw('='.$this->parent->db(false)->getTable().'.'.$this->parent->getPk()),
             ],
         ])->fetchSql()->$aggregate($field);
     }
@@ -493,7 +493,7 @@ 
 
         if (empty($this->baseQuery)) {
             $relationFk = $this->query->getPk();
-            $query->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
+            $query->join([$table => 'pivot'], 'pivot.'.$foreignKey.'='.$tableName.'.'.$relationFk)
                 ->where($condition);
         }
 

src/think/route/RuleGroup.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -109,7 +109,7 @@ 
         }
 
         if ($this->parent && $this->parent->getFullName()) {
-            $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : '');
+            $this->fullName = $this->parent->getFullName().($this->name ? '/'.$this->name : '');
         } else {
             $this->fullName = $this->name;
         }
@@ -304,13 +304,13 @@ 
     protected function checkMergeRuleRegex(Request $request, array &$rules, string $url, bool $completeMatch)
     {
         $depr  = $this->router->config('pathinfo_depr');
-        $url   = $depr . str_replace('|', $depr, $url);
+        $url   = $depr.str_replace('|', $depr, $url);
         $regex = [];
         $items = [];
 
         foreach ($rules as $key => $item) {
             if ($item instanceof RuleItem) {
-                $rule = $depr . str_replace('/', $depr, $item->getRule());
+                $rule = $depr.str_replace('/', $depr, $item->getRule());
                 if ($depr == $rule && $depr != $url) {
                     unset($rules[$key]);
                     continue;
@@ -327,21 +327,21 @@ 
                     continue;
                 }
 
-                $slash = preg_quote('/-' . $depr, '/');
+                $slash = preg_quote('/-'.$depr, '/');
 
-                if ($matchRule = preg_split('/[' . $slash . ']<\w+\??>/', $rule, 2)) {
+                if ($matchRule = preg_split('/['.$slash.']<\w+\??>/', $rule, 2)) {
                     if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                         unset($rules[$key]);
                         continue;
                     }
                 }
 
-                if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+                if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
                     unset($rules[$key]);
                     $pattern = array_merge($this->getPattern(), $item->getPattern());
                     $option  = array_merge($this->getOption(), $item->getOption());
 
-                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_' . $key);
+                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_'.$key);
                     $items[$key] = $item;
                 }
             }
@@ -352,7 +352,7 @@ 
         }
 
         try {
-            $result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match);
+            $result = preg_match('/^(?:'.implode('|', $regex).')/u', $url, $match);
         } catch (\Exception $e) {
             throw new Exception('route pattern error');
         }
@@ -369,7 +369,7 @@ 
 
             if (!isset($pos)) {
                 foreach ($regex as $key => $item) {
-                    if (0 === strpos(str_replace(['\/', '\-', '\\' . $depr], ['/', '-', $depr], $item), $match[0])) {
+                    if (0 === strpos(str_replace(['\/', '\-', '\\'.$depr], ['/', '-', $depr], $item), $match[0])) {
                         $pos = $key;
                         break;
                     }
@@ -398,7 +398,7 @@ 
      * @access public
      * @return RuleItem|null
      */
-    public function getMissRule():  ? RuleItem
+    public function getMissRule(): ? RuleItem
     {
         return $this->miss;
     }
@@ -484,7 +484,7 @@ 
     public function prefix(string $prefix)
     {
         if ($this->parent && $this->parent->getOption('prefix')) {
-            $prefix = $this->parent->getOption('prefix') . $prefix;
+            $prefix = $this->parent->getOption('prefix').$prefix;
         }
 
         return $this->setOption('prefix', $prefix);

src/think/route/Resource.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -109,10 +109,10 @@ 
             $item  = [];
 
             foreach ($array as $val) {
-                $item[] = $val . '/<' . ($option['var'][$val] ?? $val . '_id') . '>';
+                $item[] = $val.'/<'.($option['var'][$val] ?? $val.'_id').'>';
             }
 
-            $rule = implode('/', $item) . '/' . $last;
+            $rule = implode('/', $item).'/'.$last;
         }
 
         $prefix = substr($rule, strlen($this->name) + 1);
@@ -125,12 +125,12 @@ 
             }
 
             if (isset($last) && strpos($val[1], '<id>') && isset($option['var'][$last])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$last] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$last].'>', $val[1]);
             } elseif (strpos($val[1], '<id>') && isset($option['var'][$rule])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$rule] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$rule].'>', $val[1]);
             }
 
-            $ruleItem = $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]);
+            $ruleItem = $this->addRule(trim($prefix.$val[1], '/'), $this->route.'/'.$val[2], $val[0]);
 
             foreach (['model', 'validate', 'middleware'] as $name) {
                 if (isset($this->$name[$key])) {

src/think/Model.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -310,12 +310,12 @@ 
             $query = $this->queryInstance;
         } else {
             $query = $this->db->connect($this->connection)
-                ->name($this->name . $this->suffix)
+                ->name($this->name.$this->suffix)
                 ->pk($this->pk);
         }
 
         if (!empty($this->table)) {
-            $query->table($this->table . $this->suffix);
+            $query->table($this->table.$this->suffix);
         }
 
         $query->model($this)
@@ -515,7 +515,7 @@ 
                 $this->field = array_keys(array_merge($this->schema, $this->jsonType));
             } else {
                 $query = $this->db();
-                $table = $this->table ? $this->table . $this->suffix : $query->getTable();
+                $table = $this->table ? $this->table.$this->suffix : $query->getTable();
 
                 $this->field = $query->getConnection()->getTableFields($table);
             }

src/think/Log.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -126,7 +126,7 @@ 
         }
 
         if (!isset($this->config['channels'][$name])) {
-            throw new InvalidArgumentException('Undefined log config:' . $name);
+            throw new InvalidArgumentException('Undefined log config:'.$name);
         }
 
         if (isset($this->config['channels'][$name]['processor'])) {
@@ -186,7 +186,7 @@ 
         if (is_string($msg) && !empty($context)) {
             $replace = [];
             foreach ($context as $key => $val) {
-                $replace['{' . $key . '}'] = $val;
+                $replace['{'.$key.'}'] = $val;
             }
 
             $msg = strtr($msg, $replace);

src/think/log/driver/File.php

Spacing +18 added lines, -18 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -80,7 +80,7 @@ 
                     $msg = var_export($msg, true);
                 }
 
-                $info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg;
+                $info[$type][] = $this->config['json'] ? $msg : '[ '.$type.' ] '.$msg;
             }
 
             if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) {
@@ -138,13 +138,13 @@ 
     protected function getMasterLogFile(): string
     {
         if (empty($this->config['path'])) {
-            $this->config['path'] = $this->app->getRuntimePath() . 'log' . DIRECTORY_SEPARATOR;
+            $this->config['path'] = $this->app->getRuntimePath().'log'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->config['path'] .= DIRECTORY_SEPARATOR;
         }
 
         if ($this->config['max_files']) {
-            $files = glob($this->config['path'] . '*.log');
+            $files = glob($this->config['path'].'*.log');
 
             try {
                 if (count($files) > $this->config['max_files']) {
@@ -158,17 +158,17 @@ 
         if ($this->config['single']) {
             $name        = is_string($this->config['single']) ? $this->config['single'] : 'single';
             $cli         = $this->isCli ? '_cli' : '';
-            $destination = $this->config['path'] . $name . $cli . '.log';
+            $destination = $this->config['path'].$name.$cli.'.log';
         } else {
             $cli = $this->isCli ? '_cli' : '';
 
             if ($this->config['max_files']) {
-                $filename = date('Ymd') . $cli . '.log';
+                $filename = date('Ymd').$cli.'.log';
             } else {
-                $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . $cli . '.log';
+                $filename = date('Ym').DIRECTORY_SEPARATOR.date('d').$cli.'.log';
             }
 
-            $destination = $this->config['path'] . $filename;
+            $destination = $this->config['path'].$filename;
         }
 
         return $destination;
@@ -188,14 +188,14 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $name .= '_' . $type;
+            $name .= '_'.$type;
         } elseif ($this->config['max_files']) {
-            $name = date('Ymd') . '_' . $type . $cli;
+            $name = date('Ymd').'_'.$type.$cli;
         } else {
-            $name = date('d') . '_' . $type . $cli;
+            $name = date('d').'_'.$type.$cli;
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '.log';
+        return $path.DIRECTORY_SEPARATOR.$name.'.log';
     }
 
     /**
@@ -208,7 +208,7 @@ 
     {
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
             try {
-                rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
+                rename($destination, dirname($destination).DIRECTORY_SEPARATOR.time().'-'.basename($destination));
             } catch (\Exception $e) {
                 //
             }
@@ -224,14 +224,14 @@ 
     protected function parseCliLog(array $info): string
     {
         if ($this->config['json']) {
-            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
+            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
         } else {
             $now = $info['timestamp'];
             unset($info['timestamp']);
 
             $message = implode(PHP_EOL, $info);
 
-            $message = "[{$now}]" . $message . PHP_EOL;
+            $message = "[{$now}]".$message.PHP_EOL;
         }
 
         return $message;
@@ -254,13 +254,13 @@ 
 
         if ($this->config['json']) {
             $info = $requestInfo + $info;
-            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
+            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
         }
 
-        array_unshift($info, "---------------------------------------------------------------" . PHP_EOL . "[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
+        array_unshift($info, "---------------------------------------------------------------".PHP_EOL."[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
         unset($info['timestamp']);
 
-        return implode(PHP_EOL, $info) . PHP_EOL;
+        return implode(PHP_EOL, $info).PHP_EOL;
     }
 
 }

src/think/db/concern/TimeFieldQuery.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\concern;
 
@@ -64,7 +64,7 @@ 
             $op = is_array($range) ? 'between' : '>=';
         }
 
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
     }
 
     /**
@@ -80,7 +80,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);
     }
@@ -136,7 +136,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);
     }
 
     /**

src/think/model/concern/Attribute.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model\concern;
 
@@ -282,7 +282,7 @@ 
             return $this->relation[$name];
         }
 
-        throw new InvalidArgumentException('property not exists:' . static::class . '->' . $name);
+        throw new InvalidArgumentException('property not exists:'.static::class.'->'.$name);
     }
 
     /**
@@ -292,7 +292,7 @@ 
      */
     public function getChangedData(): array
     {
-        $data = $this->force ? $this->data : array_udiff_assoc($this->data, $this->origin, function ($a, $b) {
+        $data = $this->force ? $this->data : array_udiff_assoc($this->data, $this->origin, function($a, $b) {
             if ((empty($a) || empty($b)) && $a !== $b) {
                 return 1;
             }
@@ -359,7 +359,7 @@ 
             $value = $this->autoWriteTimestamp();
         } else {
             // 检测修改器
-            $method = 'set' . App::parseName($name, 1) . 'Attr';
+            $method = 'set'.App::parseName($name, 1).'Attr';
 
             if (method_exists($this, $method)) {
                 $array = $this->data;
@@ -482,7 +482,7 @@ 
     {
         // 检测属性获取器
         $fieldName = $this->getRealFieldName($name);
-        $method    = 'get' . App::parseName($name, 1) . 'Attr';
+        $method    = 'get'.App::parseName($name, 1).'Attr';
 
         if (isset($this->withAttr[$fieldName])) {
             if ($relation) {