Merge pull request #5

add support for doctrine/dbal ^3.2

Author: Pavel Batanov

composer.json

@@ -16,7 +16,7 @@
     "symfony/http-kernel": "^3.4 || ^4.0 || ^5.0",
     "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0",
     "symfony/config": "^3.4 || ^4.0 || ^5.0",
-    "doctrine/dbal": "^2.4"
+    "doctrine/dbal": "^2.11 || ^3.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",

src/DBAL/EnumType.php

@@ -63,7 +63,7 @@ public function isEnumNameTypeMapping(): bool
     /**
      * {@inheritdoc}
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?Enum
     {
         if (null === $value) {
             return null;
@@ -82,7 +82,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
     /**
      * {@inheritdoc}
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if (null === $value) {
             return null;
@@ -96,7 +96,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
     }
 
     /** {@inheritdoc} */
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
     {
         if ($this->isEnumNameTypeMapping() === true) {
             return $this->getName();
@@ -111,7 +111,7 @@ public function getName(): string
         return $this->name;
     }
 
-    public function getMappedDatabaseTypes(AbstractPlatform $platform)
+    public function getMappedDatabaseTypes(AbstractPlatform $platform): array
     {
         if ($this->isEnumNameTypeMapping() === true) {
             return [$this->name => $this->name];

src/DBAL/EnumTypeInitializer.php

@@ -13,7 +13,7 @@ final class EnumTypeInitializer
      * @param NamingStrategyInterface|null $strategy
      * @param bool $enumNameTypeMapping
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws \Doctrine\DBAL\Exception
      */
     public function initialize(
         string $type,

tests/Unit/DBAL/EnumTypeTest.php

@@ -74,7 +74,9 @@ public function testTypeUtilizesPlatformStringDeclaration(): void
         $platform = $this->createMock(AbstractPlatform::class);
         $platform->expects($this->once())
             ->method('getVarcharTypeDeclarationSQL')
-            ->with($fieldDeclaration);
+            ->with($fieldDeclaration)
+            ->willReturn('VARCHAR')
+        ;
 
         self::createType()->getSQLDeclaration($fieldDeclaration, $platform);
     }