Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit 63355611db03 · 2022-06-21T09:16:34.000+02:00
* 6.1:
  [DoctrineBridge] Fix value type for simple_array
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -180,7 +180,7 @@ public function getTypes(string $class, string $property, array $context = []):
                             return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
 
                         case Types::SIMPLE_ARRAY:
-                            return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))];
+                            return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), $enumType ?? new Type(Type::BUILTIN_TYPE_STRING))];
                     }
                     break;
                 case Type::BUILTIN_TYPE_INT:

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public function getTypes(string $class, string $property, array $context = []):`
`180`	`180`	`return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];`
`181`	`181`
`182`	`182`	`case Types::SIMPLE_ARRAY:`
`183`		`- return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))];`
	`183`	`+ return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), $enumType ?? new Type(Type::BUILTIN_TYPE_STRING))];`
`184`	`184`	`}`
`185`	`185`	`break;`
`186`	`186`	`case Type::BUILTIN_TYPE_INT:`