Do not check for Types::ENUM, because we want the enum to populate values with or without native enum.

Do not skip test on non-MySQL.

Author: whataboutpereira

src/Mapping/ClassMetadata.php

@@ -2209,11 +2209,7 @@ public function setDiscriminatorColumn(DiscriminatorColumnMapping|array|null $co
                     throw MappingException::nonEnumTypeMapped($this->name, $columnDef['fieldName'], $columnDef['enumType']);
                 }
 
-                if (
-                    defined('Doctrine\DBAL\Types\Types::ENUM')
-                    && $columnDef['type'] === Types::ENUM
-                    && ! isset($columnDef['options']['values'])
-                ) {
+                if (! isset($columnDef['options']['values'])) {
                     $columnDef['options']['values'] = array_column($columnDef['enumType']::cases(), 'value');
                 }
             }

tests/Tests/ORM/Tools/SchemaToolTest.php

@@ -5,7 +5,6 @@
 namespace Doctrine\Tests\ORM\Tools;
 
 use Doctrine\Common\Collections\Collection;
-use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
 use Doctrine\DBAL\Schema\ForeignKeyConstraintEditor;
 use Doctrine\DBAL\Schema\Index as DbalIndex;
 use Doctrine\DBAL\Schema\Index\IndexedColumn;
@@ -14,7 +13,6 @@
 use Doctrine\DBAL\Schema\PrimaryKeyConstraintEditor;
 use Doctrine\DBAL\Schema\Table as DbalTable;
 use Doctrine\DBAL\Types\EnumType;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
@@ -57,7 +55,6 @@
 use function class_exists;
 use function count;
 use function current;
-use function defined;
 use function enum_exists;
 use function method_exists;
 
@@ -282,18 +279,14 @@ public function testSetDiscriminatorColumnWithEnumType(): void
             self::markTestSkipped('Test valid for doctrine/dbal versions with EnumType only.');
         }
 
-        if (! $this->getTestEntityManager()->getConnection()->getDatabasePlatform() instanceof AbstractMySQLPlatform) {
-            self::markTestSkipped('Test valid for MySQL/MariaDB only.');
-        }
-
         $em         = $this->getTestEntityManager();
         $schemaTool = new SchemaTool($em);
         $metadata   = $em->getClassMetadata(FirstEntity::class);
 
         $metadata->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_SINGLE_TABLE);
         $metadata->setDiscriminatorColumn([
             'name' => 'discriminator',
-            'type' => 'enum',
+            'type' => 'string',
             'enumType' => GH10288People::class,
         ]);