Use array for context and provide helper class

symfony · joelwurtz · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019
commit ceeeaf18a31ec42c64ebd8ae607a6244b2da37c2
diff --git a/src/Symfony/Component/AutoMapper/AutoMapper.php b/src/Symfony/Component/AutoMapper/AutoMapper.php
@@ -112,7 +112,7 @@ public function hasMapper(string $source, string $target): bool
    /**
     * {@inheritdoc}
     */
-    public function map($sourceData, $targetData, Context $context = null)
+    public function map($sourceData, $targetData, array $context = [])
    {
        $source = null;
        $target = null;
@@ -133,18 +133,14 @@ public function map($sourceData, $targetData, Context $context = null)
            throw new NoMappingFoundException('Cannot map this value, source is neither an object or an array.');
        }

-        if (null === $context) {
-            $context = new Context();
-        }
-
        if (\is_object($targetData)) {
            $target = \get_class($targetData);
-            $context->setObjectToPopulate($targetData);
+            $context[MapperContext::TARGET_TO_POPULATE] = $targetData;
        }

        if (\is_array($targetData)) {
            $target = 'array';
-            $context->setObjectToPopulate($targetData);
+            $context[MapperContext::TARGET_TO_POPULATE] = $targetData;
        }

        if (\is_string($targetData)) {

diff --git a/src/Symfony/Component/AutoMapper/AutoMapperInterface.php b/src/Symfony/Component/AutoMapper/AutoMapperInterface.php
@@ -25,9 +25,9 @@ interface AutoMapperInterface
     *
     * @param array|object        $source  Any data object, which may be an object or an array
     * @param string|array|object $target  To which type of data, or data, the source should be mapped
-     * @param Context             $context Options mappers have access to
+     * @param array               $context Mapper context
     *
     * @return array|object The mapped object
     */
-    public function map($source, $target, Context $context = null);
+    public function map($source, $target, array $context = []);
 }
diff --git a/src/Symfony/Component/AutoMapper/AutoMapperNormalizer.php b/src/Symfony/Component/AutoMapper/AutoMapperNormalizer.php
@@ -64,15 +64,15 @@ public function hasCacheableSupportsMethod(): bool
        return true;
    }

-    private function createAutoMapperContext(array $serializerContext = []): Context
+    private function createAutoMapperContext(array $serializerContext = []): MapperContext
    {
        $circularReferenceLimit = 1;

        if (isset($serializerContext[AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT]) && \is_int($serializerContext[AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT])) {
            $circularReferenceLimit = $serializerContext[AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT];
        }

-        $context = new Context(
+        $context = new MapperContext(
            $serializerContext[AbstractNormalizer::GROUPS] ?? null,
            $serializerContext[AbstractNormalizer::ATTRIBUTES] ?? null,
            $serializerContextContext[AbstractNormalizer::IGNORED_ATTRIBUTES] ?? null

diff --git a/src/Symfony/Component/AutoMapper/Context.php b/src/Symfony/Component/AutoMapper/Context.php
diff --git a/src/Symfony/Component/AutoMapper/GeneratedMapper.php b/src/Symfony/Component/AutoMapper/GeneratedMapper.php
@@ -42,8 +42,6 @@ public function addCallback(string $name, callable $callback): void
        $this->callbacks[$name] = $callback;
    }

-    abstract public function &map($value, Context $context);
-
    /**
     * Inject sub mappers.
     */