Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for closure inside context with enum property #47

Merged
merged 2 commits into from
May 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Serializers/Native.php
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
67 changes: 56 additions & 11 deletions tests/SerializerPhp81Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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
{
Expand All @@ -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;
};
}
}