增加枚举支持

top-think · Sep 5, 2024 · e3d5207 · e3d5207
1 parent d5c987e
commit e3d5207
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/db/BaseBuilder.php b/src/db/BaseBuilder.php
@@ -13,6 +13,7 @@
 
 namespace think\db;
 
+use BackedEnum;
 use Closure;
 use think\db\BaseQuery as Query;
 use think\db\exception\DbException as Exception;
@@ -532,6 +533,8 @@ protected function parseCompare(Query $query, string $key, string $exp, $value,
             $value = $this->parseClosure($query, $value);
         } elseif ($value instanceof Raw) {
             $value = $this->parseRaw($query, $value);
+        } elseif ($value instanceof BackedEnum) {
+            $value = $value->value;
         }
 
         if ('=' == $exp && is_null($value)) {

diff --git a/src/db/Builder.php b/src/db/Builder.php
@@ -13,6 +13,7 @@
 
 namespace think\db;
 
+use BackedEnum;
 use Closure;
 use Stringable;
 use think\db\BaseQuery as Query;
@@ -59,8 +60,9 @@ protected function parseData(Query $query, array $data = [], array $fields = [],
 
         foreach ($data as $key => $val) {
             $item = $this->parseKey($query, $key, true);
-
-            if ($val instanceof Raw) {
+            if ($val instanceof BackedEnum) {
+                $val = $val->value;
+            } elseif ($val instanceof Raw) {
                 $result[$item] = $this->parseRaw($query, $val);
                 continue;
             } elseif (is_null($val) && in_array($key, $fields, true)) {
@@ -265,6 +267,8 @@ protected function parseWhereItem(Query $query, $field, array $val, array $binds
         } elseif ($value instanceof Stringable) {
             // 对象数据写入
             $value = $value->__toString();
+        } elseif ($value instanceof BackedEnum) {
+            $value = $value->value;
         }
 
         if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && !str_contains($exp, 'TIME')) {

diff --git a/src/model/concern/Attribute.php b/src/model/concern/Attribute.php
@@ -13,6 +13,7 @@
 
 namespace think\model\concern;
 
+use BackedEnum;
 use Closure;
 use InvalidArgumentException;
 use Stringable;
@@ -468,7 +469,9 @@ protected function writeTransform($value, string | array $type)
 
         $typeTransform = static function (string $type, $value, $model) {
             if (str_contains($type, '\\') && class_exists($type)) {
-                if (is_subclass_of($type, FieldTypeTransform::class)) {
+                if ($value instanceof BackedEnum) {
+                    $value = $value->value;
+                } elseif (is_subclass_of($type, FieldTypeTransform::class)) {
                     $value = $type::set($value, $model);
                 } elseif ($value instanceof Stringable) {
                     $value = $value->__toString();
@@ -641,7 +644,9 @@ protected function readTransform($value, string | array $type)
 
         $typeTransform = static function (string $type, $value, $model) {
             if (str_contains($type, '\\') && class_exists($type)) {
-                if (is_subclass_of($type, FieldTypeTransform::class)) {
+                if (is_subclass_of($type, BackedEnum::class)) {
+                    $value = $type::from($value);
+                } elseif (is_subclass_of($type, FieldTypeTransform::class)) {
                     $value = $type::get($value, $model);
                 } else {
                     // 对象类型