Skip to content
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.

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

Add proper types to Doctrine\DBAL\Types namespace. #3569

Merged
merged 1 commit into from
May 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/ArrayType.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ArrayType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getClobTypeDeclarationSQL($fieldDeclaration);
}
Expand Down Expand Up @@ -60,15 +60,15 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::ARRAY;
}

/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/BigIntType.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ class BigIntType extends Type implements PhpIntegerMappingType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::BIGINT;
}

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

/**
* {@inheritdoc}
*/
public function getBindingType()
public function getBindingType() : int
{
return ParameterType::STRING;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/BinaryType.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class BinaryType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getBinaryTypeDeclarationSQL($fieldDeclaration);
}
Expand Down Expand Up @@ -47,15 +47,15 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::BINARY;
}

/**
* {@inheritdoc}
*/
public function getBindingType()
public function getBindingType() : int
{
return ParameterType::BINARY;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/BlobType.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class BlobType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getBlobTypeDeclarationSQL($fieldDeclaration);
}
Expand Down Expand Up @@ -54,15 +54,15 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::BLOB;
}

/**
* {@inheritdoc}
*/
public function getBindingType()
public function getBindingType() : int
{
return ParameterType::LARGE_OBJECT;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/BooleanType.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class BooleanType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getBooleanTypeDeclarationSQL($fieldDeclaration);
}
Expand All @@ -39,15 +39,15 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::BOOLEAN;
}

/**
* {@inheritdoc}
*/
public function getBindingType()
public function getBindingType() : int
{
return ParameterType::BOOLEAN;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DateImmutableType.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class DateImmutableType extends DateType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATE_IMMUTABLE;
}
Expand Down Expand Up @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/DateIntervalType.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ class DateIntervalType extends Type
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATEINTERVAL;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
$fieldDeclaration['length'] = 255;

Expand Down Expand Up @@ -84,7 +84,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DateTimeImmutableType.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class DateTimeImmutableType extends DateTimeType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATETIME_IMMUTABLE;
}
Expand Down Expand Up @@ -72,7 +72,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DateTimeType.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ class DateTimeType extends Type implements PhpDateTimeMappingType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATETIME_MUTABLE;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getDateTimeTypeDeclarationSQL($fieldDeclaration);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DateTimeTzImmutableType.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class DateTimeTzImmutableType extends DateTimeTzType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATETIMETZ_IMMUTABLE;
}
Expand Down Expand Up @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DateTimeTzType.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ class DateTimeTzType extends Type implements PhpDateTimeMappingType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATETIMETZ_MUTABLE;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getDateTimeTzTypeDeclarationSQL($fieldDeclaration);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DateType.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ class DateType extends Type
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DATE_MUTABLE;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getDateTypeDeclarationSQL($fieldDeclaration);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/DecimalType.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ class DecimalType extends Type
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::DECIMAL;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getDecimalTypeDeclarationSQL($fieldDeclaration);
}
Expand Down
5 changes: 4 additions & 1 deletion lib/Doctrine/DBAL/Types/Exception/ValueNotConvertible.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
*/
final class ValueNotConvertible extends ConversionException implements TypesException
{
public static function new($value, $toType, ?string $message = null) : self
/**
* @param mixed $value
*/
public static function new($value, string $toType, ?string $message = null) : self
{
if ($message !== null) {
return new self(
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Types/FloatType.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ class FloatType extends Type
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::FLOAT;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getFloatDeclarationSQL($fieldDeclaration);
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/GuidType.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ class GuidType extends StringType
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getGuidTypeDeclarationSQL($fieldDeclaration);
}

/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::GUID;
}

/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return ! $platform->hasNativeGuidType();
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/IntegerType.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ class IntegerType extends Type implements PhpIntegerMappingType
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::INTEGER;
}

/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration);
}
Expand All @@ -39,7 +39,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getBindingType()
public function getBindingType() : int
{
return ParameterType::INTEGER;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Types/JsonType.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class JsonType extends Type
/**
* {@inheritdoc}
*/
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
{
return $platform->getJsonTypeDeclarationSQL($fieldDeclaration);
}
Expand Down Expand Up @@ -71,15 +71,15 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getName()
public function getName() : string
{
return Types::JSON;
}

/**
* {@inheritdoc}
*/
public function requiresSQLCommentHint(AbstractPlatform $platform)
public function requiresSQLCommentHint(AbstractPlatform $platform) : bool
{
return ! $platform->hasNativeJsonType();
}
Expand Down