Fix ArrayHydration of enums

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -464,6 +464,10 @@ protected function gatherRowData(array $data, array &$id, array &$nonemptyCompon
  break;
  }
 
+ if ($value !== null && isset($cacheKeyInfo['enumType'])) {
+ $value = $this->buildEnum($value, $cacheKeyInfo['enumType']);
+ }
+
  $rowData['data'][$dqlAlias][$fieldName] = $type
  ? $type->convertToPHPValue($value, $this->_platform)
  : $value;
@@ -547,6 +551,7 @@ protected function hydrateColumnInfo($key)
  'fieldName' => $fieldName,
  'type' => Type::getType($fieldMapping['type']),
  'dqlAlias' => $ownerMap,
+ 'enumType' => $this->_rsm->enumMappings[$key] ?? null,
  ];
 
  // the current discriminator value must be saved in order to disambiguate fields hydration,

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -1520,6 +1520,10 @@ public function walkSelectExpression($selectExpression)
  $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
 
  $this->rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $class->name);
+
+ if (! empty($mapping['enumType'])) {
+ $this->rsm->addEnumResult($columnAlias, $mapping['enumType']);
+ }
  }
 
  // Add any additional fields of subclasses (excluding inherited fields)

tests/Doctrine/Tests/ORM/Functional/EnumTest.php

@@ -4,6 +4,7 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\Mapping\MappingException;
@@ -86,6 +87,28 @@ public function testEnumHydration(): void
  $this->assertEquals(Suit::Clubs, $result[0]['suit']);
  }
 
+ public function testEnumHydrationArrayHydrator(): void
+ {
+ $this->setUpEntitySchema([Card::class, CardWithNullable::class]);
+
+ $card = new Card();
+ $card->suit = Suit::Clubs;
+
+ $this->_em->persist($card);
+ $this->_em->flush();
+ $this->_em->clear();
+
+ $result = $this->_em->createQueryBuilder()
+ ->from(Card::class, 'c')
+ ->select('c')
+ ->getQuery()
+ //->getResult();
+ ->getResult(AbstractQuery::HYDRATE_ARRAY);
+
+ $this->assertInstanceOf(Suit::class, $result[0]['suit']);
+ $this->assertEquals(Suit::Clubs, $result[0]['suit']);
+ }
+
  public function testNullableEnumHydration(): void
  {
  $this->setUpEntitySchema([Card::class, CardWithNullable::class]);