Added support for XML

symfony · Nyholm · Jul 15, 2016 · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016
commit 0e96e86491e6ecdd2d9cf519ada2bad03a1351f0
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
@@ -63,9 +63,47 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
                    $attributeMetadata->addGroup((string) $group);
                }

+                foreach ($attribute->methods as $methods) {
+                    if (isset($methods['accessor'])) {
+                        $attributeMetadata->setMethodsAccessor((string) $methods['accessor']);
+                    }
+
+                    if (isset($methods['mutator'])) {
+                        $attributeMetadata->setMethodsMutator((string) $methods['mutator']);
+                    }
+                }
+
+                if (isset($attribute['exclude'])) {
+                    $attributeMetadata->setExclude((bool) $attribute['exclude']);
+                }
+
+                if (isset($attribute['expose'])) {
+                    $attributeMetadata->setExpose((bool) $attribute['expose']);
+                }
+
                if (isset($attribute['max-depth'])) {
                    $attributeMetadata->setMaxDepth((int) $attribute['max-depth']);
                }
+
+                if (isset($attribute['read-only'])) {
+                    $attributeMetadata->setReadOnly((bool) $attribute['read-only']);
+                }
+
+                if (isset($attribute['serialized-name'])) {
+                    $attributeMetadata->setSerializedName((string) $attribute['serialized-name']);
+                }
+
+                if (isset($attribute['type'])) {
+                    $attributeMetadata->setType((string) $attribute['type']);
+                }
+            }
+
+            if (isset($xml['exclusion-policy'])) {
+                $classMetadata->setExclusionPolicy((string) $xml['exclusion-policy']);
+            }
+
+            if (isset($xml['read-only'])) {
+                $classMetadata->setReadOnly((bool) $xml['read-only']);
            }

            if (isset($xml->{'discriminator-map'})) {

diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -156,6 +156,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)

            $classMetadata->setExclusionPolicy($yaml['exclusion_policy']);
        }
+
        if (isset($yaml['read_only'])) {
            if (!\is_bool($yaml['read_only'])) {
                throw new MappingException(sprintf('The "read_only" value must be a boolean in "%s" for the class "%s".', $this->file, $classMetadata->getName()));

diff --git a/src/Symfony/Component/Serializer/Normalizer/MetadataAwareNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MetadataAwareNormalizer.php
@@ -32,15 +32,15 @@ final class MetadataAwareNormalizer extends AbstractObjectNormalizer
     */
    protected $propertyAccessor;

-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, PropertyAccessorInterface $propertyAccessor = null) {
+    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, PropertyAccessorInterface $propertyAccessor = null)
+    {
        if (null === $propertyAccessor) {
            $propertyAccessor = PropertyAccess::createPropertyAccessor();
        }
        $this->propertyAccessor = $propertyAccessor;
        parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver);
    }

-
    /**
     * {@inheritdoc}
     */
@@ -173,7 +173,6 @@ protected function updateData(array $data, string  $attribute, $attributeValue/*
        }
        $object = func_get_arg(3);

-
        /** @var ClassMetadataInterface $classMetadata */
        $classMetadata = $this->classMetadataFactory->getMetadataFor($object);
        $attributeMetadata = $classMetadata->getAttributesMetadata();
@@ -198,10 +197,11 @@ protected function prepareForDenormalization($data/*, string $class*/)
    {
        if (1 === \func_num_args()) {
            @trigger_error('Second argument to MetadataAwareNormalizer must be the class name', E_USER_DEPRECATED);
+
            return (array) $data;
        }

-        $class =  func_get_arg(1);
+        $class = func_get_arg(1);
        $preparedData = array();
        $data = (array) $data;
        /** @var ClassMetadataInterface $classMetadata */