Merge pull request #47 from ksassnowski/master

Adds support for closure inside context with enum property

Author: taylorotwell

src/Serializers/Native.php

@@ -242,7 +242,7 @@ public static function wrapClosures(&$data, $storage)
             }
 
             unset($value);
-        } elseif (is_object($data) && ! $data instanceof static) {
+        } elseif (is_object($data) && ! $data instanceof static && ! $data instanceof UnitEnum) {
             if (isset($storage[$data])) {
                 $data = $storage[$data];
 

tests/SerializerPhp81Test.php

@@ -3,12 +3,6 @@
 use Tests\Fixtures\Model;
 use Tests\Fixtures\ModelAttribute;
 
-enum SerializerGlobalEnum {
-    case Admin;
-    case Guest;
-    case Moderator;
-}
-
 test('enums', function () {
     $f = function (SerializerGlobalEnum $role) {
         return $role;
@@ -57,11 +51,16 @@ enum SerializerScopedEnum {
     expect($f())->toBe(SerializerScopedEnum::Admin);
 })->with('serializers');
 
-enum SerializerGlobalBackedEnum: string {
-    case Admin = 'Administrator';
-    case Guest = 'Guest';
-    case Moderator = 'Moderator';
-}
+test('enums properties', function () {
+    $object = new ClassWithEnumProperty();
+    $f = $object->getClosure();
+
+    $f = s($f);
+
+    expect($f())
+        ->name->toBe('Admin')
+        ->value->toBeNull();
+})->with('serializers');
 
 test('backed enums', function () {
     $f = function (SerializerGlobalBackedEnum $role) {
@@ -112,6 +111,17 @@ enum SerializerScopedBackedEnum: string {
     expect($f())->toBe(SerializerScopedBackedEnum::Admin);
 })->with('serializers');
 
+test('backed enums properties', function () {
+    $object = new ClassWithBackedEnumProperty();
+    $f = $object->getClosure();
+
+    $f = s($f);
+
+    expect($f())
+        ->name->toBe('Admin')
+        ->value->toBe('Administrator');
+})->with('serializers');
+
 test('array unpacking', function () {
     $f = function () {
         $array1 = ['a' => 1];
@@ -468,6 +478,18 @@ public function getSelf(self $instance): self
     }
 }
 
+enum SerializerGlobalEnum {
+    case Admin;
+    case Guest;
+    case Moderator;
+}
+
+enum SerializerGlobalBackedEnum: string {
+    case Admin = 'Administrator';
+    case Guest = 'Guest';
+    case Moderator = 'Moderator';
+}
+
 #[Attribute(Attribute::TARGET_METHOD|Attribute::TARGET_FUNCTION)]
 class MyAttribute
 {
@@ -477,3 +499,26 @@ public function __construct(public $string, public $model)
     }
 }
 
+class ClassWithEnumProperty
+{
+    public SerializerGlobalEnum $enum = SerializerGlobalEnum::Admin;
+
+    public function getClosure()
+    {
+        return function () {
+            return $this->enum;
+        };
+    }
+}
+
+class ClassWithBackedEnumProperty
+{
+    public SerializerGlobalBackedEnum $enum = SerializerGlobalBackedEnum::Admin;
+
+    public function getClosure()
+    {
+        return function () {
+            return $this->enum;
+        };
+    }
+}