Fix object / array transformer

Author: joelwurtz

AutoMapper.php

@@ -25,6 +25,10 @@ public function map($value, string $target, array $options = [])
     {
         $source = null;
 
+        if (null === $value) {
+            return null;
+        }
+
         if (is_object($value)) {
             $source = get_class($value);
         }

Compiler/Transformer/TransformerFactory.php

@@ -51,7 +51,9 @@ public function getTransformer(?array $sourcesTypes, ?array $targetTypes): ?Tran
             $targetType = $this->getTargetType($propertyType, $targetTypes);
 
             if (null !== $targetType) {
-                return new ArrayTransformer($this->getTransformer([$propertyType->getCollectionValueType()], [$targetType->getCollectionKeyType()]));
+                $subItemTransformer = $this->getTransformer([$propertyType->getCollectionValueType()], [$targetType->getCollectionValueType()]);
+
+                return new ArrayTransformer($subItemTransformer);
             }
 
             return null;
@@ -61,7 +63,7 @@ public function getTransformer(?array $sourcesTypes, ?array $targetTypes): ?Tran
             $targetType = $this->getTargetType($propertyType, $targetTypes);
 
             if (null !== $targetType) {
-                return new ObjectTransformer($targetType->getCollectionKeyType());
+                return new ObjectTransformer($targetType);
             }
 
             return null;

Tests/AutoMapperTest.php

@@ -14,22 +14,36 @@
 
 class AutoMapperTest extends TestCase
 {
-    public function testAutoMapping()
+    private $compiler;
+
+    public function setUp()
     {
-        $configuration = new MapperConfiguration(new Compiler(new PropertyInfoExtractor(
+        $this->compiler = new Compiler(new PropertyInfoExtractor(
             [new ReflectionExtractor()],
             [new ReflectionExtractor(), new PhpDocExtractor()],
             [new ReflectionExtractor()],
             [new ReflectionExtractor()]
         ),
             new Accessor(),
             new TransformerFactory()
-        ), User::class, UserDTO::class);
+        );
+    }
+
+    public function testAutoMapping()
+    {
+        $configurationUser = new MapperConfiguration($this->compiler, User::class, UserDTO::class);
+        $configurationAddress = new MapperConfiguration($this->compiler, Address::class, AddressDTO::class);
 
         $automapper = new AutoMapper();
-        $automapper->register($configuration);
+        $automapper->register($configurationUser);
+        $automapper->register($configurationAddress);
 
+        $address = new Address();
+        $address->setCity('Toulon');
         $user = new User(1, 'yolo', '13');
+        $user->address = $address;
+        $user->addresses[] = $address;
+
         /** @var UserDTO $userDto */
         $userDto = $automapper->map($user, UserDTO::class);
 
@@ -38,6 +52,11 @@ public function testAutoMapping()
         self::assertEquals('yolo', $userDto->name);
         self::assertEquals('13', $userDto->age);
         self::assertNull($userDto->email);
+        self::assertCount(1, $userDto->addresses);
+        self::assertInstanceOf(AddressDTO::class, $userDto->address);
+        self::assertInstanceOf(AddressDTO::class, $userDto->addresses[0]);
+        self::assertEquals('Toulon', $userDto->address->city);
+        self::assertEquals('Toulon', $userDto->addresses[0]->city);
     }
 }
 
@@ -52,20 +71,30 @@ class User
      */
     public $name;
     /**
-     * @var string
+     * @var string|int
      */
     public $age;
     /**
      * @var string
      */
     private $email;
 
-    public function __construct($id, $name, $age, $email = 'test')
+    /**
+     * @var Address
+     */
+    public $address;
+
+    /**
+     * @var Address[]
+     */
+    public $addresses = [];
+
+    public function __construct($id, $name, $age)
     {
         $this->id = $id;
         $this->name = $name;
         $this->age = $age;
-        $this->email = $email;
+        $this->email = 'test';
     }
 
     /**
@@ -77,6 +106,30 @@ public function getId()
     }
 }
 
+class Address
+{
+    /**
+     * @var string|null
+     */
+    private $city;
+
+    /**
+     * @return string
+     */
+    public function getCity(): ?string
+    {
+        return $this->city;
+    }
+
+    /**
+     * @param string $city
+     */
+    public function setCity(?string $city): void
+    {
+        $this->city = $city;
+    }
+}
+
 class UserDTO
 {
     /**
@@ -88,11 +141,29 @@ class UserDTO
      */
     public $name;
     /**
-     * @var string
+     * @var string|int
      */
     public $age;
     /**
      * @var string
      */
     public $email;
+
+    /**
+     * @var AddressDTO
+     */
+    public $address;
+
+    /**
+     * @var AddressDTO[]
+     */
+    public $addresses = [];
+}
+
+class AddressDTO
+{
+    /**
+     * @var string|null
+     */
+    public $city;
 }