fix: source and context not passed to callable transformer (#192)

Fixes #191

Author: Korbeil

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [GH#184](https://github.com/jolicode/automapper/pull/184) Fix error when mapping from stdClass to constructor with nullable/optional arguments
 - [GH#185](https://github.com/jolicode/automapper/pull/185) Fix constructor with default parameter array does not work with constructor_arguments context
 - [GH#187](https://github.com/jolicode/automapper/pull/187) Fix regression after [GH#184](https://github.com/jolicode/automapper/pull/184)
+- [GH#192](https://github.com/jolicode/automapper/pull/192) Fix source and context not passed to callable transformer
 
 ## [9.1.2] - 2024-09-03
 ### Fixed

src/Transformer/CallableTransformer.php

@@ -24,37 +24,20 @@ public function __construct(
 
     public function transform(Expr $input, Expr $target, PropertyMetadata $propertyMapping, UniqueVariableScope $uniqueVariableScope, Expr\Variable $source): array
     {
-        if ($this->callableIsMethodFromSource) {
-            $newInput = new Expr\MethodCall(
-                $source,
+        if ($this->callableIsMethodFromSource || $this->callableIsMethodFromTarget) {
+            return [new Expr\MethodCall(
+                $this->callableIsMethodFromSource ? $source : new Expr\Variable('result'),
                 $this->callable,
-                [
-                    new Arg($input),
-                ]
-            );
-
-            return [$newInput, []];
-        }
-
-        if ($this->callableIsMethodFromTarget) {
-            $newInput = new Expr\MethodCall(
-                new Expr\Variable('result'),
-                $this->callable,
-                [
-                    new Arg($input),
-                ]
-            );
-
-            return [$newInput, []];
+                [new Arg($input), new Arg($source), new Arg(new Expr\Variable('context'))],
+            ), []];
         }
 
-        $newInput = new Expr\FuncCall(
+        return [new Expr\FuncCall(
             new Scalar\String_($this->callable),
-            [
-                new Arg($input),
-            ]
-        );
-
-        return [$newInput, []];
+            // Internal functions throws ArgumentCountError when too many arguments are passed
+            \function_exists($this->callable) && (new \ReflectionFunction($this->callable))->isInternal()
+                ? [new Arg($input)]
+                : [new Arg($input), new Arg($source), new Arg(new Expr\Variable('context'))]
+        ), []];
     }
 }

tests/Fixtures/MapTo/Bar.php

@@ -20,7 +20,7 @@ class Bar
     public function __construct(
         public string $bar,
         public string $baz,
-        #[MapFrom(property: 'foo')]
+        #[MapFrom(property: 'foo', transformer: 'htmlspecialchars')]
         public string $from,
     ) {
     }
@@ -36,12 +36,12 @@ public function getB(): string
         return $this->b;
     }
 
-    public function transformC(string $c): string
+    public function transformC(string $c, array $source, array $context): string
     {
         return 'transformC_' . $c;
     }
 
-    public static function transformDStatic(string $c): string
+    public static function transformDStatic(string $c, array $source, array $context): string
     {
         return 'transformDStatic_' . $c;
     }