add tests for mapped union discriminators

tests/Fixtures/MappedDiscriminatedAuthor.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures;
+
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\Type;
+
+class DiscriminatedAuthor
+{
+    /**
+     * @Type("string")
+     * @SerializedName("full_name")
+     */
+    #[Type(name: 'string')]
+    #[SerializedName(name: 'full_name')]
+    private $name;
+
+    /**
+     * @Type("string")
+     */
+    #[Type(name: 'string')]
+    private $objectType = 'author';
+
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getObjectType()
+    {
+        return $this->objectType;
+    }
+}

tests/Fixtures/MappedDiscriminatedComment.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures;
+
+use JMS\Serializer\Annotation\Type;
+
+class MappedDiscriminatedComment
+{
+    /**
+     * @Type("JMS\Serializer\Tests\Fixtures\Author")
+     */
+    #[Type(name: 'JMS\Serializer\Tests\Fixtures\Author')]
+    private $author;
+
+    /**
+     * @Type("string")
+     */
+    #[Type(name: 'string')]
+    private $text;
+
+    /**
+     * @Type("string")
+     */
+    #[Type(name: 'string')]
+    private $objectType = 'comment';
+
+
+    public function __construct(?Author $author, $text)
+    {
+        $this->author = $author;
+        $this->text = $text;
+    }
+
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    public function getObjectType()
+    {
+        return $this->objectType;
+    }
+}

tests/Fixtures/TypedProperties/MappedComplexDiscriminatedUnion.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures\TypedProperties;
+
+use JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor;
+use JMS\Serializer\Tests\Fixtures\DiscriminatedComment;
+use JMS\Serializer\Annotation\UnionDiscriminator;
+
+class ComplexDiscriminatedUnion
+{
+    #[UnionDiscriminator(field: 'objectType', map: ['author' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor', 'comment' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedComment'])]
+    private DiscriminatedAuthor|DiscriminatedComment $data;
+
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    public function getData(): Author|Comment
+    {
+        return $this->data;
+    }
+}
+

tests/Serializer/JsonSerializationTest.php

@@ -23,9 +23,12 @@
 use JMS\Serializer\Tests\Fixtures\Tag;
 use JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor;
 use JMS\Serializer\Tests\Fixtures\DiscriminatedComment;
+use JMS\Serializer\Tests\Fixtures\MappedDiscriminatedAuthor;
+use JMS\Serializer\Tests\Fixtures\MappedDiscriminatedComment;
 use JMS\Serializer\Tests\Fixtures\TypedProperties\UnionTypedProperties;
 use JMS\Serializer\Tests\Fixtures\TypedProperties\ComplexUnionTypedProperties;
 use JMS\Serializer\Tests\Fixtures\TypedProperties\ComplexDiscriminatedUnion;
+use JMS\Serializer\Tests\Fixtures\TypedProperties\MappedComplexDiscriminatedUnion;
 use JMS\Serializer\Visitor\Factory\JsonSerializationVisitorFactory;
 use JMS\Serializer\Visitor\SerializationVisitorInterface;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -158,6 +161,8 @@ protected static function getContent($key)
             $outputs['data_comment'] = '{"data":{"author":{"full_name":"foo"},"text":"bar"}}';
             $outputs['data_discriminated_author'] = '{"data":{"full_name":"foo","type":"JMS\\\Serializer\\\Tests\\\Fixtures\\\DiscriminatedAuthor"}}';
             $outputs['data_discriminated_comment'] = '{"data":{"author":{"full_name":"foo"},"text":"bar","type":"JMS\\\Serializer\\\Tests\\\Fixtures\\\DiscriminatedComment"}}';
+            $outputs['data_mapped_discriminated_author'] = '{"data":{"full_name":"foo","type":"author"}}';
+            $outputs['data_mapped_discriminated_comment'] = '{"data":{"author":{"full_name":"foo"},"text":"bar","type":"comment"}}';
             $outputs['uid'] = '"66b3177c-e03b-4a22-9dee-ddd7d37a04d5"';
             $outputs['object_with_enums'] = '{"ordinary":"Clubs","backed_value":"C","backed_without_param":"C","ordinary_array":["Clubs","Spades"],"backed_array":["C","H"],"backed_array_without_param":["C","H"],"ordinary_auto_detect":"Clubs","backed_auto_detect":"C","backed_int_auto_detect":3,"backed_int":3,"backed_name":"C","backed_int_forced_str":3}';
             $outputs['object_with_autodetect_enums'] = '{"ordinary_array_auto_detect":["Clubs","Spades"],"backed_array_auto_detect":["C","H"],"mixed_array_auto_detect":["Clubs","H"]}';
@@ -529,6 +534,22 @@ public function testDeserializingComplexDiscriminatedUnionProperties()
         self::assertEquals($commentUnion, $this->deserialize(static::getContent('data_discriminated_comment'), ComplexDiscriminatedUnion::class));
     }
 
+    public function testDeserializingMappedComplexDiscriminatedUnionProperties()
+    {
+        if (PHP_VERSION_ID < 80000) {
+            $this->markTestSkipped(sprintf('%s requires PHP 8.0', TypedPropertiesDriver::class));
+
+            return;
+        }
+
+        $authorUnion = new MappedComplexDiscriminatedUnion(new MappedDiscriminatedAuthor('foo'));
+        self::assertEquals($authorUnion, $this->deserialize(static::getContent('data_mapped_discriminated_author'), MappedComplexDiscriminatedUnion::class));
+
+        $commentUnion = new MappedComplexDiscriminatedUnion(new MappedDiscriminatedComment(new Author('foo'), 'bar'));
+
+        self::assertEquals($commentUnion, $this->deserialize(static::getContent('data_mapped_discriminated_comment'), MappedComplexDiscriminatedUnion::class));
+    }
+
     public function testSerializeingComplexDiscriminatedUnionProperties()
     {
         if (PHP_VERSION_ID < 80000) {