Skip to content
Closed
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
32 changes: 2 additions & 30 deletions src/Metadata/AttributeMetadataFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,21 +278,7 @@ private function inferNormalizerByType(Type $type): Normalizer|null
$normalizers = [];

foreach ($shape as $field => $fieldInfo) {
$valueType = $fieldInfo['type'];

if ($valueType instanceof NullableType) {
$valueType = $valueType->getWrappedType();
}

$normalizer = null;

if ($valueType instanceof ObjectType) {
$normalizer = $this->findNormalizerOnClass($valueType->getClassName());
}

if ($normalizer === null) {
$normalizer = $this->inferNormalizerByType($valueType);
}
$normalizer = $this->inferNormalizerByType($fieldInfo['type']);

if ($normalizer === null) {
continue;
Expand All @@ -309,21 +295,7 @@ private function inferNormalizerByType(Type $type): Normalizer|null
}

if ($type instanceof CollectionType) {
$valueType = $type->getCollectionValueType();

if ($valueType instanceof NullableType) {
$valueType = $type->getWrappedType();
}

$normalizer = null;

if ($valueType instanceof ObjectType) {
$normalizer = $this->findNormalizerOnClass($valueType->getClassName());
}

if ($normalizer === null) {
$normalizer = $this->inferNormalizerByType($valueType);
}
$normalizer = $this->inferNormalizerByType($type->getCollectionValueType());

if ($normalizer) {
return new ArrayNormalizer($normalizer);
Expand Down
3 changes: 2 additions & 1 deletion src/Normalizer/ArrayShapeNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Symfony\Component\TypeInfo\Type\ArrayShapeType;
use Symfony\Component\TypeInfo\Type\NullableType;

use function array_key_exists;
use function is_array;

#[Attribute(Attribute::TARGET_PROPERTY)]
Expand Down Expand Up @@ -105,7 +106,7 @@ public function handleType(Type|null $type): void
$shape = $type->getShape();

foreach ($this->normalizerMap as $field => $normalizer) {
if (!$normalizer instanceof TypeAwareNormalizer) {
if (!$normalizer instanceof TypeAwareNormalizer || !array_key_exists($field, $shape)) {
continue;
}

Expand Down
22 changes: 22 additions & 0 deletions tests/Unit/Fixture/ExplicitArrayShapeNormalizerDto.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

declare(strict_types=1);

namespace Patchlevel\Hydrator\Tests\Unit\Fixture;

use Patchlevel\Hydrator\Normalizer\ArrayShapeNormalizer;
use Patchlevel\Hydrator\Normalizer\EnumNormalizer;
use Patchlevel\Hydrator\Normalizer\ObjectNormalizer;

final class ExplicitArrayShapeNormalizerDto
{
/** @param array{status: Status}|null $shape */
public function __construct(
#[ArrayShapeNormalizer([
'status' => new EnumNormalizer(),
'skill' => new ObjectNormalizer(Skill::class),
])]
public array|null $shape = null,
) {
}
}
24 changes: 24 additions & 0 deletions tests/Unit/Fixture/InferNormalizerWithNullableItemsDto.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace Patchlevel\Hydrator\Tests\Unit\Fixture;

use DateTimeImmutable;

final class InferNormalizerWithNullableItemsDto
{
/**
* @param list<?Skill> $skills
* @param array<string, ?Status> $statuses
* @param list<DateTimeImmutable|null> $dates
* @param array<string, list<?Status>>|null $nested
*/
public function __construct(
public array $skills = [],
public array $statuses = [],
public array $dates = [],
public array|null $nested = null,
) {
}
}
14 changes: 14 additions & 0 deletions tests/Unit/Fixture/InferNormalizerWithNullableShapeItemsDto.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

namespace Patchlevel\Hydrator\Tests\Unit\Fixture;

final class InferNormalizerWithNullableShapeItemsDto
{
/** @param array{skill: ?Skill, status: Status} $shape */
public function __construct(
public array $shape,
) {
}
}
43 changes: 43 additions & 0 deletions tests/Unit/Metadata/AttributeMetadataFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
use Patchlevel\Hydrator\Metadata\ClassNotFound;
use Patchlevel\Hydrator\Metadata\DuplicatedFieldNameInMetadata;
use Patchlevel\Hydrator\Metadata\PropertyMetadataNotFound;
use Patchlevel\Hydrator\Normalizer\ArrayNormalizer;
use Patchlevel\Hydrator\Normalizer\ArrayShapeNormalizer;
use Patchlevel\Hydrator\Normalizer\DateTimeImmutableNormalizer;
use Patchlevel\Hydrator\Normalizer\EnumNormalizer;
use Patchlevel\Hydrator\Normalizer\ObjectNormalizer;
use Patchlevel\Hydrator\Tests\Unit\Fixture\BrokenParentDto;
Expand All @@ -20,9 +23,12 @@
use Patchlevel\Hydrator\Tests\Unit\Fixture\IdNormalizer;
use Patchlevel\Hydrator\Tests\Unit\Fixture\IgnoreDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\IgnoreParentDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\InferNormalizerWithNullableItemsDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\InferNormalizerWithNullableShapeItemsDto;
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\Skill;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Status;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Wrapper;
use PHPUnit\Framework\Attributes\CoversClass;
Expand Down Expand Up @@ -222,6 +228,43 @@ public function __construct(
self::assertEquals(new IdNormalizer(ProfileId::class), $propertyMetadata->normalizer);
}

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

self::assertEquals(
new ArrayNormalizer(new ObjectNormalizer(Skill::class)),
$metadata->propertyForField('skills')->normalizer,
);
self::assertEquals(
new ArrayNormalizer(new EnumNormalizer(Status::class)),
$metadata->propertyForField('statuses')->normalizer,
);
self::assertEquals(
new ArrayNormalizer(new DateTimeImmutableNormalizer()),
$metadata->propertyForField('dates')->normalizer,
);
self::assertEquals(
new ArrayNormalizer(new ArrayNormalizer(new EnumNormalizer(Status::class))),
$metadata->propertyForField('nested')->normalizer,
);
}

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

self::assertEquals(
new ArrayShapeNormalizer([
'skill' => new ObjectNormalizer(Skill::class),
'status' => new EnumNormalizer(Status::class),
]),
$metadata->propertyForField('shape')->normalizer,
);
}

