fix(symfony): allow schema restriction for collection like property f…

…rom choice constraint (#6520)
api-platform · Aug 29, 2024 · 0a461d7 · 0a461d7
1 parent 3b42c9f
commit 0a461d7
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php
@@ -78,11 +78,19 @@ public function create(Constraint $constraint, ApiProperty $propertyMetadata): a
      */
     public function supports(Constraint $constraint, ApiProperty $propertyMetadata): bool
     {
-        $types = array_map(fn (Type $type) => $type->getBuiltinType(), $propertyMetadata->getBuiltinTypes() ?? []);
+        $types = array_map(static fn (Type $type) => $type->getBuiltinType(), $propertyMetadata->getBuiltinTypes() ?? []);
         if ($propertyMetadata->getExtraProperties()['nested_schema'] ?? false) {
             $types = [Type::BUILTIN_TYPE_STRING];
         }
 
+        if (
+            null !== ($builtinType = $propertyMetadata->getBuiltinTypes()[0] ?? null)
+            && $builtinType->isCollection()
+            && \count($builtinType->getCollectionValueTypes())
+        ) {
+            $types = array_unique(array_merge($types, array_map(static fn (Type $type) => $type->getBuiltinType(), $builtinType->getCollectionValueTypes())));
+        }
+
         return $constraint instanceof Choice && \count($types) && array_intersect($types, [Type::BUILTIN_TYPE_STRING, Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_FLOAT]);
     }
 }