symfony
diff --git a/‎src/Symfony/Component/AutoMapper/AutoMapper.php
Lines changed: 3 additions & 7 deletions b/‎src/Symfony/Component/AutoMapper/AutoMapper.php
Lines changed: 3 additions & 7 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/AutoMapperInterface.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/AutoMapper/AutoMapperInterface.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/AutoMapperNormalizer.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/AutoMapper/AutoMapperNormalizer.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/Context.php
Lines changed: 0 additions & 256 deletions b/‎src/Symfony/Component/AutoMapper/Context.php
Lines changed: 0 additions & 256 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/GeneratedMapper.php
Lines changed: 0 additions & 2 deletions b/‎src/Symfony/Component/AutoMapper/GeneratedMapper.php
Lines changed: 0 additions & 2 deletions
@@ -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)) {
 
@@ -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 = []);
 }
@@ -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
 
@@ -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.
      */
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ interface AutoMapperInterface`
`25`	`25`	`*`
`26`	`26`	`* @param array\|object $source Any data object, which may be an object or an array`
`27`	`27`	`* @param string\|array\|object $target To which type of data, or data, the source should be mapped`
`28`		`- * @param Context $context Options mappers have access to`
	`28`	`+ * @param array $context Mapper context`
`29`	`29`	`*`
`30`	`30`	`* @return array\|object The mapped object`
`31`	`31`	`*/`
`32`		`- public function map($source, $target, Context $context = null);`
	`32`	`+ public function map($source, $target, array $context = []);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,15 @@ public function hasCacheableSupportsMethod(): bool`
`64`	`64`	`return true;`
`65`	`65`	`}`
`66`	`66`
`67`		`- private function createAutoMapperContext(array $serializerContext = []): Context`
	`67`	`+ private function createAutoMapperContext(array $serializerContext = []): MapperContext`
`68`	`68`	`{`
`69`	`69`	`$circularReferenceLimit = 1;`
`70`	`70`
`71`	`71`	`if (isset($serializerContext[AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT]) && \is_int($serializerContext[AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT])) {`
`72`	`72`	`$circularReferenceLimit = $serializerContext[AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT];`
`73`	`73`	`}`
`74`	`74`
`75`		`- $context = new Context(`
	`75`	`+ $context = new MapperContext(`
`76`	`76`	`$serializerContext[AbstractNormalizer::GROUPS] ?? null,`
`77`	`77`	`$serializerContext[AbstractNormalizer::ATTRIBUTES] ?? null,`
`78`	`78`	`$serializerContextContext[AbstractNormalizer::IGNORED_ATTRIBUTES] ?? null`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ public function addCallback(string $name, callable $callback): void`
`42`	`42`	`$this->callbacks[$name] = $callback;`
`43`	`43`	`}`
`44`	`44`
`45`		`- abstract public function &map($value, Context $context);`
`46`		`-`
`47`	`45`	`/**`
`48`	`46`	`* Inject sub mappers.`
`49`	`47`	`*/`