Merge branch '3.1'

* 3.1:
  fixed CS
  fixed CS
  fixed CS
  fixed CS
  tweaked default CS fixer config
  [HttpKernel] Dont close the output stream in debug
  move HttpKernel component to require section
  Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
  [Session] fix PDO transaction aborted under PostgreSQL
  [Console] Use InputInterface inherited doc as possible
  Mention generating absolute urls in UPGRADE files and CHANGELOG
  parse embedded mappings only if value is a string
  add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
  FormBuilderInterface: fix getForm() return type.
  [YAML] Fixed parsing problem with nested DateTime lists
  Fixed typo in PHPDoc

Author: fabpot

Normalizer/AbstractObjectNormalizer.php

@@ -238,7 +238,7 @@ protected function isAttributeToNormalize($object, $attributeName, &$context)
      */
     private function validateAndDenormalize($currentClass, $attribute, $data, $format, array $context)
     {
-        if (null === $this->propertyTypeExtractor || null === $types = $this->propertyTypeExtractor->getTypes($currentClass, $attribute)){
+        if (null === $this->propertyTypeExtractor || null === $types = $this->propertyTypeExtractor->getTypes($currentClass, $attribute)) {
             return $data;
         }
 

Tests/Encoder/XmlEncoderTest.php

@@ -249,7 +249,8 @@ public function testEncodeSerializerXmlRootNodeNameOption()
         $this->assertEquals($expected, $serializer->serialize($array, 'xml', $options));
     }
 
-    public function testEncodeTraversableWhenNormalizable() {
+    public function testEncodeTraversableWhenNormalizable()
+    {
         $this->encoder = new XmlEncoder();
         $serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
         $this->encoder->setSerializer($serializer);
@@ -261,7 +262,6 @@ public function testEncodeTraversableWhenNormalizable() {
 XML;
 
         $this->assertEquals($expected, $serializer->serialize(new NormalizableTraversableDummy(), 'xml'));
-
     }
 
     public function testDecode()

Tests/Normalizer/JsonSerializableNormalizerTest.php

@@ -49,7 +49,7 @@ public function testNormalize()
         $this->serializer
             ->expects($this->once())
             ->method('normalize')
-            ->will($this->returnCallback(function($data) {
+            ->will($this->returnCallback(function ($data) {
                 $this->assertArraySubset(array('foo' => 'a', 'bar' => 'b', 'baz' => 'c'), $data);
 
                 return 'string_object';
@@ -69,7 +69,7 @@ public function testCircularNormalize()
         $this->serializer
             ->expects($this->once())
             ->method('normalize')
-            ->will($this->returnCallback(function($data, $format, $context) {
+            ->will($this->returnCallback(function ($data, $format, $context) {
                 $this->normalizer->normalize($data['qux'], $format, $context);
 
                 return 'string_object';

Tests/SerializerTest.php

@@ -324,7 +324,7 @@ public function testNormalizerAware()
             ->method('setNormalizer')
             ->with($this->isInstanceOf(NormalizerInterface::class));
 
-        new Serializer([$normalizerAware]);
+        new Serializer(array($normalizerAware));
     }
 
     public function testDenormalizerAware()
@@ -334,7 +334,7 @@ public function testDenormalizerAware()
             ->method('setDenormalizer')
             ->with($this->isInstanceOf(DenormalizerInterface::class));
 
-        new Serializer([$denormalizerAware]);
+        new Serializer(array($denormalizerAware));
     }
 }