Replace ClassMetadata discriminators accessor to property

Author: SerafimArts

src/Mapping/Driver/AttributeDriver.php

@@ -165,11 +165,11 @@ class: $reflection,
                 );
             }
 
-            $class->setDiscriminator(new DiscriminatorMapMetadata(
+            $class->discriminator = new DiscriminatorMapMetadata(
                 field: $attribute->field,
                 map: $mapping,
                 default: $default,
-            ));
+            );
         }
     }
 

src/Mapping/Metadata/ClassMetadata.php

@@ -39,10 +39,11 @@ final class ClassMetadata extends Metadata
     public ?bool $isNormalizeAsArray = null;
 
     /**
-     * Contains a {@see DiscriminatorMapMetadata} instance in case of class-like
-     * contains a discriminator map.
+     * Gets {@see DiscriminatorMapMetadata} information about a class
+     * discriminator map, or returns {@see null} if no such metadata has been
+     * registered in the {@see ClassMetadata} instance.
      */
-    private ?DiscriminatorMapMetadata $discriminator;
+    public ?DiscriminatorMapMetadata $discriminator;
 
     /**
      * @param iterable<array-key, PropertyMetadata> $properties
@@ -161,38 +162,4 @@ public function getProperties(): array
     {
         return \array_values($this->properties);
     }
-
-    /**
-     * Returns {@see DiscriminatorMapMetadata} information about a class
-     * discriminator map, or returns {@see null} if no such metadata has been
-     * registered in the {@see ClassMetadata} instance.
-     *
-     * @api
-     */
-    public function findDiscriminator(): ?DiscriminatorMapMetadata
-    {
-        return $this->discriminator;
-    }
-
-    /**
-     * Returns {@see true} if the {@see DiscriminatorMapMetadata} information
-     * was registered in the {@see ClassMetadata}  and {@see false} otherwise.
-     *
-     * @api
-     */
-    public function hasDiscriminator(): bool
-    {
-        return $this->discriminator !== null;
-    }
-
-    /**
-     * Updates {@see DiscriminatorMapMetadata} information about a class
-     * discriminator map.
-     *
-     * @api
-     */
-    public function setDiscriminator(?DiscriminatorMapMetadata $discriminator): void
-    {
-        $this->discriminator = $discriminator;
-    }
 }

src/Type/ClassType/ClassTypeDenormalizer.php

@@ -107,7 +107,7 @@ public function cast(mixed $value, Context $context): mixed
             );
         }
 
-        $discriminator = $this->metadata->findDiscriminator();
+        $discriminator = $this->metadata->discriminator;
 
         if ($discriminator !== null) {
             return $this->castOverDiscriminator($discriminator, $value, $context);

tests/Mapping/Metadata/ClassMetadataTest.php

@@ -25,8 +25,7 @@ public function testConstructorInitializesPropertiesDiscriminatorAndTimestamp():
         self::assertTrue($m->hasProperty('b'));
         self::assertSame($propA, $m->findProperty('a'));
         self::assertSame($propB, $m->findProperty('b'));
-        self::assertTrue($m->hasDiscriminator());
-        self::assertSame($disc, $m->findDiscriminator());
+        self::assertSame($disc, $m->discriminator);
         self::assertSame(777, $m->getTimestamp());
     }
 
@@ -83,17 +82,14 @@ public function testGetPropertyOrCreate(): void
     public function testDiscriminatorManagement(): void
     {
         $m = new ClassMetadata(\stdClass::class);
-        self::assertFalse($m->hasDiscriminator());
-        self::assertNull($m->findDiscriminator());
+        self::assertNull($m->discriminator);
 
         $disc = new DiscriminatorMapMetadata('kind');
-        $m->setDiscriminator($disc);
+        $m->discriminator = $disc;
 
-        self::assertTrue($m->hasDiscriminator());
-        self::assertSame($disc, $m->findDiscriminator());
+        self::assertSame($disc, $m->discriminator);
 
-        $m->setDiscriminator(null);
-        self::assertFalse($m->hasDiscriminator());
-        self::assertNull($m->findDiscriminator());
+        $m->discriminator = null;
+        self::assertNull($m->discriminator);
     }
 }