top-think / framework

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

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

Spacing +9 added lines, -9 removed lines

@@ -159,7 +159,7 @@ 
         // 关联查询
         $pk = $this->parent->getPk();
 
-        $condition = ['pivot.' . $localKey, '=', $this->parent->$pk];
+        $condition = ['pivot.'.$localKey, '=', $this->parent->$pk];
 
         return $this->belongsToManyQuery($foreignKey, $localKey, [$condition]);
     }
@@ -294,7 +294,7 @@ 
      */
     public function wherePivot($field, $op = null, $condition = null)
     {
-        $this->query->where('pivot.' . $field, $op, $condition);
+        $this->query->where('pivot.'.$field, $op, $condition);
         return $this;
     }
 
@@ -323,7 +323,7 @@ 
         if (!empty($range)) {
             // 查询关联数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $localKey, 'in', $range],
+                ['pivot.'.$localKey, 'in', $range],
             ], $relation, $subRelation, $closure);
 
             // 关联属性名
@@ -357,7 +357,7 @@ 
             $pk = $result->$pk;
             // 查询管理数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $this->localKey, '=', $pk],
+                ['pivot.'.$this->localKey, '=', $pk],
             ], $relation, $subRelation, $closure);
 
             // 关联数据封装
@@ -394,7 +394,7 @@ 
         }
 
         return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
-            ['pivot.' . $this->localKey, '=', $pk],
+            ['pivot.'.$this->localKey, '=', $pk],
         ])->$aggregate($field);
     }
 
@@ -415,7 +415,7 @@ 
 
         return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
             [
-                'pivot.' . $this->localKey, 'exp', new Raw('=' . $this->parent->db(false)->getTable() . '.' . $this->parent->getPk()),
+                'pivot.'.$this->localKey, 'exp', new Raw('='.$this->parent->db(false)->getTable().'.'.$this->parent->getPk()),
             ],
         ])->fetchSql()->$aggregate($field);
     }
@@ -493,7 +493,7 @@ 
 
         if (empty($this->baseQuery)) {
             $relationFk = $this->query->getPk();
-            $query->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
+            $query->join([$table => 'pivot'], 'pivot.'.$foreignKey.'='.$tableName.'.'.$relationFk)
                 ->where($condition);
         }
 
@@ -715,8 +715,8 @@ 
             $table = $this->pivot->getTable();
 
             $this->query
-                ->join([$table => 'pivot'], 'pivot.' . $this->foreignKey . '=' . $this->query->getTable() . '.' . $this->query->getPk())
-                ->where('pivot.' . $this->localKey, $this->parent->$pk);
+                ->join([$table => 'pivot'], 'pivot.'.$this->foreignKey.'='.$this->query->getTable().'.'.$this->query->getPk())
+                ->where('pivot.'.$this->localKey, $this->parent->$pk);
             $this->baseQuery = true;
         }
     }

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

src/think/model/relation/MorphTo.php

Spacing +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
                         // 关联模型
                         if (!isset($data[$result->$morphKey])) {
                             $relationModel = null;
-                            throw new Exception('relation data not exists :' . $this->model);
+                            throw new Exception('relation data not exists :'.$this->model);
                         } else {
                             $relationModel = $data[$result->$morphKey];
                             $relationModel->setParent(clone $result);

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