Rebase onto 7.1

Jeroeny · Jeroeny · commit 514bcc2abace · 2024-05-06T13:57:04.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -462,7 +462,7 @@ private function validateAndDenormalizeLegacy(array $types, string $currentClass
                 $builtinType = $type->getBuiltinType();
                 if (\is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
                     if ('' === $data) {
-                        if (LegacyLegacyType::BUILTIN_TYPE_ARRAY === $builtinType) {
+                        if (LegacyType::BUILTIN_TYPE_ARRAY === $builtinType) {
                             return [];
                         }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -17,8 +17,6 @@
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
-use Symfony\Component\TypeInfo\Type;
-use Symfony\Component\TypeInfo\Type\UnionType;
 
 /**
  * Denormalizes arrays of objects.
@@ -51,7 +49,7 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         }
         if (!\is_array($data)) {
             $valueType = $context['value_type'] ?? null;
-            $expected = $valueType ? 'array<'.implode('|', array_map(fn (Type $type) => $type->getClassName() ?? $type->getBuiltinType(), $valueType->getCollectionValueTypes())).'>' : $type;
+            $expected = $valueType ? 'array<'.implode('|', array_map(fn (LegacyType $type) => $type->getClassName() ?? $type->getBuiltinType(), $valueType->getCollectionValueTypes())).'>' : $type;
 
             throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Data expected to be "%s", "%s" given.', $expected, get_debug_type($data)), $data, ['array'], $context['deserialization_path'] ?? null);
         }
@@ -62,18 +60,8 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         $type = substr($type, 0, -2);
         $valueType = $context['value_type'] ?? null;
 
-        # todo
-        $typeIdentifiers = [];
-        if (null !== $keyType = ($context['key_type'] ?? null)) {
-            if ($keyType instanceof Type) {
-                $typeIdentifiers = array_map(fn (Type $t): string => $t->getBaseType()->getTypeIdentifier()->value, $keyType instanceof UnionType ? $keyType->getTypes() : [$keyType]);
-            } else {
-                $typeIdentifiers = array_map(fn (LegacyType $t): string => $t->getBuiltinType(), \is_array($keyType) ? $keyType : [$keyType]);
-            }
-        }
-
-        if ($valueType instanceof Type && \count($keyTypes = $valueType->getCollectionKeyTypes()) > 0) {
-            $builtinTypes = array_map(static fn (Type $keyType) => $keyType->getBuiltinType(), $keyTypes);
+        if ($valueType instanceof LegacyType && \count($keyTypes = $valueType->getCollectionKeyTypes()) > 0) {
+            $builtinTypes = array_map(static fn (LegacyType $keyType) => $keyType->getBuiltinType(), $keyTypes);
         } else {
             $builtinTypes = array_map(static fn (LegacyType $keyType) => $keyType->getBuiltinType(), \is_array($keyType = $context['key_type'] ?? []) ? $keyType : [$keyType]);
         }
@@ -82,9 +70,9 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
             $subContext = $context;
             $subContext['deserialization_path'] = ($context['deserialization_path'] ?? false) ? sprintf('%s[%s]', $context['deserialization_path'], $key) : "[$key]";
 
-            $this->validateKeyType($typeIdentifiers, $key, $subContext['deserialization_path']);
+            $this->validateKeyType($builtinTypes, $key, $subContext['deserialization_path']);
 
-            if ($valueType instanceof Type) {
+            if ($valueType instanceof LegacyType) {
                 foreach ($valueType->getCollectionValueTypes() as $subtype) {
                     try {
                         $subContext['value_type'] = $subtype;
@@ -95,7 +83,7 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
                             continue 2;
                         }
 
-                        if (Type::BUILTIN_TYPE_ARRAY === $subtype->getBuiltinType()) {
+                        if (LegacyType::BUILTIN_TYPE_ARRAY === $subtype->getBuiltinType()) {
                             $class = $type;
                         } else {
                             $class = $subtype->getClassName() ?? $subtype->getBuiltinType();
@@ -128,20 +116,20 @@ public function supportsDenormalization(mixed $data, string $type, ?string $form
     }
 
     /**
-     * @param list<string> $typeIdentifiers
+     * @param list<string> $builtinTypes
      */
     private function validateKeyType(array $builtinTypes, mixed $key, string $path): void
     {
-        if (!$typeIdentifiers) {
+        if (!$builtinTypes) {
             return;
         }
 
-        foreach ($typeIdentifiers as $typeIdentifier) {
+        foreach ($builtinTypes as $typeIdentifier) {
             if (('is_'.$typeIdentifier)($key)) {
                 return;
             }
         }
 
-        throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, implode('", "', $typeIdentifiers), get_debug_type($key)), $key, $typeIdentifiers, $path, true);
+        throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, implode('", "', $builtinTypes), get_debug_type($key)), $key, $builtinTypes, $path, true);
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -1214,7 +1214,7 @@ public function testCollectDenormalizationErrors2(?ClassMetadataFactory $classMe
                 'useMessageForUser' => false,
                 'message' => 'The type of the "string" attribute for class "Symfony\\Component\\Serializer\\Tests\\Fixtures\\Php74Full" must be one of "string" ("null" given).',
             ],
-            ];
+        ];
 
         $this->assertSame($expected, $exceptionsAsArray);
     }
@@ -1464,8 +1464,8 @@ public function testCollectDenormalizationErrorsWithWrongPropertyWithoutConstruc
 
         try {
             $serializer->deserialize('{"get": "POST"}', DummyObjectWithEnumProperty::class, 'json', [
-                 DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS => true,
-             ]);
+                DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS => true,
+            ]);
         } catch (\Throwable $e) {
             $this->assertInstanceOf(PartialDenormalizationException::class, $e);
         }

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ private function validateAndDenormalizeLegacy(array $types, string $currentClass`
`462`	`462`	`$builtinType = $type->getBuiltinType();`
`463`	`463`	`if (\is_string($data) && (XmlEncoder::FORMAT === $format \|\| CsvEncoder::FORMAT === $format)) {`
`464`	`464`	`if ('' === $data) {`
`465`		`- if (LegacyLegacyType::BUILTIN_TYPE_ARRAY === $builtinType) {`
	`465`	`+ if (LegacyType::BUILTIN_TYPE_ARRAY === $builtinType) {`
`466`	`466`	`return [];`
`467`	`467`	`}`
`468`	`468`