Merge branch '4.4' into 5.4

* 4.4:
  CS fixes
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43

Author: nicolas-grekas

Encoder/XmlEncoder.php

@@ -83,7 +83,7 @@ public function encode($data, string $format, array $context = [])
 
         $dom = $this->createDomDocument($context);
 
-        if (null !== $data && !is_scalar($data)) {
+        if (null !== $data && !\is_scalar($data)) {
             $root = $dom->createElement($xmlRootNodeName);
             $dom->appendChild($root);
             $this->buildXml($root, $data, $format, $context, $xmlRootNodeName);
@@ -367,9 +367,9 @@ private function buildXml(\DOMNode $parentNode, $data, string $format, array $co
 
         if (\is_array($data) || ($data instanceof \Traversable && (null === $this->serializer || !$this->serializer->supportsNormalization($data, $format)))) {
             foreach ($data as $key => $data) {
-                //Ah this is the magic @ attribute types.
+                // Ah this is the magic @ attribute types.
                 if (str_starts_with($key, '@') && $this->isElementNameValid($attributeName = substr($key, 1))) {
-                    if (!is_scalar($data)) {
+                    if (!\is_scalar($data)) {
                         $data = $this->serializer->normalize($data, $format, $context);
                     }
                     $parentNode->setAttribute($attributeName, $data);
@@ -409,7 +409,7 @@ private function buildXml(\DOMNode $parentNode, $data, string $format, array $co
             }
 
             $data = $this->serializer->normalize($data, $format, $context);
-            if (null !== $data && !is_scalar($data)) {
+            if (null !== $data && !\is_scalar($data)) {
                 return $this->buildXml($parentNode, $data, $format, $context, $xmlRootNodeName);
             }
 
@@ -434,7 +434,7 @@ private function buildXml(\DOMNode $parentNode, $data, string $format, array $co
      */
     private function appendNode(\DOMNode $parentNode, $data, string $format, array $context, string $nodeName, string $key = null): bool
     {
-        $dom = $parentNode instanceof \DomDocument ? $parentNode : $parentNode->ownerDocument;
+        $dom = $parentNode instanceof \DOMDocument ? $parentNode : $parentNode->ownerDocument;
         $node = $dom->createElement($nodeName);
         if (null !== $key) {
             $node->setAttribute('key', $key);

Normalizer/AbstractNormalizer.php

@@ -259,7 +259,7 @@ protected function getGroups(array $context): array
     {
         $groups = $context[self::GROUPS] ?? $this->defaultContext[self::GROUPS] ?? [];
 
-        return is_scalar($groups) ? (array) $groups : $groups;
+        return \is_scalar($groups) ? (array) $groups : $groups;
     }
 
     /**

Normalizer/AbstractObjectNormalizer.php

@@ -198,7 +198,7 @@ public function normalize($object, string $format = null, array $context = [])
 
             $attributeValue = $this->applyCallbacks($attributeValue, $object, $attribute, $format, $attributeContext);
 
-            if (null !== $attributeValue && !is_scalar($attributeValue)) {
+            if (null !== $attributeValue && !\is_scalar($attributeValue)) {
                 $stack[$attribute] = $attributeValue;
             }
 

Serializer.php

@@ -161,7 +161,7 @@ public function normalize($data, string $format = null, array $context = [])
             return $normalizer->normalize($data, $format, $context);
         }
 
-        if (null === $data || is_scalar($data)) {
+        if (null === $data || \is_scalar($data)) {
             return $data;
         }
 

Tests/DeserializeNestedArrayOfObjectsTest.php

@@ -23,9 +23,9 @@ class DeserializeNestedArrayOfObjectsTest extends TestCase
     public function provider()
     {
         return [
-            //from property PhpDoc
+            // from property PhpDoc
             [Zoo::class],
-            //from argument constructor PhpDoc
+            // from argument constructor PhpDoc
             [ZooImmutable::class],
         ];
     }
@@ -35,7 +35,7 @@ public function provider()
      */
     public function testPropertyPhpDoc($class)
     {
-        //GIVEN
+        // GIVEN
         $json = <<<EOF
 {
     "animals": [
@@ -47,10 +47,10 @@ public function testPropertyPhpDoc($class)
             new ObjectNormalizer(null, null, null, new PhpDocExtractor()),
             new ArrayDenormalizer(),
         ], ['json' => new JsonEncoder()]);
-        //WHEN
+        // WHEN
         /** @var Zoo $zoo */
         $zoo = $serializer->deserialize($json, $class, 'json');
-        //THEN
+        // THEN
         self::assertCount(1, $zoo->getAnimals());
         self::assertInstanceOf(Animal::class, $zoo->getAnimals()[0]);
     }

Tests/SerializerTest.php

@@ -219,7 +219,7 @@ public function testSerializeEmpty()
         $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
         $data = ['foo' => new \stdClass()];
 
-        //Old buggy behaviour
+        // Old buggy behaviour
         $result = $serializer->serialize($data, 'json');
         $this->assertEquals('{"foo":[]}', $result);
 
@@ -528,14 +528,14 @@ public function testNotNormalizableValueExceptionMessageForAResource()
     public function testNormalizeTransformEmptyArrayObjectToArray()
     {
         $serializer = new Serializer(
-          [
-              new PropertyNormalizer(),
-              new ObjectNormalizer(),
-              new ArrayDenormalizer(),
-          ],
-          [
-              'json' => new JsonEncoder(),
-          ]
+            [
+                new PropertyNormalizer(),
+                new ObjectNormalizer(),
+                new ArrayDenormalizer(),
+            ],
+            [
+                'json' => new JsonEncoder(),
+            ]
         );
 
         $object = [];
@@ -551,14 +551,14 @@ public function testNormalizeTransformEmptyArrayObjectToArray()
     public function provideObjectOrCollectionTests()
     {
         $serializer = new Serializer(
-          [
-              new PropertyNormalizer(),
-              new ObjectNormalizer(),
-              new ArrayDenormalizer(),
-          ],
-          [
-              'json' => new JsonEncoder(),
-          ]
+            [
+                new PropertyNormalizer(),
+                new ObjectNormalizer(),
+                new ArrayDenormalizer(),
+            ],
+            [
+                'json' => new JsonEncoder(),
+            ]
         );
 
         $data = [];