Revert "Fix EnumType not being hydrated with HYDRATE_ARRAY (#9995)"

This reverts commit bb3ce7e.

Author: derrabus

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

@@ -692,7 +692,7 @@ protected function registerManaged(ClassMetadata $class, $entity, array $data)
      *
      * @return BackedEnum|array<BackedEnum>
      */
-    protected function buildEnum($value, string $enumType)
+    private function buildEnum($value, string $enumType)
     {
         if (is_array($value)) {
             return array_map(static function ($value) use ($enumType): BackedEnum {

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

@@ -36,13 +36,6 @@ class ArrayHydrator extends AbstractHydrator
     /** @var int */
     private $_resultCounter = 0;
 
-    /**
-     * The cache used during enum processing.
-     *
-     * @var array<string, mixed>
-     */
-    private $_enumCache = [];
-
     /**
      * {@inheritdoc}
      */
@@ -83,9 +76,6 @@ protected function hydrateRowData(array $row, array &$result)
 
         // 2) Now hydrate the data found in the current row.
         foreach ($rowData['data'] as $dqlAlias => $data) {
-            // build enums if exists
-            $this->processEnums($dqlAlias, $data);
-
             $index = false;
 
             if (isset($this->resultSetMapping()->parentAliasMap[$dqlAlias])) {
@@ -287,28 +277,4 @@ private function updateResultPointer(
         end($coll);
         $this->_resultPointers[$dqlAlias] =& $coll[key($coll)];
     }
-
-    /** @param mixed[] $data */
-    private function processEnums(string $dqlAlias, array &$data): void
-    {
-        // init cache
-        if (! isset($this->_enumCache[$dqlAlias])) {
-            $this->_enumCache[$dqlAlias] = [];
-
-            $className     = $this->resultSetMapping()->aliasMap[$dqlAlias];
-            $classMetadata = $this->getClassMetadata($className);
-
-            foreach ($classMetadata->fieldMappings as $key => $fieldMapping) {
-                if (isset($fieldMapping['enumType'])) {
-                    $this->_enumCache[$dqlAlias][$key] = $fieldMapping['enumType'];
-                }
-            }
-        }
-
-        foreach ($data as $key => $value) {
-            if (isset($this->_enumCache[$dqlAlias][$key]) && $value !== null) {
-                $data[$key] = $this->buildEnum($value, $this->_enumCache[$dqlAlias][$key]);
-            }
-        }
-    }
 }

tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php

@@ -11,8 +11,6 @@
 use Doctrine\Tests\Models\CMS\CmsComment;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\Tests\Models\CMS\CmsUser;
-use Doctrine\Tests\Models\Enums\Card;
-use Doctrine\Tests\Models\Enums\Suit;
 use Doctrine\Tests\Models\Forum\ForumBoard;
 use Doctrine\Tests\Models\Forum\ForumCategory;
 
@@ -1224,79 +1222,4 @@ public function testIndexByAndMixedResult($userEntityKey): void
         self::assertArrayHasKey(2, $result);
         self::assertEquals(2, $result[2][$userEntityKey]['id']);
     }
-
-    /**
-     * @requires PHP 8.1
-     */
-    public function testArrayResultWithEnumField(): void
-    {
-        $rsm = new ResultSetMapping();
-
-        $rsm->addEntityResult(Card::class, 'c');
-        $rsm->addFieldResult('c', 'c__id', 'id');
-        $rsm->addFieldResult('c', 'c__suit', 'suit');
-        $rsm->addIndexBy('c', 'id');
-
-        // Faked result set
-        $resultSet = [
-            //row1
-            [
-                'c__id' => '1',
-                'c__suit' => 'H',
-            ],
-            [
-                'c__id' => '2',
-                'c__suit' => 'D',
-            ],
-        ];
-
-        $stmt     = ArrayResultFactory::createFromArray($resultSet);
-        $hydrator = new ArrayHydrator($this->entityManager);
-        $result   = $hydrator->hydrateAll($stmt, $rsm);
-
-        self::assertCount(2, $result);
-
-        self::assertEquals(1, $result[1]['id']);
-        self::assertEquals(Suit::Hearts, $result[1]['suit']);
-
-        self::assertEquals(2, $result[2]['id']);
-        self::assertEquals(Suit::Diamonds, $result[2]['suit']);
-    }
-
-    /**
-     * @requires PHP 8.1
-     */
-    public function testScalarResultWithEnumField(): void
-    {
-        $rsm = new ResultSetMapping();
-
-        $rsm->addEntityResult(Card::class, 'c');
-        $rsm->addScalarResult('c__suit', 'someAlias', 'string');
-        $rsm->addEnumResult('c__suit', Suit::class);
-
-        // Faked result set
-        $resultSet = [
-            //row1
-            [
-                'c__id' => '1',
-                'c__suit' => 'C',
-            ],
-            [
-                'c__id' => '2',
-                'c__suit' => 'S',
-            ],
-        ];
-
-        $stmt     = ArrayResultFactory::createFromArray($resultSet);
-        $hydrator = new ArrayHydrator($this->entityManager);
-        $result   = $hydrator->hydrateAll($stmt, $rsm);
-
-        self::assertCount(2, $result);
-
-        self::assertCount(1, $result[0]); //assert that in each result we have only one "someAlias" field
-        self::assertEquals(Suit::Clubs, $result[0]['someAlias']);
-
-        self::assertCount(1, $result[1]);
-        self::assertEquals(Suit::Spades, $result[1]['someAlias']);
-    }
 }