Serialize associative arrays as objects instead of arrays

Author: jmldr

src/ConcreteType.php

@@ -14,6 +14,8 @@
  */
 final class ConcreteType
 {
+    public bool $associative = false;
+
     public function __construct(public string $name, public bool $isBuiltIn)
     {
     }

src/DefinitionProvider.php

@@ -26,6 +26,7 @@ final class DefinitionProvider
     private PropertyTypeResolver $propertyTypeResolver;
     private bool $serializePublicMethods;
     private ConstructorResolver $constructorResolver;
+    private bool $serializeMapsAsObjects;
 
     public function __construct(
         ?DefaultCasterRepository     $defaultCasterRepository = null,
@@ -34,6 +35,7 @@ public function __construct(
         ?PropertyTypeResolver        $propertyTypeResolver = null,
         bool                         $serializePublicMethods = true,
         ?ConstructorResolver         $constructorResolver = null,
+        bool                         $serializeMapsAsObjects = false,
     )
     {
         $this->defaultCasters = $defaultCasterRepository ?? DefaultCasterRepository::builtIn();
@@ -42,6 +44,7 @@ public function __construct(
         $this->propertyTypeResolver = $propertyTypeResolver ?? new NaivePropertyTypeResolver();
         $this->serializePublicMethods = $serializePublicMethods;
         $this->constructorResolver = $constructorResolver ?? new AttributeConstructorResolver();
+        $this->serializeMapsAsObjects = $serializeMapsAsObjects;
     }
 
     /**
@@ -146,6 +149,7 @@ private function stringifyConstructor(ReflectionMethod $constructor): string
     public function provideSerializationDefinition(string $className): ClassSerializationDefinition
     {
         $reflection = new ReflectionClass($className);
+        $constructor = $this->constructorResolver->resolveConstructor($reflection);
         $objectSettings = $this->resolveObjectSettings($reflection);
         $classAttributes = $reflection->getAttributes();
         $properties = [];
@@ -173,7 +177,7 @@ public function provideSerializationDefinition(string $className): ClassSerializ
                 PropertySerializationDefinition::TYPE_METHOD,
                 $methodName,
                 $this->resolveSerializers($returnType, $attributes),
-                PropertyType::fromReflectionType($returnType),
+                $this->propertyTypeResolver->typeFromMethod($method),
                 $returnType->allowsNull(),
                 $this->resolveKeys($key, $attributes),
                 $typeSpecifier?->key,
@@ -204,7 +208,7 @@ public function provideSerializationDefinition(string $className): ClassSerializ
                 PropertySerializationDefinition::TYPE_PROPERTY,
                 $property->getName(),
                 $serializers,
-                PropertyType::fromReflectionType($propertyType),
+                $this->propertyTypeResolver->typeFromProperty($property, $constructor),
                 $propertyType->allowsNull(),
                 $this->resolveKeys($key, $attributes),
                 $typeSpecifier?->key,
@@ -307,6 +311,11 @@ public function hasSerializerFor(string $name): bool
         return $this->defaultSerializers->serializerForType($name) !== null;
     }
 
+    public function areMapsSerializedAsObjects(): bool
+    {
+        return $this->serializeMapsAsObjects;
+    }
+
     /**
      * @param ReflectionAttribute[] $attributes
      *

src/Fixtures/ClassThatHasMultipleCastersOnMapProperty.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace EventSauce\ObjectHydrator\Fixtures;
+
+use EventSauce\ObjectHydrator\PropertyCasters\CastToArrayWithKey;
+use EventSauce\ObjectHydrator\PropertyCasters\CastToType;
+
+final class ClassThatHasMultipleCastersOnMapProperty
+{
+    /**
+     * @param array<string, array<string, string>> $map
+     */
+    public function __construct(
+        #[CastToType('array')]
+        #[CastToArrayWithKey('second_level')]
+        #[CastToArrayWithKey('first_level')]
+        public array $map,
+    ) {
+    }
+}

src/Fixtures/ClassThatSpecifiesArrayWithIntegerKeys.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace EventSauce\ObjectHydrator\Fixtures;
+
+final class ClassThatSpecifiesArrayWithIntegerKeys
+{
+    /**
+     * @param array<int, string> $arrayWithIntegerKeys
+     */
+    public function __construct(
+        public array $arrayWithIntegerKeys,
+    ) {
+    }
+}

src/Fixtures/ClassThatSpecifiesArraysWithDocComments.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace EventSauce\ObjectHydrator\Fixtures;
+
+use EventSauce\ObjectHydrator\Fixtures\ClassWithCamelCaseProperty as CamelClass;
+
+final class ClassThatSpecifiesArraysWithDocComments
+{
+    /**
+     * @param array<string, CamelClass> $mapWithObjects
+     * @param array<string, int> $mapWithScalars
+     * @param array<string, array<string, string>> $mapWithAssociativeArrays
+     * @param array<int, string> $listWithTypeHint
+     */
+    public function __construct(
+        public array $mapWithObjects,
+        public array $mapWithScalars,
+        public array $mapWithAssociativeArrays,
+        public array $listWithoutTypeHint,
+        public array $listWithTypeHint,
+    ) {
+    }
+
+    /**
+     * @return array<string, CamelClass>
+     */
+    public function methodMapWithObjects(): array
+    {
+        return $this->mapWithObjects;
+    }
+
+    /**
+     * @return array<string, int>
+     */
+    public function methodMapWithScalars(): array
+    {
+        return $this->mapWithScalars;
+    }
+
+    /**
+     * @return array<string, array<string, string>>
+     */
+    public function methodMapWithAssociativeArrays(): array
+    {
+        return $this->mapWithAssociativeArrays;
+    }
+
+    public function methodListWithoutTypeHint(): array
+    {
+        return $this->listWithoutTypeHint;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function methodListWithTypeHint(): array
+    {
+        return $this->listWithTypeHint;
+    }
+}

src/FixturesFor81/ClassWithEnumArrayProperty.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EventSauce\ObjectHydrator\FixturesFor81;
 
 final class ClassWithEnumArrayProperty