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/Container.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -141,7 +141,7 @@ 
             return $this->make($abstract);
         }
 
-        throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract);
+        throw new ClassNotFoundException('class not exists: '.$abstract, $abstract);
     }
 
     /**
@@ -299,7 +299,7 @@ 
 
             return call_user_func_array($function, $args);
         } catch (ReflectionException $e) {
-            throw new Exception('function not exists: ' . $function . '()');
+            throw new Exception('function not exists: '.$function.'()');
         }
     }
 
@@ -327,12 +327,12 @@ 
         } catch (ReflectionException $e) {
             if (is_array($method)) {
                 $class    = is_object($method[0]) ? get_class($method[0]) : $method[0];
-                $callback = $class . '::' . $method[1];
+                $callback = $class.'::'.$method[1];
             } else {
                 $callback = $method;
             }
 
-            throw new Exception('method not exists: ' . $callback . '()');
+            throw new Exception('method not exists: '.$callback.'()');
         }
     }
 
@@ -394,7 +394,7 @@ 
 
             return $reflect->newInstanceArgs($args);
         } catch (ReflectionException $e) {
-            throw new ClassNotFoundException('class not exists: ' . $class, $class);
+            throw new ClassNotFoundException('class not exists: '.$class, $class);
         }
     }
 
@@ -433,7 +433,7 @@ 
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $param->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('method param miss:' . $name);
+                throw new InvalidArgumentException('method param miss:'.$name);
             }
         }
 

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/concern/RelationShip.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model\concern;
 
@@ -113,7 +113,7 @@ 
     public function setRelation(string $name, $value, array $data = [])
     {
         // 检测修改器
-        $method = 'set' . App::parseName($name, 1) . 'Attr';
+        $method = 'set'.App::parseName($name, 1).'Attr';
 
         if (method_exists($this, $method)) {
             $value = $this->$method($value, array_merge($this->data, $data));
@@ -312,7 +312,7 @@ 
             $value = $this->getOrigin($key);
 
             if (!is_null($value)) {
-                throw new Exception('bind attr has exists:' . $key);
+                throw new Exception('bind attr has exists:'.$key);
             }
 
             $this->set($key, $relation ? $relation->$attr : null);
@@ -347,7 +347,7 @@ 
             $count    = $this->$relation()->relationCount($result, $closure, $aggregate, $field, $name);
 
             if (empty($name)) {
-                $name = App::parseName($relation) . '_' . $aggregate;
+                $name = App::parseName($relation).'_'.$aggregate;
             }
 
             $result->setAttr($name, $count);
@@ -472,8 +472,8 @@ 
         // 记录当前关联信息
         $model      = $this->parseModel($model);
         $name       = App::parseName(App::classBaseName($model));
-        $table      = $table ?: App::parseName($this->name) . '_' . $name;
-        $foreignKey = $foreignKey ?: $name . '_id';
+        $table      = $table ?: App::parseName($this->name).'_'.$name;
+        $foreignKey = $foreignKey ?: $name.'_id';
         $localKey   = $localKey ?: $this->getForeignKey($this->name);
 
         return new BelongsToMany($this, $model, $table, $foreignKey, $localKey);
@@ -500,8 +500,8 @@ 
         if (is_array($morph)) {
             list($morphType, $foreignKey) = $morph;
         } else {
-            $morphType  = $morph . '_type';
-            $foreignKey = $morph . '_id';
+            $morphType  = $morph.'_type';
+            $foreignKey = $morph.'_id';
         }
 
         $type = $type ?: get_class($this);
@@ -532,8 +532,8 @@ 
         if (is_array($morph)) {
             list($morphType, $foreignKey) = $morph;
         } else {
-            $morphType  = $morph . '_type';
-            $foreignKey = $morph . '_id';
+            $morphType  = $morph.'_type';
+            $foreignKey = $morph.'_id';
         }
 
         return new MorphMany($this, $model, $foreignKey, $morphType, $type);
@@ -559,8 +559,8 @@ 
         if (is_array($morph)) {
             list($morphType, $foreignKey) = $morph;
         } else {
-            $morphType  = $morph . '_type';
-            $foreignKey = $morph . '_id';
+            $morphType  = $morph.'_type';
+            $foreignKey = $morph.'_id';
         }
 
         return new MorphTo($this, $morphType, $foreignKey, $alias, $relation);
@@ -596,7 +596,7 @@ 
             $name = App::classBaseName($name);
         }
 
-        return App::parseName($name) . '_id';
+        return App::parseName($name).'_id';
     }
 
     /**

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($name);
         } 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) {

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