[Serializer] Fix property name usage for denormalization

antograssiot · antograssiot · commit e4244b2b5769 · 2019-10-18T19:35:38.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -236,7 +236,6 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
      *
      * @param object      $object
      * @param string|null $format
-     * @param array       $context
      *
      * @return string[]
      */
@@ -331,7 +330,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
         $resolvedClass = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
 
         foreach ($normalizedData as $attribute => $value) {
-            if ($this->nameConverter) {
+            if ($this->nameConverter && (false !== $allowedAttributes && !\in_array($attribute, $allowedAttributes))) {
                 $attribute = $this->nameConverter->denormalize($attribute, $resolvedClass, $format, $context);
             }
 
@@ -560,8 +559,6 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str
      *
      * {@inheritdoc}
      *
-     * @param string|null $format
-     *
      * @internal
      */
     protected function createChildContext(array $parentContext, $attribute/*, ?string $format */)
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/OtherSerializedNameDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/OtherSerializedNameDummy.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\SerializedName;
+
+/**
+ * @author Anthony GRASSIOT <antograssiot@free.fr>
+ */
+class OtherSerializedNameDummy
+{
+    /**
+     * @Groups({"a"})
+     */
+    private $buz;
+
+    public function setBuz($buz)
+    {
+        $this->buz = $buz;
+    }
+
+    public function getBuz()
+    {
+        return $this->buz;
+    }
+
+    /**
+     * @Groups({"b"})
+     * @SerializedName("buz")
+     */
+    public function getBuzForExport()
+    {
+        return $this->buz.' Rocks';
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -32,6 +32,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\GroupDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\AttributesTestTrait;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\CallbacksObject;
@@ -481,6 +482,23 @@ public function testGroupsDenormalizeWithNameConverter()
         );
     }
 
+    public function testGroupsDenormalizeWithMetaDataNameConverter()
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
+        $this->normalizer->setSerializer($this->serializer);
+
+        $obj = new OtherSerializedNameDummy();
+        $obj->setBuz('Aldrin');
+
+        $this->assertEquals(
+            $obj,
+            $this->normalizer->denormalize([
+                'buz' => 'Aldrin',
+            ], 'Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy', null, [ObjectNormalizer::GROUPS => ['a']])
+        );
+    }
+
     // ignored attributes
 
     protected function getNormalizerForIgnoredAttributes(): ObjectNormalizer

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`236`	`236`	`*`
`237`	`237`	`* @param object $object`
`238`	`238`	`* @param string\|null $format`
`239`		`- * @param array $context`
`240`	`239`	`*`
`241`	`240`	`* @return string[]`
`242`	`241`	`*/`
`@@ -331,7 +330,7 @@ public function denormalize($data, $type, $format = null, array $context = [])`
`331`	`330`	`$resolvedClass = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);`
`332`	`331`
`333`	`332`	`foreach ($normalizedData as $attribute => $value) {`
`334`		`- if ($this->nameConverter) {`
	`333`	`+ if ($this->nameConverter && (false !== $allowedAttributes && !\in_array($attribute, $allowedAttributes))) {`
`335`	`334`	`$attribute = $this->nameConverter->denormalize($attribute, $resolvedClass, $format, $context);`
`336`	`335`	`}`
`337`	`336`
`@@ -560,8 +559,6 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str`
`560`	`559`	`*`
`561`	`560`	`* {@inheritdoc}`
`562`	`561`	`*`
`563`		`- * @param string\|null $format`
`564`		`- *`
`565`	`562`	`* @internal`
`566`	`563`	`*/`
`567`	`564`	`protected function createChildContext(array $parentContext, $attribute/, ?string $format /)`