Drop discriminatorMapper as its always string

shipmonk-rnd · Sep 6, 2024 · 601440a · 601440a
1 parent d8710f9
commit 601440a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/src/Compiler/Mapper/Object/MapDiscriminatedObject.php b/src/Compiler/Mapper/Object/MapDiscriminatedObject.php
@@ -33,7 +33,6 @@ class MapDiscriminatedObject implements GenericMapperCompiler
      */
     public function __construct(
         public readonly string $className,
-        public readonly MapString $discriminatorMapper,
         public readonly string $discriminatorFieldName,
         public readonly array $objectMappers,
         public readonly array $genericParameters = [],
@@ -84,7 +83,7 @@ public function compile(Expr $value, Expr $path, PhpCodeBuilder $builder): Compi
         $discriminatorRawValue = $builder->arrayDimFetch($value, $builder->val($this->discriminatorFieldName));
         $discriminatorPath = $builder->arrayImmutableAppend($path, $builder->val($this->discriminatorFieldName));
         $discriminatorMapperMethodName = $builder->uniqMethodName('map' . ucfirst($this->discriminatorFieldName));
-        $discriminatorMapperMethod = $builder->mapperMethod($discriminatorMapperMethodName, $this->discriminatorMapper)->makePrivate()->getNode();
+        $discriminatorMapperMethod = $builder->mapperMethod($discriminatorMapperMethodName, new MapString())->makePrivate()->getNode();
         $discriminatorMapperCall = $builder->methodCall($builder->var('this'), $discriminatorMapperMethodName, [$discriminatorRawValue, $discriminatorPath]);
         $builder->addMethod($discriminatorMapperMethod);
 

diff --git a/src/Compiler/MapperFactory/DefaultMapperCompilerFactory.php b/src/Compiler/MapperFactory/DefaultMapperCompilerFactory.php
@@ -352,7 +352,6 @@ public function createDiscriminatorObjectMapping(
 
         return new MapDiscriminatedObject(
             $inputClassName,
-            new MapString(),
             $discriminatorAttribute->key,
             $objectMappers,
         );

diff --git a/tests/Compiler/Mapper/Object/MapDiscriminatedObjectTest.php b/tests/Compiler/Mapper/Object/MapDiscriminatedObjectTest.php
@@ -135,7 +135,6 @@ private function createParentInputMapperCompiler(): MapperCompiler
     {
         return new MapDiscriminatedObject(
             HierarchicalParentInput::class,
-            new MapString(),
             'type',
             [
                 'childOne' => new MapObject(HierarchicalChildOneInput::class, [
@@ -160,7 +159,6 @@ private function createParentInputWithEnumMapperCompiler(): MapperCompiler
     {
         return new MapDiscriminatedObject(
             HierarchicalWithEnumParentInput::class,
-            new MapString(),
             'type',
             [
                 'childOne' => new MapObject(HierarchicalWithEnumChildInput::class, [

diff --git a/tests/Compiler/MapperFactory/DefaultMapperCompilerFactoryTest.php b/tests/Compiler/MapperFactory/DefaultMapperCompilerFactoryTest.php
@@ -181,7 +181,6 @@ className: CarFilterInput::class,
             [],
             new MapDiscriminatedObject(
                 className: AnimalInput::class,
-                discriminatorMapper: new MapString(),
                 discriminatorFieldName: 'type',
                 objectMappers: [
                     AnimalType::Cat->value => new MapObject(AnimalCatInput::class, [