[Serializer] fix denormalization of basic property-types in XML and CSV #33849

mkrauser · mkrauser · commit 628be3c3411d · 2019-11-12T20:05:39.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -260,13 +260,10 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
             //
             // This is special to xml and csv format
             if (
-                \is_string($data) &&
-                (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)
+                \is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)
             ) {
                 if (
-                    '' === $data &&
-                    $type->isNullable() &&
-                    \in_array($type->getBuiltinType(), [Type::BUILTIN_TYPE_BOOL, Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_FLOAT], true)
+                    '' === $data && $type->isNullable() && \in_array($type->getBuiltinType(), [Type::BUILTIN_TYPE_BOOL, Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_FLOAT], true)
                 ) {
                     return null;
                 }
@@ -285,7 +282,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
                     case Type::BUILTIN_TYPE_INT:
                         if (
                             ctype_digit($data) ||
-                            '-' == $data[0] && ctype_digit(substr($data, 1))
+                            '-' === $data[0] && ctype_digit(substr($data, 1))
                         ) {
                             $data = (int) $data;
                         } else {
@@ -462,10 +459,10 @@ private function getCacheKey($format, array $context)
         unset($context['cache_key']); // avoid artificially different keys
         try {
             return md5($format.serialize([
-                    'context' => $context,
-                    'ignored' => $this->ignoredAttributes,
-                    'camelized' => $this->camelizedAttributes,
-                ]));
+                'context' => $context,
+                'ignored' => $this->ignoredAttributes,
+                'camelized' => $this->camelizedAttributes,
+            ]));
         } catch (\Exception $exception) {
             // The context cannot be serialized, skip the cache
             return false;
