增加setAttr和getAttr兼容方法

Author: liu21st

src/db/concern/ModelRelationQuery.php

@@ -14,7 +14,6 @@
 namespace think\db\concern;
 
 use Closure;
-use think\Entity;
 use think\helper\Str;
 use think\model\Collection as ModelCollection;
 use think\model\contract\Modelable as Model;

src/model/Pivot.php

@@ -13,7 +13,6 @@
 
 namespace think\model;
 
-use think\Entity;
 use think\Model;
 
 /**
@@ -46,8 +45,8 @@ public function __construct(array $data = [], ?Model $parent = null, string $tab
     {
         $this->parent = $parent;
 
-        if (is_null($this->name)) {
-            $this->name = $table;
+        if (is_null($this->getOption('name')) {
+            $this->setOption('name', $table);
         }
 
         parent::__construct($data);
@@ -57,22 +56,15 @@ public function __construct(array $data = [], ?Model $parent = null, string $tab
      * 创建新的模型实例.
      *
      * @param array $data    数据
-     * @param mixed $where   更新条件
-     * @param array $options 参数
      *
      * @return Model
      */
-    public function newInstance(array $data = [], $where = null, array $options = []): Model
+    public function newInstance(array $data = [])
     {
-        $model = parent::newInstance($data, $where, $options);
+        $model = parent::newInstance($data);
 
-        if ($model instanceof Entity) {
-            $model->setParent($this->parent);
-            $model->setOption('table_name', $this->name);
-        } else {
-            $model->parent  = $this->parent;
-            $model->name    = $this->name;
-        }
+        $model->parent = $this->parent;
+        $model->setOption('name', $this->getOption('name'));
 
         return $model;
     }

src/model/concern/Attribute.php

@@ -23,7 +23,7 @@
 use think\model\contract\EnumTransform;
 use think\model\contract\FieldTypeTransform;
 use think\model\contract\Typeable;
-use think\model\contract\Modelable;
+use think\model\contract\Modelable as Model;
 use think\model\type\Date;
 use think\model\type\DateTime;
 use think\model\type\Json;
@@ -437,19 +437,13 @@ public function isJsonAssoc(): bool
      */
     public function set(string $name, $value)
     {
-        $ignore = $this->getOption('ignore', []);
         $name   = $this->getMappingName($name);
         $type   = $this->getFields($name);
 
-        if (in_array($name, $ignore)) {
-            // 忽略属性
-            return $this;
-        }
-
-        if (is_null($value) && is_subclass_of($type, Entity::class)) {
+        if (is_null($value) && is_subclass_of($type, Model::class)) {
             // 关联数据为空 设置一个空模型
             $value = new $type();
-        } elseif (!($value instanceof Modelable || $value instanceof Collection)) {
+        } elseif (!($value instanceof Model || $value instanceof Collection)) {
             // 类型自动转换
             $value = $this->readTransform($value, $type);
         }
@@ -508,13 +502,7 @@ private function setWithAttr(string $name, $value, array $data = [])
      */
     public function get(string $name, bool $attr = true)
     {
-        $ignore = $this->getOption('ignore', []);
         $name   = $this->getMappingName($name);
-        if (in_array($name, $ignore)) {
-            // 忽略属性
-            return null;
-        }
-
         if ($attr && $value = $this->getWeakData('get', $name)) {
             // 已经输出的数据直接返回
             return $value;
@@ -580,16 +568,27 @@ private function getWithAttr(string $name, $value, array $data = [])
     }
 
     /**
-     * 设置忽略属性.
+     * 使用获取器获取数据对象的值
      *
-     * @param array $ignore 忽略属性列表
+     * @param string $name 名称
      *
-     * @return $this
+     * @return mixed
      */
-    public function ignore(array $ignore)
+    public function getAttr(string $name)
     {
-        $this->setOption('ignore', $ignore);
+        return $this->get($name);
+    }  
 
-        return $this;
-    }    
+    /**
+     * 设置数据对象的值 并进行类型自动转换
+     *
+     * @param string $name  名称
+     * @param mixed  $value 值
+     *
+     * @return $this
+     */
+    public function setAttr(string $name, $value)
+    {
+        return $this->set($name, $value);
+    }
 }

src/model/concern/RelationShip.php

@@ -68,7 +68,7 @@ private function parseRelationData(array $relations)
             if (!empty($bind)) {
                 // 绑定关联属性
                 $this->bindRelationAttr($val, $bind);
-            } elseif (is_subclass_of($type, Entity::class)) {
+            } elseif (is_subclass_of($type, Model::class)) {
                 // 明确类型直接设置关联属性
                 $this->$relation = new $type($val);
             } else {
@@ -134,18 +134,6 @@ private function relationDelete(array $relations = [])
         }
     }
 
-    /**
-     * 获取关联的外键名.
-     *
-     * @param string $relation 关联名
-     * @return string|null
-     */
-    protected function getRelationKey(string $relation)
-    {
-        $relationKey = $this->getOption('relation_keys', []);
-        return $relationKey[$relation] ?? null;
-    }
-
     /**
      * 获取关联数据
      *
@@ -168,26 +156,28 @@ protected function getRelationData(string $name)
 
     protected function getBindAttr($bind, $name)
     {
-        if (true === $bind || (isset($bind[$name]) && true === $bind[$name])) {
-            return true;
-        }
         return $bind[$name] ?? [];
     }
 
     /**
      * 设置关联绑定数据
      *
-     * @param Entity|array $entity 关联实体对象
-     * @param array|bool  $bind  绑定属性
+     * @param Model|array $model 关联对象
+     * @param array       $bind  绑定属性
      * @return void
      */
-    public function bindRelationAttr($entity, $bind = [])
+    public function bindRelationAttr(Model | array $model, array $bind = [])
     {
-        $data = is_array($entity) ? $entity : $entity->getData();
+        $data = is_array($model) ? $model : $model->getData();
         foreach ($data as $key => $val) {
             if (isset($bind[$key])) {
-                $this->set($bind[$key], $val);
-            } elseif ((true === $bind || in_array($key, $bind)) && !$this->__isset($key)) {
+                $this->set($bind[$key], $val);                    
+            } elseif ($attr = array_search($key, $bind)) {
+                if (is_numeric($attr) || $this->__isset($attr)) {
+                } else {
+                    $this->set($attr, $val);                    
+                }
+            } elseif (in_array($key, $bind) && !$this->__isset($key)) {
                 $this->set($key, $val);
             }
         }

src/model/relation/BelongsTo.php

@@ -15,7 +15,6 @@
 
 use Closure;
 use think\db\BaseQuery as Query;
-use think\Entity;
 use think\model\contract\Modelable as Model;
 
 /**

src/model/relation/HasOne.php

@@ -15,7 +15,6 @@
 
 use Closure;
 use think\db\BaseQuery as Query;
-use think\Entity;
 use think\model\contract\Modelable as Model;
 
 /**

src/model/relation/OneToOne.php

@@ -16,7 +16,6 @@
 use think\db\BaseQuery as Query;
 use think\db\exception\DbException as Exception;
 use think\db\exception\InvalidArgumentException;
-use think\Entity;
 use think\helper\Str;
 use think\model\contract\Modelable as Model;
 use think\model\Relation;

tests/stubs/UserModel.php

@@ -24,8 +24,7 @@ public function profile(): HasOne
         return $this->hasOne(ProfileModel::class, 'uid')
             ->bind([
                 'email',
-                'new_name'	=> 'nickname',
-                'call_name' => fn ($model) =>$model?->get('nickname')
+                'new_name'	=> 'nickname'
             ]);
     }
 }