top-think / framework

src/think/model/relation/HasManyThrough.php

Spacing +20 added lines, -20 removed lines

@@ -107,16 +107,16 @@ 
         $relationTable = $relation->getTable();
 
         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)
-            ->group($relationTable . '.' . $this->throughKey)
-            ->having('count(' . $id . ')' . $operator . $count);
+            ->field($model.'.*')
+            ->join($throughTable, $throughTable.'.'.$this->foreignKey.'='.$model.'.'.$this->localKey)
+            ->join($relationTable, $relationTable.'.'.$throughKey.'='.$throughTable.'.'.$this->throughPk)
+            ->group($relationTable.'.'.$this->throughKey)
+            ->having('count('.$id.')'.$operator.$count);
     }
 
     /**
@@ -145,9 +145,9 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
-            ->join($modelTable, $modelTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
-            ->group($modelTable . '.' . $this->throughKey)
+            ->join($throughTable, $throughTable.'.'.$this->foreignKey.'='.$model.'.'.$this->localKey)
+            ->join($modelTable, $modelTable.'.'.$throughKey.'='.$throughTable.'.'.$this->throughPk)
+            ->group($modelTable.'.'.$this->throughKey)
             ->where($where)
             ->field($fields);
     }
@@ -294,14 +294,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);
     }
 
@@ -327,14 +327,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);
     }
@@ -357,9 +357,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;
         }

src/think/model/relation/HasMany.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model\relation;
 
@@ -180,8 +180,8 @@ 
             $closure($this, $name);
         }
 
-        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);
     }
@@ -290,15 +290,15 @@ 
         $relation = App::classBaseName($this->model);
 
         if ('*' != $id) {
-            $id = $relation . '.' . (new $this->model)->getPk();
+            $id = $relation.'.'.(new $this->model)->getPk();
         }
 
         return $this->parent->db()
             ->alias($model)
-            ->field($model . '.*')
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
-            ->group($relation . '.' . $this->foreignKey)
-            ->having('count(' . $id . ')' . $operator . $count);
+            ->field($model.'.*')
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $joinType)
+            ->group($relation.'.'.$this->foreignKey)
+            ->having('count('.$id.')'.$operator.$count);
     }
 
     /**
@@ -325,9 +325,9 @@ 
 
         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)
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey)
             ->where($where);
     }
 

src/think/model/relation/BelongsTo.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\model\relation;
 
@@ -89,7 +89,7 @@ 
         }
 
         return $this->query
-            ->whereExp($this->localKey, '=' . $this->parent->getTable() . '.' . $this->foreignKey)
+            ->whereExp($this->localKey, '='.$this->parent->getTable().'.'.$this->foreignKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -140,10 +140,10 @@ 
 
         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);
+                    ->field($relation.'.'.$localKey)
+                    ->whereExp($model.'.'.$foreignKey, '='.$relation.'.'.$localKey);
             });
     }
 
@@ -172,7 +172,7 @@ 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $joinType ?: $this->joinType)
+            ->join([$table => $relation], $model.'.'.$this->foreignKey.'='.$relation.'.'.$this->localKey, $joinType ?: $this->joinType)
             ->where($where);
     }
 

src/think/Paginator.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: zhangyajun <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -184,10 +184,10 @@ 
 
         $url = $path;
         if (!empty($parameters)) {
-            $url .= '?' . http_build_query($parameters, '', '&');
+            $url .= '?'.http_build_query($parameters, '', '&');
         }
 
-        return $url . $this->buildFragment();
+        return $url.$this->buildFragment();
     }
 
     /**
@@ -336,7 +336,7 @@ 
      */
     protected function buildFragment(): string
     {
-        return $this->options['fragment'] ? '#' . $this->options['fragment'] : '';
+        return $this->options['fragment'] ? '#'.$this->options['fragment'] : '';
     }
 
     /**

src/think/exception/Handle.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
             }
 
             if ($this->app->config->get('log.record_trace')) {
-                $log .= PHP_EOL . $exception->getTraceAsString();
+                $log .= PHP_EOL.$exception->getTraceAsString();
             }
 
             $this->app->log->record($log, 'error');
@@ -203,7 +203,7 @@ 
 
             ob_start();
             extract($data);
-            include $this->app->config->get('app.exception_tmpl') ?: __DIR__ . '/../../tpl/think_exception.tpl';
+            include $this->app->config->get('app.exception_tmpl') ?: __DIR__.'/../../tpl/think_exception.tpl';
 
             // 获取并清空缓存
             $data     = ob_get_clean();
@@ -257,10 +257,10 @@ 
 
         if (strpos($message, ':')) {
             $name    = strstr($message, ':', true);
-            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+            $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message;
         } elseif (strpos($message, ',')) {
             $name    = strstr($message, ',', true);
-            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+            $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message;
         } elseif ($lang->has($message)) {
             $message = $lang->get($message);
         }

src/think/response/Xml.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             if (0 !== strpos($data, '<?xml')) {
                 $encoding = $this->options['encoding'];
                 $xml      = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>";
-                $data     = $xml . $data;
+                $data     = $xml.$data;
             }
             return $data;
         }

src/think/response/Jsonp.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 throw new \InvalidArgumentException(json_last_error_msg());
             }
 
-            $data = $handler . '(' . $data . ');';
+            $data = $handler.'('.$data.');';
 
             return $data;
         } catch (\Exception $e) {

src/think/response/File.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
     protected function output($data)
     {
         if (!$this->isContent && !is_file($data)) {
-            throw new Exception('file not exists:' . $data);
+            throw new Exception('file not exists:'.$data);
         }
 
         ob_end_clean();
@@ -55,13 +55,13 @@ 
 
         $this->header['Pragma']                    = 'public';
         $this->header['Content-Type']              = $mimeType ?: 'application/octet-stream';
-        $this->header['Cache-control']             = 'max-age=' . $this->expire;
-        $this->header['Content-Disposition']       = 'attachment; filename="' . $name . '"';
+        $this->header['Cache-control']             = 'max-age='.$this->expire;
+        $this->header['Content-Disposition']       = 'attachment; filename="'.$name.'"';
         $this->header['Content-Length']            = $size;
         $this->header['Content-Transfer-Encoding'] = 'binary';
-        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT';
+        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire).' GMT';
 
-        $this->lastModified(gmdate('D, d M Y H:i:s', time()) . ' GMT');
+        $this->lastModified(gmdate('D, d M Y H:i:s', time()).' GMT');
 
         return $this->isContent ? $data : file_get_contents($data);
     }
@@ -131,7 +131,7 @@ 
         $this->name = $filename;
 
         if ($extension && false === strpos($filename, '.')) {
-            $this->name .= '.' . pathinfo($this->data, PATHINFO_EXTENSION);
+            $this->name .= '.'.pathinfo($this->data, PATHINFO_EXTENSION);
         }
 
         return $this;

src/think/initializer/Error.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\initializer;