public function testInferNormalizerWithGeneric(): void
{
$metadataFactory = new AttributeMetadataFactory();
Expand Down
27 changes: 27 additions & 0 deletions tests/Unit/Normalizer/ArrayShapeNormalizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@

use Patchlevel\Hydrator\Hydrator;
use Patchlevel\Hydrator\Normalizer\ArrayShapeNormalizer;
use Patchlevel\Hydrator\Normalizer\EnumNormalizer;
use Patchlevel\Hydrator\Normalizer\HydratorAwareNormalizer;
use Patchlevel\Hydrator\Normalizer\InvalidArgument;
use Patchlevel\Hydrator\Normalizer\Normalizer;
use Patchlevel\Hydrator\Normalizer\TypeAwareNormalizer;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Status;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;
use Symfony\Component\TypeInfo\Type;

#[CoversClass(ArrayShapeNormalizer::class)]
final class ArrayShapeNormalizerTest extends TestCase
Expand Down Expand Up @@ -165,6 +169,29 @@ public function testPassHydrator(): void
$normalizer->setHydrator($hydrator);
}

public function testHandleTypePassesFieldTypes(): void
{
$innerNormalizer = new EnumNormalizer();

$normalizer = new ArrayShapeNormalizer(['status' => $innerNormalizer]);
$normalizer->handleType(Type::nullable(Type::arrayShape(['status' => Type::enum(Status::class)])));

self::assertSame(Status::class, $innerNormalizer->className());
}

public function testHandleTypeSkipsFieldsMissingInShape(): void
{
$statusNormalizer = new EnumNormalizer();

$missingNormalizer = $this->createMockForIntersectionOfInterfaces([Normalizer::class, TypeAwareNormalizer::class]);
$missingNormalizer->expects($this->never())->method('handleType');

$normalizer = new ArrayShapeNormalizer(['status' => $statusNormalizer, 'missing' => $missingNormalizer]);
$normalizer->handleType(Type::arrayShape(['status' => Type::enum(Status::class)]));

self::assertSame(Status::class, $statusNormalizer->className());
}

public function testInnerNormalizers(): void
{
$innerNormalizer = $this->createMock(Normalizer::class);
Expand Down
46 changes: 46 additions & 0 deletions tests/Unit/StackHydratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
use Patchlevel\Hydrator\Tests\Unit\Fixture\DefaultDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\DummyMiddleware;
use Patchlevel\Hydrator\Tests\Unit\Fixture\Email;
use Patchlevel\Hydrator\Tests\Unit\Fixture\ExplicitArrayShapeNormalizerDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\InferNormalizerDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\InferNormalizerWithIterablesDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\InferNormalizerWithNullableDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\InferNormalizerWithNullableItemsDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\LazyProfileCreated;
use Patchlevel\Hydrator\Tests\Unit\Fixture\NormalizerInBaseClassDefinedDto;
use Patchlevel\Hydrator\Tests\Unit\Fixture\ParentDto;
Expand Down Expand Up @@ -557,6 +559,50 @@ public function testHydrateWithInferNormalizerWitIterables(): void
self::assertEquals($expected, $event);
}

public function testRoundTripWithInferNormalizerForNullableCollectionItems(): void
{
$object = new InferNormalizerWithNullableItemsDto(
[new Skill('php'), null],
['foo' => Status::Draft, 'bar' => null],
[new DateTimeImmutable('2015-02-13 22:34:32+01:00'), null],
['foo' => [Status::Closed, null]],
);

$data = [
'skills' => [['name' => 'php'], null],
'statuses' => ['foo' => 'draft', 'bar' => null],
'dates' => ['2015-02-13T22:34:32+01:00', null],
'nested' => ['foo' => ['closed', null]],
];

self::assertSame($data, $this->hydrator->extract($object));
self::assertEquals(
$object,
$this->hydrator->hydrate(InferNormalizerWithNullableItemsDto::class, $data),
);
}

public function testRoundTripWithExplicitArrayShapeNormalizerAndFieldMissingInDocblock(): void
{
$object = new ExplicitArrayShapeNormalizerDto([
'status' => Status::Draft,
'skill' => new Skill('php'),
]);

$data = [
'shape' => [
'status' => 'draft',
'skill' => ['name' => 'php'],
],
];

self::assertSame($data, $this->hydrator->extract($object));
self::assertEquals(
$object,
$this->hydrator->hydrate(ExplicitArrayShapeNormalizerDto::class, $data),
);
}

public function testHydrateWithClassNormalizer(): void
{
$object = $this->hydrator->hydrate(
Expand Down
Loading