top-think / framework

library/think/process/exception/Failed.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
         }
 
-        $error = sprintf('The command "%s" failed.' . "\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
+        $error = sprintf('The command "%s" failed.'."\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
 
         if (!$process->isOutputDisabled()) {
             $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s", $process->getOutput(), $process->getErrorOutput());

library/think/db/connector/Mysql.php

Spacing +12 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
     protected function initialize()
     {
         // Point类型支持
-        Query::extend('point', function ($query, $field, $value = null, $fun = 'GeomFromText', $type = 'POINT') {
+        Query::extend('point', function($query, $field, $value = null, $fun = 'GeomFromText', $type = 'POINT') {
             if (!is_null($value)) {
                 $query->data($field, ['point', $value, $fun, $type]);
             } else {
@@ -54,16 +54,16 @@ 
     protected function parseDsn($config)
     {
         if (!empty($config['socket'])) {
-            $dsn = 'mysql:unix_socket=' . $config['socket'];
+            $dsn = 'mysql:unix_socket='.$config['socket'];
         } elseif (!empty($config['hostport'])) {
-            $dsn = 'mysql:host=' . $config['hostname'] . ';port=' . $config['hostport'];
+            $dsn = 'mysql:host='.$config['hostname'].';port='.$config['hostport'];
         } else {
-            $dsn = 'mysql:host=' . $config['hostname'];
+            $dsn = 'mysql:host='.$config['hostname'];
         }
-        $dsn .= ';dbname=' . $config['database'];
+        $dsn .= ';dbname='.$config['database'];
 
         if (!empty($config['charset'])) {
-            $dsn .= ';charset=' . $config['charset'];
+            $dsn .= ';charset='.$config['charset'];
         }
 
         return $dsn;
@@ -83,10 +83,10 @@ 
             if (strpos($tableName, '.')) {
                 $tableName = str_replace('.', '`.`', $tableName);
             }
-            $tableName = '`' . $tableName . '`';
+            $tableName = '`'.$tableName.'`';
         }
 
-        $sql    = 'SHOW COLUMNS FROM ' . $tableName;
+        $sql    = 'SHOW COLUMNS FROM '.$tableName;
         $pdo    = $this->query($sql, [], false, true);
         $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
         $info   = [];
@@ -116,7 +116,7 @@ 
      */
     public function getTables($dbName = '')
     {
-        $sql    = !empty($dbName) ? 'SHOW TABLES FROM ' . $dbName : 'SHOW TABLES ';
+        $sql    = !empty($dbName) ? 'SHOW TABLES FROM '.$dbName : 'SHOW TABLES ';
         $pdo    = $this->query($sql, [], false, true);
         $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
         $info   = [];
@@ -136,11 +136,11 @@ 
      */
     protected function getExplain($sql)
     {
-        $pdo = $this->linkID->prepare("EXPLAIN " . $this->queryStr);
+        $pdo = $this->linkID->prepare("EXPLAIN ".$this->queryStr);
 
         foreach ($this->bind as $key => $val) {
             // 占位符
-            $param = is_int($key) ? $key + 1 : ':' . $key;
+            $param = is_int($key) ? $key + 1 : ':'.$key;
 
             if (is_array($val)) {
                 if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
@@ -162,7 +162,7 @@ 
 
         if (isset($result['extra'])) {
             if (strpos($result['extra'], 'filesort') || strpos($result['extra'], 'temporary')) {
-                $this->log('SQL:' . $this->queryStr . '[' . $result['extra'] . ']', 'warn');
+                $this->log('SQL:'.$this->queryStr.'['.$result['extra'].']', 'warn');
             }
         }
 

library/think/model/relation/HasOne.php

Spacing +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
         }
 
         return $this->query
-            ->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->whereExp($this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -143,12 +143,12 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
+            ->whereExists(function($query) use ($table, $model, $relation, $localKey, $foreignKey) {
                 $query->table([$table => $relation])
-                    ->field($relation . '.' . $foreignKey)
-                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey)
-                    ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                        $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+                    ->field($relation.'.'.$foreignKey)
+                    ->whereExp($model.'.'.$localKey, '='.$relation.'.'.$foreignKey)
+                    ->when($softDelete, function($query) use ($softDelete, $relation) {
+                        $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
                     });
             });
     }
@@ -176,9 +176,9 @@ 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
-            ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $this->joinType)
+            ->when($softDelete, function($query) use ($softDelete, $relation) {
+                $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
             ->where($where);
     }

library/think/model/relation/HasMany.php

Spacing +12 added lines, -12 removed lines

@@ -194,8 +194,8 @@ 
             }
         }
 
-        return $this->query->alias($aggregate . '_table')
-            ->whereExp($aggregate . '_table.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+        return $this->query->alias($aggregate.'_table')
+            ->whereExp($aggregate.'_table.'.$this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -299,13 +299,13 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->field($model . '.*')
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
-            ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->field($model.'.*')
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $joinType)
+            ->when($softDelete, function($query) use ($softDelete, $relation) {
+                $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
-            ->group($relation . '.' . $this->foreignKey)
-            ->having('count(' . $id . ')' . $operator . $count);
+            ->group($relation.'.'.$this->foreignKey)
+            ->having('count('.$id.')'.$operator.$count);
     }
 
     /**
@@ -330,11 +330,11 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->group($model . '.' . $this->localKey)
+            ->group($model.'.'.$this->localKey)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
-            ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey)
+            ->when($softDelete, function($query) use ($softDelete, $relation) {
+                $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
             ->where($where);
     }

library/think/model/relation/BelongsTo.php

Spacing +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
         }
 
         return $this->query
-            ->whereExp($this->localKey, '=' . $this->parent->getTable() . '.' . $this->foreignKey)
+            ->whereExp($this->localKey, '='.$this->parent->getTable().'.'.$this->foreignKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -144,12 +144,12 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
+            ->whereExists(function($query) use ($table, $model, $relation, $localKey, $foreignKey) {
                 $query->table([$table => $relation])
-                    ->field($relation . '.' . $localKey)
-                    ->whereExp($model . '.' . $foreignKey, '=' . $relation . '.' . $localKey)
-                    ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                        $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+                    ->field($relation.'.'.$localKey)
+                    ->whereExp($model.'.'.$foreignKey, '='.$relation.'.'.$localKey)
+                    ->when($softDelete, function($query) use ($softDelete, $relation) {
+                        $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
                     });
             });
     }
@@ -177,9 +177,9 @@ 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType)
-            ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join([$table => $relation], $model.'.'.$this->foreignKey.'='.$relation.'.'.$this->localKey, $this->joinType)
+            ->when($softDelete, function($query) use ($softDelete, $relation) {
+                $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
             ->where($where);
     }

library/think/log/driver/File.php

Spacing +21 added lines, -21 removed lines

@@ -40,7 +40,7 @@ 
         }
 
         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;
         }
@@ -69,7 +69,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']))) {
@@ -136,7 +136,7 @@ 
     protected function getMasterLogFile()
     {
         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']) {
@@ -151,15 +151,15 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $destination = $this->config['path'] . $name . $cli . '.log';
+            $destination = $this->config['path'].$name.$cli.'.log';
         } else {
             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;
@@ -184,7 +184,7 @@ 
             $name = date('d');
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '_' . $type . $cli . '.log';
+        return $path.DIRECTORY_SEPARATOR.$name.'_'.$type.$cli.'.log';
     }
 
     /**
@@ -197,7 +197,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) {
             }
         }
@@ -212,14 +212,14 @@ 
     protected function parseCliLog($info)
     {
         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;
@@ -242,13 +242,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 . "\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
+        array_unshift($info, "---------------------------------------------------------------".PHP_EOL."\r\n[{$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;
     }
 
     protected function getDebugLog(&$info, $append, $apart)
@@ -263,9 +263,9 @@ 
                 $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
 
                 $info = [
-                    'runtime' => number_format($runtime, 6) . 's',
-                    'reqs'    => $reqs . 'req/s',
-                    'memory'  => $memory_use . 'kb',
+                    'runtime' => number_format($runtime, 6).'s',
+                    'reqs'    => $reqs.'req/s',
+                    'memory'  => $memory_use.'kb',
                     'file'    => count(get_included_files()),
                 ] + $info;
 
@@ -276,11 +276,11 @@ 
 
                 $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
 
-                $time_str   = '[运行时间：' . number_format($runtime, 6) . 's] [吞吐率：' . $reqs . 'req/s]';
-                $memory_str = ' [内存消耗：' . $memory_use . 'kb]';
-                $file_load  = ' [文件加载：' . count(get_included_files()) . ']';
+                $time_str   = '[运行时间：'.number_format($runtime, 6).'s] [吞吐率：'.$reqs.'req/s]';
+                $memory_str = ' [内存消耗：'.$memory_use.'kb]';
+                $file_load  = ' [文件加载：'.count(get_included_files()).']';
 
-                array_unshift($info, $time_str . $memory_str . $file_load);
+                array_unshift($info, $time_str.$memory_str.$file_load);
             }
         }
     }

library/think/model/relation/HasManyThrough.php

Spacing +24 added lines, -24 removed lines

@@ -89,19 +89,19 @@ 
         $softDelete    = $this->query->getOptions('soft_delete');
 
         if ('*' != $id) {
-            $id = $relationTable . '.' . $relation->getPk();
+            $id = $relationTable.'.'.$relation->getPk();
         }
 
         return $this->parent->db()
             ->alias($model)
-            ->field($model . '.*')
-            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
-            ->join($relationTable, $relationTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
-            ->when($softDelete, function ($query) use ($softDelete, $relationTable) {
-                $query->where($relationTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->field($model.'.*')
+            ->join($throughTable, $throughTable.'.'.$this->foreignKey.'='.$model.'.'.$this->localKey)
+            ->join($relationTable, $relationTable.'.'.$throughKey.'='.$throughTable.'.'.$this->throughPk)
+            ->when($softDelete, function($query) use ($softDelete, $relationTable) {
+                $query->where($relationTable.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
-            ->group($relationTable . '.' . $this->throughKey)
-            ->having('count(' . $id . ')' . $operator . $count);
+            ->group($relationTable.'.'.$this->throughKey)
+            ->having('count('.$id.')'.$operator.$count);
     }
 
     /**
@@ -128,12 +128,12 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
-            ->join($modelTable, $modelTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
-            ->when($softDelete, function ($query) use ($softDelete, $modelTable) {
-                $query->where($modelTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join($throughTable, $throughTable.'.'.$this->foreignKey.'='.$model.'.'.$this->localKey)
+            ->join($modelTable, $modelTable.'.'.$throughKey.'='.$throughTable.'.'.$this->throughPk)
+            ->when($softDelete, function($query) use ($softDelete, $modelTable) {
+                $query->where($modelTable.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
-            ->group($modelTable . '.' . $this->throughKey)
+            ->group($modelTable.'.'.$this->throughKey)
             ->where($where)
             ->field($fields);
     }
@@ -285,14 +285,14 @@ 
         $modelTable   = $this->parent->getTable();
 
         if (false === strpos($field, '.')) {
-            $field = $alias . '.' . $field;
+            $field = $alias.'.'.$field;
         }
 
         return $this->query
             ->alias($alias)
-            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-            ->where($throughTable . '.' . $this->foreignKey, $result->$localKey)
+            ->join($throughTable, $throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
+            ->join($modelTable, $modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
+            ->where($throughTable.'.'.$this->foreignKey, $result->$localKey)
             ->$aggregate($field);
     }
 
@@ -321,14 +321,14 @@ 
         $modelTable   = $this->parent->getTable();
 
         if (false === strpos($field, '.')) {
-            $field = $alias . '.' . $field;
+            $field = $alias.'.'.$field;
         }
 
         return $this->query
             ->alias($alias)
-            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-            ->whereExp($throughTable . '.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->join($throughTable, $throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
+            ->join($modelTable, $modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
+            ->whereExp($throughTable.'.'.$this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -351,9 +351,9 @@ 
             $this->query
                 ->field($fields)
                 ->alias($alias)
-                ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-                ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-                ->where($throughTable . '.' . $this->foreignKey, $this->parent->{$this->localKey});
+                ->join($throughTable, $throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
+                ->join($modelTable, $modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
+                ->where($throughTable.'.'.$this->foreignKey, $this->parent->{$this->localKey});
 
             $this->baseQuery = true;
         }