改进时间字段处理

top-think · Feb 18, 2021 · 8a2225c · 8a2225c
1 parent 78a4849
commit 8a2225c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -266,9 +266,8 @@ public function getName(): string
      */
     public function newInstance(array $data = [], $where = null): Model
     {
-        $this->readDataType($data);
-
         $model = new static($data);
+        $model->readDataType();
 
         if ($this->connection) {
             $model->setConnection($this->connection);

diff --git a/src/model/concern/Attribute.php b/src/model/concern/Attribute.php
@@ -510,17 +510,15 @@ protected function getValue(string $name, $value, $relation = false)
     /**
      * 读取数据类型处理
      * @access protected
-     * @param  array $data 数据
      * @return void
      */
-    protected function readDataType(array &$data): void
+    protected function readDataType(): void
     {
-        foreach ($data as $name => &$value) {
-            if (isset($this->type[$name])) {
-                // 类型转换
-                $value = $this->readTransform($value, $this->type[$name]);
-            } elseif ($this->autoWriteTimestamp && in_array($name, [$this->createTime, $this->updateTime])) {
-                $value = $this->getTimestampValue($value);
+        foreach ($this->data as $key => $value) {
+            if (isset($this->type[$key])) {
+                $this->data[$key] = $this->readTransform($value, $this->type[$key]);
+            } elseif ($this->autoWriteTimestamp && in_array($key, [$this->createTime, $this->updateTime])) {
+                $this->data[$key] = $this->getTimestampValue($value);
             }
         }
     }