symfony
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+74Lines changed: 74 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+74Lines changed: 74 additions & 0 deletions
@@ -257,6 +257,10 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
                 if (null !== $collectionKeyType = $type->getCollectionKeyType()) {
                     $context['key_type'] = $collectionKeyType;
                 }
+            } elseif ('xml' === $format && !\is_array($data) && $type->isCollection() && null !== $type->getCollectionValueType()) {
+                $data = [$data];
+                $builtinType = $type->getBuiltinType();
+                $class = $type->getClassName();
             } else {
                 $builtinType = $type->getBuiltinType();
                 $class = $type->getClassName();
 
@@ -143,6 +143,74 @@ private function getDenormalizerForDummyCollection()
         return $denormalizer;
     }
 
+    public function testDenormalizeStringCollectionDecodedFromXmlWithOneChild()
+    {
+        $denormalizer = $this->getDenormalizerForStringCollection();
+
+        // if an xml-node can have children which should be deserialized as string[]
+        // and only one child exists
+        $stringCollection = $denormalizer->denormalize(
+            [
+                'children' => 'foo',
+            ],
+            StringCollection::class,
+            'xml'
+        );
+
+        $this->assertInstanceOf(StringCollection::class, $stringCollection);
+        $this->assertIsArray($stringCollection->children);
+        $this->assertCount(1, $stringCollection->children);
+        $this->assertEquals('foo', $stringCollection->children[0]);
+    }
+
+    public function testDenormalizeStringCollectionDecodedFromXmlWithTwoChildren()
+    {
+        $denormalizer = $this->getDenormalizerForStringCollection();
+
+        // if an xml-node can have children which should be deserialized as string[]
+        // and only one child exists
+        $stringCollection = $denormalizer->denormalize(
+            [
+                'children' => ['foo', 'bar'],
+            ],
+            StringCollection::class,
+            'xml'
+        );
+
+        $this->assertInstanceOf(StringCollection::class, $stringCollection);
+        $this->assertIsArray($stringCollection->children);
+        $this->assertCount(2, $stringCollection->children);
+        $this->assertEquals('foo', $stringCollection->children[0]);
+        $this->assertEquals('bar', $stringCollection->children[1]);
+    }
+
+    private function getDenormalizerForStringCollection()
+    {
+        $extractor = $this->getMockBuilder(PhpDocExtractor::class)->getMock();
+        $extractor->method('getTypes')
+            ->will($this->onConsecutiveCalls(
+                [
+                    new Type(
+                        'array',
+                        false,
+                        null,
+                        true,
+                        new Type('int'),
+                        new Type('string')
+                    ),
+                ],
+                null
+            ));
+
+        $denormalizer = new AbstractObjectNormalizerCollectionDummy(null, null, $extractor);
+        $arrayDenormalizer = new ArrayDenormalizerDummy();
+        $serializer = new SerializerCollectionDummy([$arrayDenormalizer, $denormalizer]);
+        $arrayDenormalizer->setSerializer($serializer);
+        $denormalizer->setSerializer($serializer);
+
+        return $denormalizer;
+    }
+
     /**
      * Test that additional attributes throw an exception if no metadata factory is specified.
      */
@@ -212,6 +280,12 @@ protected function setAttributeValue($object, $attribute, $value, $format = null
     }
 }
 
+class StringCollection
+{
+    /** @var string[] */
+    public $children;
+}
+
 class DummyCollection
 {
     /** @var DummyChild[] */