Skip to content

Merge up 5.1.3 to 5.2.x #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 8, 2025
Merged

Merge up 5.1.3 to 5.2.x #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c42e75
Restore compatibility with Doctrine DBAL version 3
ausi Feb 26, 2025
a63146a
Extend JsonType instead of reimplementing its functionality
ausi Feb 26, 2025
7ef33c3
Merge pull request #698 from ausi/fix/doctrine-3-comparator
Spomky Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

declare(strict_types=1);
Expand All @@ -5,17 +5,17 @@
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;

public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
{
if (! $value instanceof AttestedCredentialData) {
return $value;

Check failure on line 18 in src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php

View workflow job for this annotation

GitHub Actions / 3️⃣ Static Analysis 

Method Webauthn\Bundle\Doctrine\Type\AttestedCredentialDataType::convertToDatabaseValue() should return string|null but returns T of mixed.

Check failure on line 18 in src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php

View workflow job for this annotation

GitHub Actions / 3️⃣ Static Analysis 

Method Webauthn\Bundle\Doctrine\Type\AttestedCredentialDataType::convertToDatabaseValue() should return string|null but returns T of mixed.
}

return $this->serialize($value);
Expand All @@ -30,11 +30,6 @@
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';
Expand Down
9 changes: 2 additions & 7 deletions src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

declare(strict_types=1);
Expand All @@ -5,17 +5,17 @@
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;

public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
{
if (! $value instanceof PublicKeyCredentialDescriptor) {
return $value;

Check failure on line 18 in src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php

View workflow job for this annotation

GitHub Actions / 3️⃣ Static Analysis 

Method Webauthn\Bundle\Doctrine\Type\PublicKeyCredentialDescriptorType::convertToDatabaseValue() should return string|null but returns T of mixed.

Check failure on line 18 in src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php

View workflow job for this annotation

GitHub Actions / 3️⃣ Static Analysis 

Method Webauthn\Bundle\Doctrine\Type\PublicKeyCredentialDescriptorType::convertToDatabaseValue() should return string|null but returns T of mixed.
}

return $this->serialize($value);
Expand All @@ -30,11 +30,6 @@
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';
Expand Down
9 changes: 2 additions & 7 deletions src/symfony/src/Doctrine/Type/TrustPathDataType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

declare(strict_types=1);
Expand All @@ -5,17 +5,17 @@
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;

public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
{
if (! $value instanceof TrustPath) {
return $value;

Check failure on line 18 in src/symfony/src/Doctrine/Type/TrustPathDataType.php

View workflow job for this annotation

GitHub Actions / 3️⃣ Static Analysis 

Method Webauthn\Bundle\Doctrine\Type\TrustPathDataType::convertToDatabaseValue() should return string|null but returns T of mixed.

Check failure on line 18 in src/symfony/src/Doctrine/Type/TrustPathDataType.php

View workflow job for this annotation

GitHub Actions / 3️⃣ Static Analysis 

Method Webauthn\Bundle\Doctrine\Type\TrustPathDataType::convertToDatabaseValue() should return string|null but returns T of mixed.
}

return $this->serialize($value);
Expand All @@ -30,11 +30,6 @@
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';
Expand Down
Loading