fix: source and context not passed to callable transformer

jolicode · Oct 3, 2024 · a8f423f · a8f423f
1 parent 9de87a7
commit a8f423f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,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

diff --git a/src/Transformer/CallableTransformer.php b/src/Transformer/CallableTransformer.php
@@ -24,13 +24,17 @@ public function __construct(
 
     public function transform(Expr $input, Expr $target, PropertyMetadata $propertyMapping, UniqueVariableScope $uniqueVariableScope, Expr\Variable $source): array
     {
+        $args = [
+            new Arg($input),
+            new Arg($source),
+            new Arg(new Expr\Variable('context')),
+        ];
+
         if ($this->callableIsMethodFromSource) {
             $newInput = new Expr\MethodCall(
                 $source,
                 $this->callable,
-                [
-                    new Arg($input),
-                ]
+                $args,
             );
 
             return [$newInput, []];
@@ -40,19 +44,15 @@ public function transform(Expr $input, Expr $target, PropertyMetadata $propertyM
             $newInput = new Expr\MethodCall(
                 new Expr\Variable('result'),
                 $this->callable,
-                [
-                    new Arg($input),
-                ]
+                $args,
             );
 
             return [$newInput, []];
         }
 
         $newInput = new Expr\FuncCall(
             new Scalar\String_($this->callable),
-            [
-                new Arg($input),
-            ]
+            $args,
         );
 
         return [$newInput, []];

diff --git a/tests/Fixtures/MapTo/Bar.php b/tests/Fixtures/MapTo/Bar.php
@@ -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;
     }