top-think / framework

src/think/Response.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;
 
@@ -101,7 +101,7 @@ 
      */
     public static function create($data = '', string $type = '', int $code = 200): Response
     {
-        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type));
+        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\'.ucfirst(strtolower($type));
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, [$data, $code]);
@@ -150,7 +150,7 @@ 
             http_response_code($this->code);
             // 发送头部信息
             foreach ($this->header as $name => $val) {
-                header($name . (!is_null($val) ? ':' . $val : ''));
+                header($name.(!is_null($val) ? ':'.$val : ''));
             }
         }
 
@@ -343,7 +343,7 @@ 
      */
     public function contentType(string $contentType, string $charset = 'utf-8')
     {
-        $this->header['Content-Type'] = $contentType . '; charset=' . $charset;
+        $this->header['Content-Type'] = $contentType.'; charset='.$charset;
 
         return $this;
     }

src/think/model/Collection.php

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: zhangyajun <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model;
 
@@ -44,7 +44,7 @@ 
      */
     public function delete(): bool
     {
-        $this->each(function (Model $model) {
+        $this->each(function(Model $model) {
             $model->delete();
         });
 
@@ -60,7 +60,7 @@ 
      */
     public function update(array $data, array $allowField = []): bool
     {
-        $this->each(function (Model $model) use ($data, $allowField) {
+        $this->each(function(Model $model) use ($data, $allowField) {
             if (!empty($allowField)) {
                 $model->allowField($allowField);
             }
@@ -79,7 +79,7 @@ 
      */
     public function hidden(array $hidden)
     {
-        $this->each(function (Model $model) use ($hidden) {
+        $this->each(function(Model $model) use ($hidden) {
             $model->hidden($hidden);
         });
 
@@ -94,7 +94,7 @@ 
      */
     public function visible(array $visible)
     {
-        $this->each(function (Model $model) use ($visible) {
+        $this->each(function(Model $model) use ($visible) {
             $model->visible($visible);
         });
 
@@ -109,7 +109,7 @@ 
      */
     public function append(array $append)
     {
-        $this->each(function (Model $model) use ($append) {
+        $this->each(function(Model $model) use ($append) {
             $model->append($append);
         });
 
@@ -124,7 +124,7 @@ 
      */
     public function setParent(Model $parent)
     {
-        $this->each(function (Model $model) use ($parent) {
+        $this->each(function(Model $model) use ($parent) {
             $model->setParent($parent);
         });
 
@@ -140,7 +140,7 @@ 
      */
     public function withAttr($name, $callback = null)
     {
-        $this->each(function (Model $model) use ($name, $callback) {
+        $this->each(function(Model $model) use ($name, $callback) {
             $model->withAttribute($name, $callback);
         });
 
@@ -157,7 +157,7 @@ 
      */
     public function bindAttr(string $relation, array $attrs = [])
     {
-        $this->each(function (Model $model) use ($relation, $attrs) {
+        $this->each(function(Model $model) use ($relation, $attrs) {
             $model->bindAttr($relation, $attrs);
         });
 

src/think/model/concern/SoftDelete.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\model\concern;
 
@@ -155,7 +155,7 @@ 
             $query->where($data);
             $data = null;
         } elseif ($data instanceof \Closure) {
-            call_user_func_array($data, [ & $query]);
+            call_user_func_array($data, [& $query]);
             $data = null;
         } elseif (is_null($data)) {
             return false;
@@ -217,7 +217,7 @@ 
         }
 
         if (false === strpos($field, '.')) {
-            $field = '__TABLE__.' . $field;
+            $field = '__TABLE__.'.$field;
         }
 
         if (!$read && strpos($field, '.')) {

src/think/model/concern/ModelEvent.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model\concern;
 
@@ -52,7 +52,7 @@ 
             return true;
         }
 
-        $call = 'on' . App::parseName($event, 1);
+        $call = 'on'.App::parseName($event, 1);
 
         try {
             if (method_exists(static::class, $call)) {

src/think/model/concern/Conversion.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\model\concern;
 
@@ -83,7 +83,7 @@ 
             foreach ($append as $key => $attr) {
                 $key = is_numeric($key) ? $attr : $key;
                 if (isset($this->data[$key])) {
-                    throw new Exception('bind attr has exists:' . $key);
+                    throw new Exception('bind attr has exists:'.$key);
                 }
 
                 $this->data[$key] = $model->$attr;
@@ -227,7 +227,7 @@ 
                 $key = is_numeric($key) ? $attr : $key;
 
                 if (isset($item[$key])) {
-                    throw new Exception('bind attr has exists:' . $key);
+                    throw new Exception('bind attr has exists:'.$key);
                 }
 
                 $item[$key] = $value ? $value->getAttr($attr) : null;

src/think/model/Relation.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;
 
@@ -140,7 +140,7 @@ 
     protected function getRelationQueryFields($fields, string $model)
     {
         if (empty($fields) || '*' == $fields) {
-            return $model . '.*';
+            return $model.'.*';
         }
 
         if (is_string($fields)) {
@@ -149,7 +149,7 @@ 
 
         foreach ($fields as &$field) {
             if (false === strpos($field, '.')) {
-                $field = $model . '.' . $field;
+                $field = $model.'.'.$field;
             }
         }
 
@@ -160,10 +160,10 @@ 
     {
         foreach ($where as $key => &$val) {
             if (is_string($key)) {
-                $where[] = [false === strpos($key, '.') ? $relation . '.' . $key : $key, '=', $val];
+                $where[] = [false === strpos($key, '.') ? $relation.'.'.$key : $key, '=', $val];
                 unset($where[$key]);
             } elseif (isset($val[0]) && false === strpos($val[0], '.')) {
-                $val[0] = $relation . '.' . $val[0];
+                $val[0] = $relation.'.'.$val[0];
             }
         }
     }
@@ -237,6 +237,6 @@ 
             return $result === $this->query ? $this : $result;
         }
 
-        throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+        throw new Exception('method not exists:'.__CLASS__.'->'.$method);
     }
 }

src/think/model/relation/OneToOne.php

Spacing +4 added lines, -4 removed lines

@@ -91,9 +91,9 @@ 
         $query->via($joinAlias);
 
         if ($this instanceof BelongsTo) {
-            $joinOn = $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey;
+            $joinOn = $name.'.'.$this->foreignKey.'='.$joinAlias.'.'.$this->localKey;
         } else {
-            $joinOn = $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey;
+            $joinOn = $name.'.'.$this->localKey.'='.$joinAlias.'.'.$this->foreignKey;
         }
 
         if ($closure) {
@@ -106,7 +106,7 @@ 
         }
 
         $query->join([$joinTable => $joinAlias], $joinOn, $joinType)
-            ->tableField($field, $joinTable, $joinAlias, $relation . '__');
+            ->tableField($field, $joinTable, $joinAlias, $relation.'__');
     }
 
     /**
@@ -275,7 +275,7 @@ 
             $value = $result->getOrigin($key);
 
             if (!is_null($value)) {
-                throw new Exception('bind attr has exists:' . $key);
+                throw new Exception('bind attr has exists:'.$key);
             }
 
             $result->setAttr($key, $model ? $model->$attr : null);

src/think/model/relation/HasOne.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;
 
@@ -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);
     }
@@ -139,10 +139,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 . '.' . $foreignKey)
-                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey);
+                    ->field($relation.'.'.$foreignKey)
+                    ->whereExp($model.'.'.$localKey, '='.$relation.'.'.$foreignKey);
             });
     }
 
@@ -171,7 +171,7 @@ 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType ?: $this->joinType)
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $joinType ?: $this->joinType)
             ->where($where);
     }
 

src/think/model/relation/MorphMany.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
         }
 
         return $this->query
-            ->whereExp($this->morphKey, '=' . $this->parent->getTable() . '.' . $this->parent->getPk())
+            ->whereExp($this->morphKey, '='.$this->parent->getTable().'.'.$this->parent->getPk())
             ->where($this->morphType, '=', $this->type)
             ->fetchSql()
             ->$aggregate($field);