fix: droctrine 4 compatability (resolves #84)

Author: tpetry

.github/workflows/phpunit.yml

@@ -28,7 +28,7 @@ jobs:
             doctrine: ^3.5
             testbench: 8.*
           - laravel: 11.*
-            doctrine: ^3.5
+            doctrine: ^4.0
             testbench: 9.*
         exclude:
           - php: 8.0

composer.json

@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "doctrine/dbal": "^2.6|^3.5",
+        "doctrine/dbal": "^2.6|^3.5|^4.0",
         "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
         "illuminate/database": "^6.0|^7.0|^8.79|^9.0|^10.0|^11.0",
         "illuminate/events": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",

src/PostgresqlEnhancedServiceProvider.php

@@ -33,6 +33,7 @@
 use Tpetry\PostgresqlEnhanced\Types\IsmnType;
 use Tpetry\PostgresqlEnhanced\Types\Issn13Type;
 use Tpetry\PostgresqlEnhanced\Types\IssnType;
+use Tpetry\PostgresqlEnhanced\Types\LaravelType;
 use Tpetry\PostgresqlEnhanced\Types\LtreeType;
 use Tpetry\PostgresqlEnhanced\Types\NummultirangeType;
 use Tpetry\PostgresqlEnhanced\Types\NumrangeType;
@@ -105,7 +106,7 @@ public function register(): void
     protected function registerDoctrineTypes(): void
     {
         foreach ($this->doctrineTypes as $type) {
-            /** @var Type $typeInstance */
+            /** @var Type&LaravelType $typeInstance */
             $typeInstance = new $type();
 
             if (!Type::hasType($typeInstance->getName())) {

src/Types/BaseType.php

@@ -5,30 +5,31 @@
 namespace Tpetry\PostgresqlEnhanced\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Types\Type;
 
-abstract class BaseType extends Type
+abstract class BaseType extends Type implements LaravelType
 {
     /**
      * Gets an array of database types that map to this Doctrine type.
      */
-    public function getMappedDatabaseTypes(AbstractPlatform $platform)
+    public function getMappedDatabaseTypes(AbstractPlatform $platform): array
     {
-        return match ($platform->getName()) {
-            'pgsql', 'postgres', 'postgresql' => [$this->getSQLDeclaration([], $platform)],
+        return match (true) {
+            $platform instanceof PostgreSQLPlatform => [$this->getSQLDeclaration([], $platform)],
             default => [],
         };
     }
 
     /**
      * Gets the name of this type.
      */
-    abstract public function getName();
+    abstract public function getName(): string;
 
     /**
      * Gets the SQL declaration snippet for a column of this type.
      */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return $this->getName();
     }

src/Types/BitType.php

@@ -5,33 +5,34 @@
 namespace Tpetry\PostgresqlEnhanced\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Types\StringType;
 
-class BitType extends StringType
+class BitType extends StringType implements LaravelType
 {
     /**
      * Gets an array of database types that map to this Doctrine type.
      */
-    public function getMappedDatabaseTypes(AbstractPlatform $platform)
+    public function getMappedDatabaseTypes(AbstractPlatform $platform): array
     {
-        return match ($platform->getName()) {
-            'pgsql', 'postgres', 'postgresql' => [$this->getName()],
+        return match (true) {
+            $platform instanceof PostgreSQLPlatform => [$this->getName()],
             default => [],
         };
     }
 
     /**
      * Gets the name of this type.
      */
-    public function getName()
+    public function getName(): string
     {
         return 'bit';
     }
 
     /**
      * Gets the SQL declaration snippet for a column of this type.
      */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return "bit({$column['length']})";
     }

src/Types/CidrType.php

@@ -9,7 +9,7 @@ class CidrType extends BaseType
     /**
      * Gets the name of this type.
      */
-    public function getName()
+    public function getName(): string
     {
         return 'cidr';
     }

src/Types/CitextType.php

@@ -9,7 +9,7 @@ class CitextType extends BaseType
     /**
      * Gets the name of this type.
      */
-    public function getName()
+    public function getName(): string
     {
         return 'citext';
     }

src/Types/DatemultirangeType.php

@@ -9,7 +9,7 @@ class DatemultirangeType extends BaseType
     /**
      * Gets the name of this type.
      */
-    public function getName()
+    public function getName(): string
     {
         return 'datemultirange';
     }

src/Types/DaterangeType.php

@@ -9,7 +9,7 @@ class DaterangeType extends BaseType
     /**
      * Gets the name of this type.
      */
-    public function getName()
+    public function getName(): string
     {
         return 'daterange';
     }

src/Types/Ean13Type.php

@@ -9,7 +9,7 @@ class Ean13Type extends BaseType
     /**
      * Gets the name of this type.
      */
-    public function getName()
+    public function getName(): string
     {
         return 'ean13';
     }