Skip to content
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
5 changes: 4 additions & 1 deletion src/Metadata/AttributeMetadataFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,10 @@ private function getNormalizer(ReflectionProperty $reflectionProperty, Type $typ
/** @param ReflectionClass<object> $reflectionClass */
private function getNormalizerOnClass(ReflectionClass $reflectionClass): Normalizer|null
{
$type = Type::object($reflectionClass->getName());
// Build the type like the type resolver does for a property of this class,
// so enums get an enum type and the guesser can offer the EnumNormalizer.
$className = $reflectionClass->getName();
$type = $reflectionClass->isEnum() ? Type::enum($className) : Type::object($className);
$normalizer = $this->inferNormalizerByType($type);

if ($normalizer instanceof ObjectNormalizer) {
Expand Down
12 changes: 12 additions & 0 deletions tests/Unit/Fixture/HasEnumNormalizer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

declare(strict_types=1);

namespace Patchlevel\Hydrator\Tests\Unit\Fixture;

use Patchlevel\Hydrator\Normalizer\EnumNormalizer;

#[EnumNormalizer]
interface HasEnumNormalizer
{
}
11 changes: 11 additions & 0 deletions tests/Unit/Fixture/PureEnum.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

namespace Patchlevel\Hydrator\Tests\Unit\Fixture;

enum PureEnum
{
case Foo;
case Bar;
}
11 changes: 11 additions & 0 deletions tests/Unit/Fixture/StatusWithInterfaceNormalizer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

namespace Patchlevel\Hydrator\Tests\Unit\Fixture;

enum StatusWithInterfaceNormalizer: string implements HasEnumNormalizer
{
case Draft = 'draft';
case Published = 'published';
}
42 changes: 42 additions & 0 deletions tests/Unit/Metadata/AttributeMetadataFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use Patchlevel\Hydrator\Attribute\Lazy;
use Patchlevel\Hydrator\Attribute\NormalizedName;
use Patchlevel\Hydrator\Guesser\Guesser;
use Patchlevel\Hydrator\Metadata\AttributeMetadataFactory;
use Patchlevel\Hydrator\Metadata\ClassNotFound;
use Patchlevel\Hydrator\Metadata\DuplicatedFieldNameInMetadata;
Expand All @@ -23,7 +24,9 @@
use Patchlevel\Hydrator\Tests\Unit\Fixture\ParentDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\ProfileCreatedWithGeneric;
use Patchlevel\Hydrator\Tests\Unit\Fixture\ProfileId;
use Patchlevel\Hydrator\Tests\Unit\Fixture\PureEnum;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Status;
use Patchlevel\Hydrator\Tests\Unit\Fixture\StatusWithNormalizer;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Wrapper;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -391,4 +394,43 @@ public function testClassMetadataWithNormalizer(): void

self::assertInstanceOf(IdNormalizer::class, $metadata->normalizer);
}

public function testClassMetadataOfBackedEnumGetsEnumNormalizer(): void
{
$metadataFactory = new AttributeMetadataFactory();
$metadata = $metadataFactory->metadata(Status::class);

self::assertEquals(new EnumNormalizer(Status::class), $metadata->normalizer);
}

public function testClassMetadataOfBackedEnumWithEnumNormalizerAttribute(): void
{
$metadataFactory = new AttributeMetadataFactory();
$metadata = $metadataFactory->metadata(StatusWithNormalizer::class);

self::assertEquals(new EnumNormalizer(StatusWithNormalizer::class), $metadata->normalizer);
}

public function testClassMetadataOfPureEnumHasNoNormalizer(): void
{
$metadataFactory = new AttributeMetadataFactory();
$metadata = $metadataFactory->metadata(PureEnum::class);

self::assertNull($metadata->normalizer);
}

public function testGuesserGetsEnumTypeForEnumClass(): void
{
$guesser = $this->createMock(Guesser::class);
$guesser
->expects(self::once())
->method('guess')
->with(Type::enum(PureEnum::class))
->willReturn(null);

$metadataFactory = new AttributeMetadataFactory(guesser: $guesser);
$metadata = $metadataFactory->metadata(PureEnum::class);

self::assertNull($metadata->normalizer);
}
}
26 changes: 26 additions & 0 deletions tests/Unit/StackHydratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
use Patchlevel\Hydrator\Tests\Unit\Fixture\ProfileId;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Skill;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Status;
use Patchlevel\Hydrator\Tests\Unit\Fixture\StatusWithInterfaceNormalizer;
use Patchlevel\Hydrator\Tests\Unit\Fixture\StatusWithNormalizer;
use Patchlevel\Hydrator\Tests\Unit\Fixture\ValueObject;
use Patchlevel\Hydrator\Tests\Unit\Fixture\WrongNormalizer;
Expand Down Expand Up @@ -238,6 +239,11 @@ public function testExtractWithClassNormalizer(): void
self::assertEquals('id', $data);
}

public function testExtractBackedEnum(): void
{
self::assertSame('draft', $this->hydrator->extract(Status::Draft));
}

public function testHydrate(): void
{
$expected = new ProfileCreated(
Expand Down Expand Up @@ -567,6 +573,26 @@ public function testHydrateWithClassNormalizer(): void
self::assertEquals(ProfileId::fromString('id'), $object);
}

public function testHydrateBackedEnum(): void
{
self::assertSame(Status::Draft, $this->hydrator->hydrate(Status::class, 'draft'));
}

public function testBackedEnumWithEnumNormalizerOnTheEnum(): void
{
self::assertSame('draft', $this->hydrator->extract(StatusWithNormalizer::Draft));
self::assertSame(StatusWithNormalizer::Draft, $this->hydrator->hydrate(StatusWithNormalizer::class, 'draft'));
}

public function testBackedEnumWithEnumNormalizerFromAnInterface(): void
{
self::assertSame('draft', $this->hydrator->extract(StatusWithInterfaceNormalizer::Draft));
self::assertSame(
StatusWithInterfaceNormalizer::Draft,
$this->hydrator->hydrate(StatusWithInterfaceNormalizer::class, 'draft'),
);
}

#[RequiresPhp('>=8.4')]
public function testLazyHydrate(): void
{
Expand Down
Loading