Refactor more test to use the new system

Author: lyrixx

tests/AutoMapperTest.php

@@ -46,7 +46,6 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
@@ -1217,50 +1216,6 @@ public function testRealClassName(): void
         self::assertEquals('Mapper_AutoMapper_Tests_Fixtures_Proxy_array', $mapper::class);
     }
 
-    public function testDiscriminatorMapAndInterface3(): void
-    {
-        if (!class_exists(ClassDiscriminatorFromClassMetadata::class)) {
-            self::markTestSkipped('Symfony Serializer is required to run this test.');
-        }
-
-        $autoMapper = AutoMapperBuilder::buildAutoMapper(mapPrivatePropertiesAndMethod: true);
-
-        $typeA = new Fixtures\DiscriminatorMapAndInterface\TypeA('my name');
-        $something = new Fixtures\DiscriminatorMapAndInterface\Something($typeA);
-
-        $mapped = $autoMapper->map($something, 'array');
-
-        $expected = [
-            'myInterface' => [
-                'name' => 'my name',
-                'type' => 'type_a',
-            ],
-        ];
-        self::assertSame($expected, $mapped);
-    }
-
-    public function testDiscriminatorMapAndInterface2(): void
-    {
-        if (!class_exists(ClassDiscriminatorFromClassMetadata::class)) {
-            self::markTestSkipped('Symfony Serializer is required to run this test.');
-        }
-
-        $autoMapper = AutoMapperBuilder::buildAutoMapper(mapPrivatePropertiesAndMethod: true);
-
-        $something = [
-            'myInterface' => [
-                'type' => 'type_a',
-                'name' => 'my name',
-            ],
-        ];
-
-        $mapped = $autoMapper->map($something, Fixtures\DiscriminatorMapAndInterface\Something::class);
-
-        self::assertInstanceOf(Fixtures\DiscriminatorMapAndInterface\Something::class, $mapped);
-        self::assertInstanceOf(Fixtures\DiscriminatorMapAndInterface\TypeA::class, $mapped->myInterface);
-        self::assertSame('my name', $mapped->myInterface->name);
-    }
-
     public function testDiscriminantToArray(): void
     {
         $this->autoMapper = AutoMapperBuilder::buildAutoMapper(mapPrivatePropertiesAndMethod: true);

tests/AutoMapperTest/ConstructorWithSerializedName/expected.from_array.data

@@ -1,4 +1,3 @@
 AutoMapper\Tests\AutoMapperTest\ConstructorWithSerializedName\Bar {
   +isStatic: true
-}
-
+}

tests/AutoMapperTest/ConstructorWithSerializedName/expected.to_array.data

@@ -1,3 +1,3 @@
 [
   "is_static" => true
-]
+]

tests/AutoMapperTest/DiscriminatorMapAndInterface/expected.to-array.data

@@ -0,0 +1,6 @@
+[
+  "myInterface" => [
+    "name" => "my name"
+    "type" => "type_a"
+  ]
+]

tests/AutoMapperTest/DiscriminatorMapAndInterface/expected.to-class.data

@@ -0,0 +1,5 @@
+AutoMapper\Tests\AutoMapperTest\DiscriminatorMapAndInterface\Something {
+  +myInterface: AutoMapper\Tests\AutoMapperTest\DiscriminatorMapAndInterface\TypeA {
+    +name: "my name"
+  }
+}

tests/AutoMapperTest/DiscriminatorMapAndInterface/map.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AutoMapper\Tests\AutoMapperTest\DiscriminatorMapAndInterface;
+
+use AutoMapper\Tests\AutoMapperBuilder;
+use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
+
+#[DiscriminatorMap(typeProperty: 'type', mapping: [
+    'type_a' => TypeA::class,
+    'type_b' => TypeB::class,
+]
+)]
+interface MyInterface
+{
+}
+
+class Something
+{
+    public function __construct(
+        public MyInterface $myInterface,
+    ) {
+    }
+}
+
+class TypeA implements MyInterface
+{
+    public function __construct(
+        public string $name,
+    ) {
+    }
+}
+
+class TypeB implements MyInterface
+{
+    public function __construct(
+        public string $age,
+    ) {
+    }
+}
+
+return (function () {
+    $autoMapper = AutoMapperBuilder::buildAutoMapper(mapPrivatePropertiesAndMethod: true);
+
+    $something = [
+        'myInterface' => [
+            'type' => 'type_a',
+            'name' => 'my name',
+        ],
+    ];
+    yield 'to-class' => $autoMapper->map($something, Something::class);
+
+    $typeA = new TypeA('my name');
+    $something = new Something($typeA);
+
+    yield 'to-array' => $autoMapper->map($something, 'array');
+})();