top-think / framework

library/think/Model.php

Indentation +8 added lines, -8 removed lines

@@ -253,14 +253,14 @@
         return $this;
     }
 
-       /**
-     * 创建新的模型实例
-     * @access public
-     * @param  array|object $data 数据
-     * @param  bool         $isUpdate 是否为更新
-     * @param  mixed        $where 更新条件
-     * @return Model
-     */
+        /**
+         * 创建新的模型实例
+         * @access public
+         * @param  array|object $data 数据
+         * @param  bool         $isUpdate 是否为更新
+         * @param  mixed        $where 更新条件
+         * @return Model
+         */
     public function newInstance($data = [], $isUpdate = false, $where = null)
     {
         $model = new static($data);

Spacing +3 added lines, -3 removed lines

@@ -329,7 +329,7 @@ 
         // 设置当前模型 确保查询返回模型对象
         $query = Db::connect($this->connection, false, $this->query);
         $query->model($this)
-            ->name($this->name . $this->suffix)
+            ->name($this->name.$this->suffix)
             ->json($this->json, $this->jsonAssoc)
             ->setJsonFieldType($this->jsonType);
 
@@ -339,7 +339,7 @@ 
 
         // 设置当前数据表和模型名
         if (!empty($this->table)) {
-            $query->table($this->table . $this->suffix);
+            $query->table($this->table.$this->suffix);
         }
 
         if (!empty($this->pk)) {
@@ -382,7 +382,7 @@ 
 
         // 全局作用域
         if (true === $useBaseQuery && method_exists($this, 'base')) {
-            call_user_func_array([$this, 'base'], [ & $query]);
+            call_user_func_array([$this, 'base'], [& $query]);
         }
 
         $globalScope = is_array($useBaseQuery) && $useBaseQuery ? $useBaseQuery : $this->globalScope;