feat(metadata): detect enumeration type hint

This commit does not contains a test because AFAIK for the moment there is no test scoped to a specific version of PHP. It fixes doctrine#9021
Nek- · Oct 25, 2021 · 24e29f1 · 24e29f1
1 parent 3361691
commit 24e29f1
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1493,6 +1493,10 @@ private function validateAndCompleteTypedFieldMapping(array $mapping): array
                     case 'string':
                         $mapping['type'] = Types::STRING;
                         break;
+                    default:
+                        if (PHP_VERSION_ID >= 80100 && enum_exists($type->getName())) {
+                            $mapping['type'] = Types::ENUM;
+                        }
                 }
             }
         }

diff --git a/tests/Doctrine/Tests/Models/TypedProperties/Article.php b/tests/Doctrine/Tests/Models/TypedProperties/Article.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\TypedProperties;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity, ORM\Table(name: 'cms_articles_enumed')]
+class Article
+{
+    #[ORM\Id, ORM\Column, ORM\GeneratedValue]
+    public int $id;
+
+    #[ORM\Column]
+    public ArticleStateEnum $enum;
+}
diff --git a/tests/Doctrine/Tests/Models/TypedProperties/ArticleStateEnum.php b/tests/Doctrine/Tests/Models/TypedProperties/ArticleStateEnum.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\TypedProperties;
+
+enum ArticleStateEnum
+{
+case DRAFT;
+case PUBLISHED;
+    }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -135,7 +135,7 @@ public function testFieldIsNullableByType(): void
     public function testFieldTypeFromReflection(): void
     {
         if (PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('requies PHP 7.4');
+            self::markTestSkipped('requires PHP 7.4');
         }
 
         $cm = new ClassMetadata(TypedProperties\UserTyped::class);
@@ -174,6 +174,19 @@ public function testFieldTypeFromReflection(): void
         self::assertEquals('float', $cm->getTypeOfField('float'));
     }
 
+    public function testFieldTypeEnumFromReflection(): void
+    {
+        if (PHP_VERSION_ID < 80100) {
+            self::markTestSkipped('requires PHP 8.1');
+        }
+
+        $cm = new ClassMetadata(TypedProperties\Article::class);
+        $cm->initializeReflection(new RuntimeReflectionService());
+
+        $cm->mapField(['fieldName' => 'enum']);
+        self::assertEquals('enum', $cm->getTypeOfField('enum'));
+    }
+
     /**
      * @group DDC-115
      */