Merge branch '6.0' into 6.1

* 6.0:
  Exclude from baseline generation deprecations triggered in legacy test
  [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used
  [DoctrineBridge] Add missing break
  [PropertyInfo] CS fix
  [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false
  CS fix
  [Cache] Respect $save option in ChainAdapter
  [ExpressionLanguage] fix tests (bis)
  [ExpressionLanguage] fix tests
  Allow passing null in twig_is_selected_choice
  [Cache] Respect $save option in ArrayAdapter
  [HttpKernel] Disable session tracking while collecting profiler data
  [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler
  [DoctrineBridge] Extend type guessing on enum fields
  [FrameworkBundle] Lower JsonSerializableNormalizer priority
  [Messenger] move resetting services at worker stopped into ResetServicesListener
  [Mailer] Fix Error Handling for OhMySMTP Bridge
  Fix for missing sender name in case with usage of the EnvelopeListener

Author: nicolas-grekas

PropertyInfo/DoctrineExtractor.php

@@ -135,17 +135,18 @@ public function getTypes(string $class, string $property, array $context = []):
         }
 
         if ($metadata->hasField($property)) {
-            $nullable = $metadata instanceof ClassMetadataInfo && $metadata->isNullable($property);
-            if (null !== $enumClass = $metadata->getFieldMapping($property)['enumType'] ?? null) {
-                return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $enumClass)];
-            }
-
             $typeOfField = $metadata->getTypeOfField($property);
 
             if (!$builtinType = $this->getPhpType($typeOfField)) {
                 return null;
             }
 
+            $nullable = $metadata instanceof ClassMetadataInfo && $metadata->isNullable($property);
+            $enumType = null;
+            if (null !== $enumClass = $metadata->getFieldMapping($property)['enumType'] ?? null) {
+                $enumType = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $enumClass);
+            }
+
             switch ($builtinType) {
                 case Type::BUILTIN_TYPE_OBJECT:
                     switch ($typeOfField) {
@@ -171,11 +172,23 @@ public function getTypes(string $class, string $property, array $context = []):
                     switch ($typeOfField) {
                         case Types::ARRAY:
                         case 'json_array':
+                            // return null if $enumType is set, because we can't determine if collectionKeyType is string or int
+                            if ($enumType) {
+                                return null;
+                            }
+
                             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))];
                     }
+                    break;
+                case Type::BUILTIN_TYPE_INT:
+                case Type::BUILTIN_TYPE_STRING:
+                    if ($enumType) {
+                        return [$enumType];
+                    }
+                    break;
             }
 
             return [new Type($builtinType, $nullable)];

Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -127,6 +127,9 @@ public function testExtractEnum()
         }
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, EnumString::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumString', []));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, EnumInt::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumInt', []));
+        $this->assertEquals(null, $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumStringArray', []));
+        $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, EnumInt::class))], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumIntArray', []));
+        $this->assertEquals(null, $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));
     }
 
     public function typesProvider()

Tests/PropertyInfo/Fixtures/DoctrineEnum.php

@@ -35,4 +35,19 @@ class DoctrineEnum
      * @Column(type="integer", enumType="Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\EnumInt")
      */
     protected $enumInt;
+
+    /**
+     * @Column(type="array", enumType="Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\EnumString")
+     */
+    protected $enumStringArray;
+
+    /**
+     * @Column(type="simple_array", enumType="Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\EnumInt")
+     */
+    protected $enumIntArray;
+
+    /**
+     * @Column(type="custom_foo", enumType="Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\EnumInt")
+     */
+    protected $enumCustom;
 }