top-think / framework

library/think/view/driver/Think.php

Spacing +8 added lines, -8 removed lines

@@ -44,7 +44,7 @@ 
         $this->config = array_merge($this->config, (array) $config);
 
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $app->getModulePath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $this->template = new Template($app, $this->config);
@@ -83,12 +83,12 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         // 记录视图信息
         $this->app
-            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->log('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         $this->template->fetch($template, $data, $config);
     }
@@ -126,9 +126,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $module = isset($module) ? $module : $request->module();
-            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -140,16 +140,16 @@ 
             if ($controller) {
                 if ('' == $template) {
                     // 如果模板文件名为空 按照默认规则定位
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$this->getActionTemplate($request);
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     protected function getActionTemplate($request)

library/think/view/driver/Php.php

Spacing +9 added lines, -9 removed lines

@@ -73,14 +73,14 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         $this->template = $template;
 
         // 记录视图信息
         $this->app
-            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->log('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         extract($data, EXTR_OVERWRITE);
         include $this->template;
@@ -98,7 +98,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -110,7 +110,7 @@ 
     private function parseTemplate($template)
     {
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $this->app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $this->app->getModulePath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $request = $this->app['request'];
@@ -124,9 +124,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $module = isset($module) ? $module : $request->module();
-            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -138,16 +138,16 @@ 
             if ($controller) {
                 if ('' == $template) {
                     // 如果模板文件名为空 按照默认规则定位
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$this->getActionTemplate($request);
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     protected function getActionTemplate($request)

library/think/Hook.php

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
             }
 
             $call  = [$class, $method];
-            $class = $class . '->' . $method;
+            $class = $class.'->'.$method;
         }
 
         $result = $this->app->invoke($call, [$params]);

helper.php

Spacing +2 added lines, -2 removed lines

@@ -483,7 +483,7 @@ 
     function parse_name($name, $type = 0, $ucfirst = true)
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
 
@@ -594,7 +594,7 @@ 
     {
         $token = Request::token($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 

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);
     }