Skip to content

Make test types compatible with Doctrine DBAL 4.0.x-dev #9402

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 1 commit into from
Jan 18, 2022
Merged

Make test types compatible with Doctrine DBAL 4.0.x-dev #9402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions tests/Doctrine/Tests/DbalTypes/CustomIdObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@

class CustomIdObject
{
/** @var string */
public $id;
public string $id;

public function __construct(string $id)
{
$this->id = (string) $id;
$this->id = $id;
}

public function __toString(): string
Expand Down
13 changes: 5 additions & 8 deletions tests/Doctrine/Tests/DbalTypes/CustomIdObjectType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,28 @@ class CustomIdObjectType extends Type
/**
* {@inheritdoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): string
{
return $value->id;
}

/**
* {@inheritdoc}
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): CustomIdObject
{
return new CustomIdObject($value);
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
return $platform->getVarcharTypeDeclarationSQL($column);
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::NAME;
}
Expand Down
13 changes: 5 additions & 8 deletions tests/Doctrine/Tests/DbalTypes/NegativeToPositiveType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,17 @@ class NegativeToPositiveType extends Type
{
public const NAME = 'negative_to_positive';

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::NAME;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration);
return $platform->getIntegerTypeDeclarationSQL($column);
}

/**
Expand All @@ -38,15 +35,15 @@ public function canRequireSQLConversion()
/**
* {@inheritdoc}
*/
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string
{
return 'ABS(' . $sqlExpr . ')';
}

/**
* {@inheritdoc}
*/
public function convertToPHPValueSQL($sqlExpr, $platform)
public function convertToPHPValueSQL($sqlExpr, $platform): string
{
return '-(' . $sqlExpr . ')';
}
Expand Down
16 changes: 6 additions & 10 deletions tests/Doctrine/Tests/DbalTypes/Rot13Type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ class Rot13Type extends Type
*
* @param string|null $value
* @param AbstractPlatform $platform
*
* @return string|null
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
{
if ($value === null) {
return null;
Expand All @@ -36,10 +34,8 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
*
* @param string|null $value
* @param AbstractPlatform $platform
*
* @return string|null
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): ?string
{
if ($value === null) {
return null;
Expand All @@ -51,14 +47,14 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*
* @param array $fieldDeclaration
* @param array $column
* @param AbstractPlatform $platform
*
* @return string
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
return $platform->getVarcharTypeDeclarationSQL($column);
}

/**
Expand All @@ -78,7 +74,7 @@ public function getDefaultLength(AbstractPlatform $platform)
*
* @return string
*/
public function getName()
public function getName(): string
{
return 'rot13';
}
Expand Down
9 changes: 3 additions & 6 deletions tests/Doctrine/Tests/DbalTypes/UpperCaseStringType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ class UpperCaseStringType extends StringType
{
public const NAME = 'upper_case_string';

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::NAME;
}
Expand All @@ -30,15 +27,15 @@ public function canRequireSQLConversion()
/**
* {@inheritdoc}
*/
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string
{
return 'UPPER(' . $sqlExpr . ')';
}

/**
* {@inheritdoc}
*/
public function convertToPHPValueSQL($sqlExpr, $platform)
public function convertToPHPValueSQL($sqlExpr, $platform): string
{
return 'LOWER(' . $sqlExpr . ')';
}
Expand Down
13 changes: 5 additions & 8 deletions tests/Doctrine/Tests/ORM/Functional/GH5988Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,31 +60,28 @@ class GH5988CustomIdObjectHashType extends DBALType
/**
* {@inheritdoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): string
{
return $value->id . '_test';
}

/**
* {@inheritdoc}
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): CustomIdObject
{
return new CustomIdObject(str_replace('_test', '', $value));
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
return $platform->getVarcharTypeDeclarationSQL($column);
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::class;
}
Expand Down
9 changes: 3 additions & 6 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,20 @@ class DDC1998Type extends StringType
/**
* {@inheritdoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): string
{
return (string) $value;
}

/**
* {@inheritDoc}
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): DDC1998Id
{
return new DDC1998Id($value);
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::NAME;
}
Expand Down
17 changes: 8 additions & 9 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ class DDC2012TsVectorType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
return $platform->getVarcharTypeDeclarationSQL($column);
}

/**
* {@inheritdoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
{
if (is_array($value)) {
$value = implode(' ', $value);
Expand All @@ -153,8 +153,10 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)

/**
* {@inheritdoc}
*
* @return list<string>
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): array
{
self::$calls[__FUNCTION__][] = [
'value' => $value,
Expand All @@ -167,7 +169,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string
{
self::$calls[__FUNCTION__][] = [
'sqlExpr' => $sqlExpr,
Expand All @@ -188,10 +190,7 @@ public function canRequireSQLConversion()
return true;
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::MYTYPE;
}
Expand Down
6 changes: 3 additions & 3 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2224Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ class DDC2224Type extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
return $platform->getVarcharTypeDeclarationSQL($column);
}

public function getName(): string
Expand All @@ -74,7 +74,7 @@ public function canRequireSQLConversion()
/**
* {@inheritdoc}
*/
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string
{
return sprintf('FUNCTION(%s)', $sqlExpr);
}
Expand Down
13 changes: 5 additions & 8 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ class DDC2494TinyIntType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getSmallIntTypeDeclarationSQL($fieldDeclaration);
return $platform->getSmallIntTypeDeclarationSQL($column);
}

/**
* {@inheritdoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): string
{
$return = (string) $value;

Expand All @@ -201,7 +201,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): int
{
$return = (int) $value;

Expand All @@ -214,10 +214,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
return $return;
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return 'ddc2494_tinyint';
}
Expand Down
9 changes: 3 additions & 6 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,23 +149,20 @@ class DDC2579Type extends StringType
/**
* {@inheritdoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): string
{
return (string) $value;
}

/**
* {@inheritDoc}
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): DDC2579Id
{
return new DDC2579Id($value);
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName(): string
{
return self::NAME;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public function getName(): string
/**
* {@inheritDoc}
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
public function convertToPHPValue($value, AbstractPlatform $platform): ?DDC2984DomainUserId
{
return ! empty($value)
? new DDC2984DomainUserId($value)
Expand All @@ -165,7 +165,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritDoc}
*/
public function convertToDatabaseValue($value, AbstractPlatform $platform)
public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
{
if (empty($value)) {
return null;
Expand Down
Loading