[Serializer][PropertyInfo][Validator] TypeInfo 7.2 compatibility

Author: mtarld

Mapping/Loader/PropertyInfoLoader.php

@@ -16,10 +16,14 @@
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\Type as PropertyInfoType;
 use Symfony\Component\TypeInfo\Type as TypeInfoType;
+use Symfony\Component\TypeInfo\Type\BuiltinType;
 use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\IntersectionType;
+use Symfony\Component\TypeInfo\Type\NullableType;
 use Symfony\Component\TypeInfo\Type\ObjectType;
 use Symfony\Component\TypeInfo\Type\UnionType;
+use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 use Symfony\Component\TypeInfo\TypeIdentifier;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\NotBlank;
@@ -143,7 +147,23 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
                 }
 
                 $type = $types;
-                $nullable = false;
+
+                // BC layer for type-info < 7.2
+                if (!class_exists(NullableType::class)) {
+                    $nullable = false;
+
+                    if ($type instanceof UnionType && $type->isNullable()) {
+                        $nullable = true;
+                        $type = $type->asNonNullable();
+                    }
+                } else {
+                    $nullable = $type->isNullable();
+
+                    if ($type instanceof NullableType) {
+                        $type = $type->getWrappedType();
+                    }
+                }
+
 
                 if ($type instanceof UnionType && $type->isNullable()) {
                     $nullable = true;
@@ -197,18 +217,46 @@ private function getTypeConstraintLegacy(string $builtinType, PropertyInfoType $
 
     private function getTypeConstraint(TypeInfoType $type): ?Type
     {
-        if ($type instanceof UnionType || $type instanceof IntersectionType) {
-            return ($type->isA(TypeIdentifier::INT) || $type->isA(TypeIdentifier::FLOAT) || $type->isA(TypeIdentifier::STRING) || $type->isA(TypeIdentifier::BOOL)) ? new Type(['type' => 'scalar']) : null;
+        // BC layer for type-info < 7.2
+        if (!interface_exists(CompositeTypeInterface::class)) {
+            if ($type instanceof UnionType || $type instanceof IntersectionType) {
+                return ($type->isA(TypeIdentifier::INT) || $type->isA(TypeIdentifier::FLOAT) || $type->isA(TypeIdentifier::STRING) || $type->isA(TypeIdentifier::BOOL)) ? new Type(['type' => 'scalar']) : null;
+            }
+
+            $baseType = $type->getBaseType();
+
+            if ($baseType instanceof ObjectType) {
+                return new Type(['type' => $baseType->getClassName()]);
+            }
+
+            if (TypeIdentifier::MIXED !== $baseType->getTypeIdentifier()) {
+                return new Type(['type' => $baseType->getTypeIdentifier()->value]);
+            }
+
+            return null;
+        }
+
+        if ($type instanceof CompositeTypeInterface) {
+            return $type->isIdentifiedBy(
+                TypeIdentifier::INT,
+                TypeIdentifier::FLOAT,
+                TypeIdentifier::STRING,
+                TypeIdentifier::BOOL,
+                TypeIdentifier::TRUE,
+                TypeIdentifier::FALSE,
+            ) ? new Type(['type' => 'scalar']) : null;
         }
 
-        $baseType = $type->getBaseType();
+        while ($type instanceof WrappingTypeInterface) {
+            $type = $type->getWrappedType();
+        }
 
-        if ($baseType instanceof ObjectType) {
-            return new Type(['type' => $baseType->getClassName()]);
+        if ($type instanceof ObjectType) {
+            return new Type(['type' => $type->getClassName()]);
         }
 
-        if (TypeIdentifier::MIXED !== $baseType->getTypeIdentifier()) {
-            return new Type(['type' => $baseType->getTypeIdentifier()->value]);
+        if ($type instanceof BuiltinType && TypeIdentifier::MIXED !== $type->getTypeIdentifier()) {
+            return new Type(['type' => $type->getTypeIdentifier()->value]);
         }
 
         return null;