From 05ef1f4f967b6f6c5fa299853f0f17051c43dfdd Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonel.ceruto@scnd.com>
Date: Thu, 14 Dec 2023 15:21:32 -0500
Subject: [PATCH] Fixed enum mapping validation

---
 lib/Doctrine/ORM/Tools/SchemaValidator.php    | 41 +++++++++++++++++--
 .../Ticket/GH11037/EntityStatus.php           |  9 ++++
 .../Functional/Ticket/GH11037/GH11037Test.php |  3 +-
 .../GH11037/InvalidEntityWithTypedEnum.php    |  5 +++
 .../Ticket/GH11037/StringEntityStatus.php     |  2 +-
 .../GH11037/ValidEntityWithTypedEnum.php      |  5 +++
 6 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/EntityStatus.php

diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php
index fbaf33bd01d..c82e8da638a 100644
--- a/lib/Doctrine/ORM/Tools/SchemaValidator.php
+++ b/lib/Doctrine/ORM/Tools/SchemaValidator.php
@@ -39,6 +39,7 @@
 use function get_class;
 use function implode;
 use function in_array;
+use function interface_exists;
 use function is_a;
 use function sprintf;
 
@@ -389,10 +390,20 @@ function (array $fieldMapping) use ($class): ?string {
                             return null;
                         }
 
-                        if (
-                            is_a($propertyType, BackedEnum::class, true)
-                            && $metadataFieldType === (string) (new ReflectionEnum($propertyType))->getBackingType()
-                        ) {
+                        if (is_a($propertyType, BackedEnum::class, true)) {
+                            $backingType = (string) (new ReflectionEnum($propertyType))->getBackingType();
+
+                            if ($metadataFieldType !== $backingType) {
+                                return sprintf(
+                                    "The field '%s#%s' has the property type '%s' with a backing type of '%s' that differs from the metadata field type '%s'.",
+                                    $class->name,
+                                    $fieldName,
+                                    $propertyType,
+                                    $backingType,
+                                    $metadataFieldType
+                                );
+                            }
+
                             if (! isset($fieldMapping['enumType']) || $propertyType === $fieldMapping['enumType']) {
                                 return null;
                             }
@@ -406,6 +417,28 @@ function (array $fieldMapping) use ($class): ?string {
                             );
                         }
 
+                        if (
+                            isset($fieldMapping['enumType'])
+                            && $propertyType !== $fieldMapping['enumType']
+                            && interface_exists($propertyType)
+                            && is_a($fieldMapping['enumType'], $propertyType, true)
+                        ) {
+                            $backingType = (string) (new ReflectionEnum($fieldMapping['enumType']))->getBackingType();
+
+                            if ($metadataFieldType === $backingType) {
+                                return null;
+                            }
+
+                            return sprintf(
+                                "The field '%s#%s' has the metadata enumType '%s' with a backing type of '%s' that differs from the metadata field type '%s'.",
+                                $class->name,
+                                $fieldName,
+                                $fieldMapping['enumType'],
+                                $backingType,
+                                $metadataFieldType
+                            );
+                        }
+
                         if (
                             $fieldMapping['type'] === 'json'
                             && in_array($propertyType, ['string', 'int', 'float', 'bool', 'true', 'false', 'null'], true)
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/EntityStatus.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/EntityStatus.php
new file mode 100644
index 00000000000..f94c44affe0
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/EntityStatus.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket\GH11037;
+
+interface EntityStatus
+{
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/GH11037Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/GH11037Test.php
index bb173c2759c..faaa698618d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/GH11037Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/GH11037Test.php
@@ -40,8 +40,9 @@ public function testMetadataFieldTypeNotCoherentWithEntityPropertyType(): void
 
         self::assertEquals(
             [
-                "The field 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\InvalidEntityWithTypedEnum#status1' has the property type 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\StringEntityStatus' that differs from the metadata field type 'int' returned by the 'integer' DBAL type.",
+                "The field 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\InvalidEntityWithTypedEnum#status1' has the property type 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\StringEntityStatus' with a backing type of 'string' that differs from the metadata field type 'int'.",
                 "The field 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\InvalidEntityWithTypedEnum#status2' has the property type 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\IntEntityStatus' that differs from the metadata enumType 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\StringEntityStatus'.",
+                "The field 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\InvalidEntityWithTypedEnum#status3' has the metadata enumType 'Doctrine\Tests\ORM\Functional\Ticket\GH11037\StringEntityStatus' with a backing type of 'string' that differs from the metadata field type 'int'.",
             ],
             $ce
         );
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/InvalidEntityWithTypedEnum.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/InvalidEntityWithTypedEnum.php
index 1c81aa5656d..ad1c4b77cbe 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/InvalidEntityWithTypedEnum.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/InvalidEntityWithTypedEnum.php
@@ -28,4 +28,9 @@ class InvalidEntityWithTypedEnum
      * @Column(type="integer", enumType=StringEntityStatus::class)
      */
     protected IntEntityStatus $status2;
+
+    /**
+     * @Column(type="integer", enumType=StringEntityStatus::class)
+     */
+    protected EntityStatus $status3;
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/StringEntityStatus.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/StringEntityStatus.php
index af17446ffd2..85bc34e2dc4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/StringEntityStatus.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/StringEntityStatus.php
@@ -4,7 +4,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket\GH11037;
 
-enum StringEntityStatus: string
+enum StringEntityStatus: string implements EntityStatus
 {
     case ACTIVE   = 'active';
     case INACTIVE = 'inactive';
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/ValidEntityWithTypedEnum.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/ValidEntityWithTypedEnum.php
index 40708a14b27..763e4f8bb6a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/ValidEntityWithTypedEnum.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH11037/ValidEntityWithTypedEnum.php
@@ -28,4 +28,9 @@ class ValidEntityWithTypedEnum
      * @Column(type="smallint", enumType=IntEntityStatus::class)
      */
     protected IntEntityStatus $status2;
+
+    /**
+     * @Column(type="string", enumType=StringEntityStatus::class)
+     */
+    protected EntityStatus $status3;
 }