Make ReflectionEnumProperty::getValue return the enum

UoW compares orig and actual value. Orig value is the enum. But without this change, actual value is the inner value of the BackedEnum. Therefore, Entities with enum field are always considered a change.
doctrine · Oct 13, 2022 · 1f99f81 · 1f99f81
1 parent 13d1c7b
commit 1f99f81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/lib/Doctrine/ORM/Id/AssignedGenerator.php
@@ -4,6 +4,7 @@
 
 namespace Doctrine\ORM\Id;
 
+use BackedEnum;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Exception\EntityMissingAssignedId;
 
@@ -39,6 +40,10 @@ public function generateId(EntityManagerInterface $em, $entity)
                 $value = $em->getUnitOfWork()->getSingleIdentifierValue($value);
             }
 
+            if ($value instanceof BackedEnum) {
+                $value = $value->value;
+            }
+
             $identifier[$idField] = $value;
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php b/lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
@@ -38,7 +38,7 @@ public function __construct(ReflectionProperty $originalReflectionProperty, stri
      *
      * @param object|null $object
      *
-     * @return int|string|int[]|string[]|null
+     * @return BackedEnum|null
      */
     #[ReturnTypeWillChange]
     public function getValue($object = null)
@@ -53,13 +53,7 @@ public function getValue($object = null)
             return null;
         }
 
-        if (is_array($enum)) {
-            return array_map(static function (BackedEnum $item): mixed {
-                return $item->value;
-            }, $enum);
-        }
-
-        return $enum->value;
+        return $enum;
     }
 
     /**

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -647,6 +647,9 @@ protected function prepareUpdateData($entity, bool $isInsert = false)
             }
 
             $newVal = $change[1];
+            if ($newVal instanceof BackedEnum) {
+                $newVal = $newVal->value;
+            }
 
             if (! isset($this->class->associationMappings[$field])) {
                 $fieldMapping = $this->class->fieldMappings[$field];