Replace ClassMetadata::isNormalizeAsArray() + ClassMetadata::shouldNormalizeAsArray() accessor to property

Author: SerafimArts

src/Mapping/Driver/ArrayConfigDriver.php

@@ -108,7 +108,7 @@ protected function load(
             // @phpstan-ignore-next-line : Additional DbC invariant
             assert(\is_bool($classConfig['normalize_as_array']));
 
-            $class->shouldNormalizeAsArray($classConfig['normalize_as_array']);
+            $class->isNormalizeAsArray = $classConfig['normalize_as_array'];
         }
 
         // ---------------------------------------------------------------------

src/Mapping/Driver/AttributeDriver.php

@@ -84,7 +84,7 @@ protected function load(
         $attribute = $this->findClassAttribute($reflection, NormalizeAsArray::class);
 
         if ($attribute !== null) {
-            $class->shouldNormalizeAsArray($attribute->enabled);
+            $class->isNormalizeAsArray = $attribute->enabled;
         }
 
         foreach ($reflection->getProperties() as $property) {

src/Mapping/Metadata/ClassMetadata.php

@@ -25,12 +25,18 @@ final class ClassMetadata extends Metadata
     private array $properties = [];
 
     /**
-     * Contains a {@see bool} flag that is responsible for converting the
-     * object into an associative {@see array} during normalization.
+     * Gets information about the normalization method of an object.
      *
-     * If {@see null}, then the system setting should be used.
+     * - Contains {@see true} if the object should be normalized as
+     *   an associative {@see array}.
+     *
+     * - Contains {@see false} if the object should be normalized as an
+     *   anonymous {@see object}.
+     *
+     * - Contains {@see null} if the system settings for this option
+     *   should be used.
      */
-    private ?bool $isNormalizeAsArray = null;
+    public ?bool $isNormalizeAsArray = null;
 
     /**
      * Contains a {@see DiscriminatorMapMetadata} instance in case of class-like
@@ -93,35 +99,6 @@ public function getTypeStatement(Context $context): TypeStatement
         return new NamedTypeNode($this->name, fields: new FieldsListNode($fields));
     }
 
-    /**
-     * Returns information about the normalization method of an object.
-     *
-     * - Returns {@see true} if the object should be normalized as
-     *   an associative {@see array}.
-     *
-     * - Returns {@see false} if the object should be normalized as an
-     *   anonymous {@see object}.
-     *
-     * - Returns {@see null} if the system settings for this option
-     *   should be used.
-     *
-     * @api
-     */
-    public function isNormalizeAsArray(): ?bool
-    {
-        return $this->isNormalizeAsArray;
-    }
-
-    /**
-     * Forces the object normalization option.
-     *
-     * @api
-     */
-    public function shouldNormalizeAsArray(?bool $enabled = null): void
-    {
-        $this->isNormalizeAsArray = $enabled;
-    }
-
     /**
      * Adds {@see PropertyMetadata} property information to
      * the {@see ClassMetadata} instance.

src/Type/ClassType/ClassTypeNormalizer.php

@@ -62,7 +62,7 @@ public function cast(mixed $value, Context $context): object|array
 
         $result = $this->normalizeObject($value, $entrance);
 
-        if ($this->metadata->isNormalizeAsArray() ?? $context->isObjectsAsArrays()) {
+        if ($this->metadata->isNormalizeAsArray ?? $context->isObjectsAsArrays()) {
             return $result;
         }
 

tests/Mapping/Metadata/ClassMetadataTest.php

@@ -39,13 +39,16 @@ public function testNameGetter(): void
     public function testNormalizeAsArrayFlag(): void
     {
         $m = new ClassMetadata(\stdClass::class);
-        self::assertNull($m->isNormalizeAsArray());
-        $m->shouldNormalizeAsArray(true);
-        self::assertTrue($m->isNormalizeAsArray());
-        $m->shouldNormalizeAsArray(false);
-        self::assertFalse($m->isNormalizeAsArray());
-        $m->shouldNormalizeAsArray(null);
-        self::assertNull($m->isNormalizeAsArray());
+        self::assertNull($m->isNormalizeAsArray);
+
+        $m->isNormalizeAsArray = true;
+        self::assertTrue($m->isNormalizeAsArray);
+
+        $m->isNormalizeAsArray = false;
+        self::assertFalse($m->isNormalizeAsArray);
+
+        $m->isNormalizeAsArray = null;
+        self::assertNull($m->isNormalizeAsArray);
     }
 
     public function testAddAndGetProperties(): void