support enum toArray

Author: liutao

src/Data.php

@@ -76,7 +76,7 @@ public function fill(array $data): static
                 $property->setValue($this, $value);
             } elseif (PHP_VERSION_ID > 80100 && enum_exists($type->getName())) {
                 if (is_int($value) || is_string($value)) {
-                    $value = $type->getName()::from($value);
+                    $value = $type->getName()::{'from'}($value);
                 }
                 $property->setValue($this, $value);
             } elseif (class_exists($type->getName())) {
@@ -135,6 +135,9 @@ protected function forValue(mixed $value, bool $toSnake)
             return array_map(fn($item) => $this->forValue($item, $toSnake), $value);
         }
         if (is_object($value)) {
+            if (PHP_VERSION_ID > 80100 && enum_exists(get_class($value))) {
+                return $value->value;
+            }
             if ($this->isArrayAble($value)) {
                 return $value->toArray();
             }
@@ -175,7 +178,22 @@ protected function isArrayAble($data): bool
         return $data instanceof ArrayAble || is_object($data) && method_exists($data, 'toArray');
     }
 
-    protected function beforeFill(array $data): void {}
+    protected function beforeFill(array $data): void
+    {
+    }
+
+    protected function afterFill(array $data)
+    {
+    }
 
-    protected function afterFill(array $data) {}
+    public function __serialize(): array
+    {
+        $data = [];
+        foreach ($this->getStaticReflection()->getProperties() as $property) {
+            if (!$this->isInsideProperty($property)) {
+                $data[$property->getName()] = $property->getValue($this);
+            }
+        }
+        return $data;
+    }
 }

tests/Feature/DataTest.php

@@ -25,6 +25,7 @@
         ->and($b->addressDetail)->toBe($a->addressDetail);
 
     $c = C::from(['name' => '123', 'a' => enumA::A]);
+    $c->toArray();
     $c1 = unserialize(serialize($c));
     expect($c1)->toBeInstanceOf(C::class);
 });
@@ -47,7 +48,8 @@
 
 test('enum', function () {
     $c = C::from(['name' => '123', 'a' => 'a']);
-    expect($c->a)->toBe(enumA::A);
+    expect($c->a)->toBe(enumA::A)
+        ->and($c->toArray())->toBe(['name' => '123', 'a' => 'a']);
     $c = serialize($c);
     $c = unserialize($c);
     expect($c->a)->toBe(enumA::A);