support enum

Author: liutao

src/Data.php

@@ -39,18 +39,6 @@ public function __debugInfo(): ?array
         return $this->objectToArray($this, false);
     }
 
-    public function __serialize(): array
-    {
-        return $this->toArray();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function __unserialize(array $data)
-    {
-        $this->fill($data);
-    }
 
     public static function from(array|Arrayable $data): static
     {
@@ -82,14 +70,17 @@ public function fill(array $data): static
             $value = $data[$camelCasePropertyName] ?? ($data[$snakePropertyName] ?? null);
             if ($type->isBuiltin() && !is_null($value)) {
                 $property->setValue($this, $value);
-            }
-            if (class_exists($type->getName())) {
+            } elseif (PHP_VERSION_ID > 80100 && enum_exists($type->getName())) {
+                $property->setValue($this, $value);
+            } elseif (class_exists($type->getName())) {
                 if (is_array($value)) {
                     $instance = new ($type->getName());
                     if ($instance instanceof Data) {
                         $instance->fill($value);
                     }
                     $property->setValue($this, $instance);
+                } else {
+                    $property->setValue($this, $value);
                 }
             }
         }
@@ -121,7 +112,11 @@ protected function propertyToArray(object $object, bool $toSnake, ReflectionProp
                 continue;
             }
             $name = $toSnake ? Str::snake($property->getName()) : $property->getName();
-            $result[$name] = $this->forValue($property->getValue($object), $toSnake);
+            if ($property->isInitialized($object)) {
+                $result[$name] = $this->forValue($property->getValue($object), $toSnake);
+            } else {
+                $result[$name] = null;
+            }
         }
         return $result;
     }
@@ -156,7 +151,10 @@ protected function getReflectionClass(object|string $object): ReflectionClass
 
     protected function getStaticReflection(): ReflectionClass
     {
-        return $this->_staticReflection ?? $this->getReflectionClass($this);
+        if ($this->_staticReflection) {
+            return $this->_staticReflection;
+        }
+        return $this->_staticReflection = $this->getReflectionClass($this);
     }
 
     protected function isInsideProperty(ReflectionProperty $property): bool

src/Traits/ArrayAccessTrait.php

@@ -2,13 +2,16 @@
 
 namespace Ltaooo\Data\Traits;
 
+use ReturnTypeWillChange;
+
 trait ArrayAccessTrait
 {
     public function offsetExists($offset): bool
     {
         return isset($this->{$offset});
     }
 
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->{$offset};

tests/Feature/DataTest.php

@@ -16,14 +16,19 @@
 });
 
 test('serialize', function () {
-
     $value = ['name' => '123', 'phones' => [1, 2], 'b' => ['name' => 'hello'], 'address_detail' => 'haa'];
     $a = A::from($value);
     /** @var A $b */
     $b = unserialize(serialize($a));
     expect($b)->toBeInstanceOf(A::class)
         ->and($b->name)->toBe($a->name)
         ->and($b->addressDetail)->toBe($a->addressDetail);
+
+    $c = C::from(['name' => '123', 'a' => enumA::A]);
+    var_dump(serialize($c));
+    $c1 = unserialize(serialize($c));
+    var_dump($c1);
+    expect($c1)->toBeInstanceOf(C::class);
 });
 
 test('str', function () {
@@ -48,4 +53,17 @@ class A extends Data
 class B extends Data
 {
     public string $name;
+
+}
+
+class C extends Data
+{
+    public string $name;
+
+    public EnumA $a;
+}
+
+enum enumA: string
+{
+    case A = 'a';
 }