Skip to content

Commit 986d8f1

Browse files
committed
Fix deprecation: Don't rely on db specific varchar size
Relying on the default column size for varchar fields is deprecated. This change configures all varchar custom types to rely on the previous default value of 255, if not overridden. See \Doctrine\DBAL\Platforms\AbstractPlatform::getVarcharDefaultLength See doctrine/dbal#3263
1 parent 6becada commit 986d8f1

10 files changed

Lines changed: 40 additions & 1 deletion

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ class CommonNameType extends Type
3434

3535
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3636
{
37+
if (!isset($column['length'])) {
38+
$column['length'] = 255;
39+
}
40+
3741
return $platform->getStringTypeDeclarationSQL($column);
3842
}
3943

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class ConfigurationInstitutionType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36+
if (!isset($column['length'])) {
37+
$column['length'] = 255;
38+
}
39+
3640
return $platform->getStringTypeDeclarationSQL($column);
3741
}
3842

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ class DocumentNumberType extends Type
3535

3636
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3737
{
38+
if (!isset($column['length'])) {
39+
$column['length'] = 255;
40+
}
41+
3842
return $platform->getStringTypeDeclarationSQL($column);
3943
}
4044

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class EmailType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36+
if (!isset($column['length'])) {
37+
$column['length'] = 255;
38+
}
39+
3640
return $platform->getStringTypeDeclarationSQL($column);
3741
}
3842

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class InstitutionRoleType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36+
if (!isset($column['length'])) {
37+
$column['length'] = 255;
38+
}
39+
3640
return $platform->getStringTypeDeclarationSQL($column);
3741
}
3842

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class InstitutionType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36+
if (!isset($column['length'])) {
37+
$column['length'] = 255;
38+
}
39+
3640
return $platform->getStringTypeDeclarationSQL($column);
3741
}
3842

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ class LocaleType extends Type
3636

3737
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3838
{
39+
if (!isset($column['length'])) {
40+
$column['length'] = 255;
41+
}
42+
3943
return $platform->getStringTypeDeclarationSQL($column);
4044
}
4145

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class NameIdType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36+
if (!isset($column['length'])) {
37+
$column['length'] = 255;
38+
}
39+
3640
return $platform->getStringTypeDeclarationSQL($column);
3741
}
3842

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ class RaLocationNameType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36-
return $platform->getStringTypeDeclarationSQL([]);
36+
$clearColumn = [];
37+
$clearColumn['length'] = 255;
38+
39+
return $platform->getStringTypeDeclarationSQL($clearColumn);
3740
}
3841

3942
public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class SecondFactorTypeType extends Type
3333

3434
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
3535
{
36+
if (!isset($column['length'])) {
37+
$column['length'] = 255;
38+
}
39+
3640
return $platform->getStringTypeDeclarationSQL($column);
3741
}
3842

0 commit comments

Comments
 (0)