Merge pull request #698 from ausi/fix/doctrine-3-comparator

Restore compatibility with Doctrine DBAL version 3
web-auth · Mar 8, 2025 · 7ef33c3 · 7ef33c3
2 parents a5f3223 + a63146a
commit 7ef33c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php b/src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php
@@ -5,10 +5,10 @@
 namespace Webauthn\Bundle\Doctrine\Type;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\JsonType;
 use Webauthn\AttestedCredentialData;
 
-final class AttestedCredentialDataType extends Type
+final class AttestedCredentialDataType extends JsonType
 {
     use SerializerTrait;
 
@@ -30,11 +30,6 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Attested
         return $this->deserialize($value, AttestedCredentialData::class);
     }
 
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return $platform->getJsonTypeDeclarationSQL($column);
-    }
-
     public function getName(): string
     {
         return 'attested_credential_data';

diff --git a/src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php b/src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php
@@ -5,10 +5,10 @@
 namespace Webauthn\Bundle\Doctrine\Type;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\JsonType;
 use Webauthn\PublicKeyCredentialDescriptor;
 
-final class PublicKeyCredentialDescriptorType extends Type
+final class PublicKeyCredentialDescriptorType extends JsonType
 {
     use SerializerTrait;
 
@@ -30,11 +30,6 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?PublicKe
         return $this->deserialize($value, PublicKeyCredentialDescriptor::class);
     }
 
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return $platform->getJsonTypeDeclarationSQL($column);
-    }
-
     public function getName(): string
     {
         return 'public_key_credential_descriptor';

diff --git a/src/symfony/src/Doctrine/Type/TrustPathDataType.php b/src/symfony/src/Doctrine/Type/TrustPathDataType.php
@@ -5,10 +5,10 @@
 namespace Webauthn\Bundle\Doctrine\Type;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\JsonType;
 use Webauthn\TrustPath\TrustPath;
 
-final class TrustPathDataType extends Type
+final class TrustPathDataType extends JsonType
 {
     use SerializerTrait;
 
@@ -30,11 +30,6 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?TrustPat
         return $this->deserialize($value, TrustPath::class);
     }
 
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return $platform->getJsonTypeDeclarationSQL($column);
-    }
-
     public function getName(): string
     {
         return 'trust_path';