Merge pull request #316 from jolicode/feat/invokable-transformer

feat(transformer): allow to pass invokable object in transformer

Author: joelwurtz

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [GH#304](https://github.com/jolicode/automapper/pull/304) ; Allow to override source and/or target property type 
 - Add support for static callable in attribute transformer 
 - Initial support for nested properties
+- Add support for object invokable transformer in attribute transformer
 
 ### Changed
 - [BC Break] `PropertyTransformerSupportInterface` does not use a `TypesMatching` anymore, you can get the type directly from `SourcePropertyMetadata` or `TargetPropertyMetadata`.

src/EventListener/MapListener.php

@@ -47,8 +47,10 @@ protected function getTransformerFromMapAttribute(string $class, MapTo|MapFrom $
                 $transformer = new ReferenceTransformer($reference);
             } elseif (\is_string($transformerCallable) && $this->serviceLocator->has($transformerCallable) && ($customTransformer = $this->serviceLocator->get($transformerCallable)) && $customTransformer instanceof PropertyTransformerInterface) {
                 $transformer = new PropertyTransformer($transformerCallable);
-            } elseif (\is_callable($transformerCallable, false, $callableName)) {
+            } elseif (!\is_object($transformerCallable) && \is_callable($transformerCallable, false, $callableName)) {
                 $transformer = new CallableTransformer($callableName);
+            } elseif (\is_object($transformerCallable) && \is_callable($transformerCallable)) {
+                $transformer = new ReferenceTransformer($reference);
             } elseif (\is_string($transformerCallable) && method_exists($class, $transformerCallable)) {
                 $reflMethod = new \ReflectionMethod($class, $transformerCallable);
 

tests/AutoMapperTest.php

@@ -30,6 +30,7 @@
 use AutoMapper\Tests\Fixtures\Dog;
 use AutoMapper\Tests\Fixtures\Fish;
 use AutoMapper\Tests\Fixtures\FooGenerator;
+use AutoMapper\Tests\Fixtures\FooTransformerObjectCallable;
 use AutoMapper\Tests\Fixtures\FooTransformerStaticCallable;
 use AutoMapper\Tests\Fixtures\HasDateTime;
 use AutoMapper\Tests\Fixtures\HasDateTimeImmutable;
@@ -1388,6 +1389,16 @@ public function testStaticCallable(): void
         self::assertSame(['foo' => 'bar'], $array);
     }
 
+    public function testObjectInvokableCallable(): void
+    {
+        $foo = new FooTransformerObjectCallable();
+        $foo->foo = 'foo';
+
+        $array = $this->autoMapper->map($foo, 'array');
+
+        self::assertSame(['foo' => 'test'], $array);
+    }
+
     public static function provideAutoMapperFixturesTests(): iterable
     {
         $directories = (new Finder())

tests/Fixtures/FooTransformerObjectCallable.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AutoMapper\Tests\Fixtures;
+
+use AutoMapper\Attribute\MapTo;
+use AutoMapper\Tests\Fixtures\Transformer\CustomTransformer\InvokableTransformer;
+
+class FooTransformerObjectCallable
+{
+    #[MapTo(target: 'array', transformer: new InvokableTransformer('test'))]
+    public string $foo;
+}

tests/Fixtures/Transformer/CustomTransformer/InvokableTransformer.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AutoMapper\Tests\Fixtures\Transformer\CustomTransformer;
+
+class InvokableTransformer
+{
+    public function __construct(
+        private string $value,
+    ) {
+    }
+
+    public function __invoke(mixed $value, object|array $source, array $context): string
+    {
+        return $this->value;
+    }
+}