兼容Model属性定义方式

Author: liu21st

README.md

@@ -1,18 +1,11 @@
-# ThinkORM4.0
+# ThinkORM5.0
 
 基于PHP8.0+ 和PDO实现的ORM。
 
-- 模型分层设计
-- 引入实体模型
-- 引入视图模型
-- 完全兼容3.0版本
-
+完全重构的Model层，更轻量化，目前仅供开发测试用
 
 ## 安装
 ~~~
-composer require topthink/think-orm
+composer require topthink/think-orm:5.0.x-dev
 ~~~
 
-## 文档
-
-详细参考 [ThinkORM开发指南](https://doc.thinkphp.cn/@think-orm)

src/Entity.php

@@ -125,12 +125,11 @@ public function jsonSerialize(): array
     /**
      * 模型数据转数组.
      *
-     * @param array $allow 允许输出字段
      * @return array
      */
-    public function toArray(array $allow = []): array
+    public function toArray(): array
     {
-        return $this->model()->toArray($allow);
+        return $this->model()->toArray();
     }   
 
     /**

src/Model.php

@@ -206,6 +206,10 @@ protected function setOption(string $name, $value)
      */
     protected function getOption(string $name, $default = null)
     {
+        // 兼容读取3.0版本的属性参数定义
+        if (property_exists($this, $name) && isset($this->$name)) {
+            return $this->$name;
+        }
         return self::$weakMap[$this][$name] ?? $default;
     }
 

src/model/concern/Attribute.php

@@ -417,6 +417,16 @@ public function isEmpty(): bool
         return empty($this->getData());
     }
 
+    /**
+     * 判断JSON数据是否为数组格式.
+     *
+     * @return bool
+     */
+    public function isJsonAssoc(): bool
+    {
+        return $this->getOption('jsonAssoc', false);
+    }
+
     /**
      * 设置数据对象的值 并进行类型自动转换
      *

src/model/concern/AutoWriteData.php

@@ -62,11 +62,11 @@ protected function autoWriteData(array &$data, bool $update)
      */
     protected function autoDateTime(array &$data, bool $update)
     {
-        $autoDateTime   = $this->getOption('auto_timestamp', true);
+        $autoDateTime   = $this->getOption('autoWriteTimestamp', true);
         if ($autoDateTime) {
-            $dateTimeFields = [$this->getOption('update_time')];
+            $dateTimeFields = [$this->getOption('updateTime')];
             if (!$update) {
-                array_unshift($dateTimeFields, $this->getOption('create_time'));
+                array_unshift($dateTimeFields, $this->getOption('createTime'));
             }
 
             foreach ($dateTimeFields as $field) {
@@ -121,12 +121,12 @@ public function getDateFormat()
 
     public function setDateFormat(string $format)
     {
-        $this->setOption('datetime_format', $format);
+        $this->setOption('dateFormat', $format);
     }
 
     public function setTimeField($createTime, $updateTime)
     {
-        $this->setOption('create_time', $createTime);
-        $this->setOption('update_time', $updateTime);
+        $this->setOption('createTime', $createTime);
+        $this->setOption('updateTime', $updateTime);
     }    
 }

src/model/concern/ModelEvent.php

@@ -43,7 +43,7 @@ public static function setEvent($event)
      */
     public function withEvent(bool $event)
     {
-        $this->setOption('with_event', $event);
+        $this->setOption('withEvent', $event);
 
         return $this;
     }
@@ -57,13 +57,13 @@ public function withEvent(bool $event)
      */
     protected function trigger(string $event): bool
     {
-        if (!$this->getOption('with_event', true)) {
+        if (!$this->getOption('withEvent', true)) {
             return true;
         }
 
         $call  = 'on' . Str::studly($event);
         $obj   = $this->getOption('event');
-        $obser = $this->getOption('event_observer');
+        $obser = $this->getOption('eventObserver');
         try {
             if ($obser) {
                 $reflect  = new ReflectionClass($obser);