Update type hints in Doctrine type classes

Bohan Yang · Bohan Yang · commit a6609faee812 · 2024-03-22T08:03:11.000Z
diff --git a/packages/mango/Doctrine/Type/AbstractUidType.php b/packages/mango/Doctrine/Type/AbstractUidType.php
@@ -58,7 +58,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Ab
         }
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         $value = $this->convertToAbstractUid($value);
 
@@ -71,15 +71,15 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
         };
     }
 
-    public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string
+    public function convertToDatabaseValueSQL(string $sqlExpr, AbstractPlatform $platform): string
     {
         return match (true) {
             $platform instanceof OraclePlatform => 'HEXTORAW(' . $sqlExpr . ')',
             default => $sqlExpr,
         };
     }
 
-    private function convertToAbstractUid($value): ?AbstractUid
+    private function convertToAbstractUid(mixed $value): ?AbstractUid
     {
         if ($value instanceof AbstractUid) {
             return $value;
diff --git a/packages/mango/Doctrine/Type/AbstractUsDateTimeType.php b/packages/mango/Doctrine/Type/AbstractUsDateTimeType.php
@@ -29,7 +29,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         };
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed
     {
         if ($value === null) {
             return $value;
@@ -60,7 +60,7 @@ abstract protected function createDateFromFormat(string $format, string $datetim
 
     abstract protected function createDate(string $datetime): mixed;
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): mixed
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
     {
         if ($value === null || is_a($value, $this->getClassName())) {
             return $value;
diff --git a/packages/mango/Doctrine/Type/BackedEnumType.php b/packages/mango/Doctrine/Type/BackedEnumType.php
@@ -38,7 +38,7 @@ private static function getEnumValue(BackedEnum $enum): string
         return $enum->value;
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): int|string|null
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int|string|null
     {
         if (is_a($value, $className = $this->getEnumClass(), false)) {
             $value = self::getEnumValue($value);
@@ -51,7 +51,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): int|
         }
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?BackedEnum
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?BackedEnum
     {
         if ($value === null) {
             return null;
diff --git a/packages/mango/Doctrine/Type/EnumType.php b/packages/mango/Doctrine/Type/EnumType.php
@@ -21,12 +21,12 @@ trait EnumType
         convertToDatabaseValue as convertValueToId;
     }
 
-    public function convertToPHPValueSQL($sqlExpr, $platform): string
+    public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform): string
     {
         return $this->usingTinyInt($platform) ? $this->caseWhenSQL($sqlExpr, $platform) : $sqlExpr;
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): int|string|null
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int|string|null
     {
         $id = $this->convertValueToId($value, $platform);
 
diff --git a/packages/mango/Doctrine/Type/LogLevelType.php b/packages/mango/Doctrine/Type/LogLevelType.php
@@ -36,7 +36,7 @@ private function getEnums(): array
         ];
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): int|string|null
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int|string|null
     {
         if ($value instanceof Level) {
             $value = $value->toPsrLogLevel();
diff --git a/packages/mango/Doctrine/Type/PgTextArrayType.php b/packages/mango/Doctrine/Type/PgTextArrayType.php
@@ -32,26 +32,17 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         return 'text[]';
     }
 
-    public function convertToPHPValueSQL($sqlExpr, $platform): string
+    public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform): string
     {
         return sprintf('array_to_json(%s)', $sqlExpr);
     }
 
-    public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string
+    public function convertToDatabaseValueSQL(string $sqlExpr, AbstractPlatform $platform): string
     {
         return sprintf('jsonb_array_to_text_array(%s)', $sqlExpr);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param T $value
-     *
-     * @return (T is null ? null : string)
-     *
-     * @template T
-     */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed
     {
         if ($value === null) {
             return null;
@@ -64,10 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
     {
         if ($value === null || $value === '') {
             return null;
diff --git a/packages/mango/Doctrine/Type/TinyIntMapping.php b/packages/mango/Doctrine/Type/TinyIntMapping.php
@@ -15,7 +15,7 @@ abstract private function valueToId(string $value): ?int;
 
     abstract private function getValueMap(): array;
 
-    public function convertToPHPValueSQL($sqlExpr, $platform): string
+    public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform): string
     {
         $sql = 'CASE ';
 
diff --git a/packages/mango/Doctrine/Type/TinyIntType.php b/packages/mango/Doctrine/Type/TinyIntType.php
@@ -35,7 +35,7 @@ public function getBindingType(): ParameterType
         return ParameterType::INTEGER;
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): mixed
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
     {
         return $value === null ? null : (int) $value;
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Ab`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string`
	`61`	`+ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string`
`62`	`62`	`{`
`63`	`63`	`$value = $this->convertToAbstractUid($value);`
`64`	`64`
`@@ -71,15 +71,15 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str`
`71`	`71`	`};`
`72`	`72`	`}`
`73`	`73`
`74`		`- public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string`
	`74`	`+ public function convertToDatabaseValueSQL(string $sqlExpr, AbstractPlatform $platform): string`
`75`	`75`	`{`
`76`	`76`	`return match (true) {`
`77`	`77`	`$platform instanceof OraclePlatform => 'HEXTORAW(' . $sqlExpr . ')',`
`78`	`78`	`default => $sqlExpr,`
`79`	`79`	`};`
`80`	`80`	`}`
`81`	`81`
`82`		`- private function convertToAbstractUid($value): ?AbstractUid`
	`82`	`+ private function convertToAbstractUid(mixed $value): ?AbstractUid`
`83`	`83`	`{`
`84`	`84`	`if ($value instanceof AbstractUid) {`
`85`	`85`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st`
`29`	`29`	`};`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed`
	`32`	`+ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed`
`33`	`33`	`{`
`34`	`34`	`if ($value === null) {`
`35`	`35`	`return $value;`
`@@ -60,7 +60,7 @@ abstract protected function createDateFromFormat(string $format, string $datetim`
`60`	`60`
`61`	`61`	`abstract protected function createDate(string $datetime): mixed;`
`62`	`62`
`63`		`- public function convertToPHPValue($value, AbstractPlatform $platform): mixed`
	`63`	`+ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed`
`64`	`64`	`{`
`65`	`65`	`if ($value === null \|\| is_a($value, $this->getClassName())) {`
`66`	`66`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ private static function getEnumValue(BackedEnum $enum): string`
`38`	`38`	`return $enum->value;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): int\|string\|null`
	`41`	`+ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int\|string\|null`
`42`	`42`	`{`
`43`	`43`	`if (is_a($value, $className = $this->getEnumClass(), false)) {`
`44`	`44`	`$value = self::getEnumValue($value);`
`@@ -51,7 +51,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): int\|`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- public function convertToPHPValue($value, AbstractPlatform $platform): ?BackedEnum`
	`54`	`+ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?BackedEnum`
`55`	`55`	`{`
`56`	`56`	`if ($value === null) {`
`57`	`57`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ trait EnumType`
`21`	`21`	`convertToDatabaseValue as convertValueToId;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public function convertToPHPValueSQL($sqlExpr, $platform): string`
	`24`	`+ public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform): string`
`25`	`25`	`{`
`26`	`26`	`return $this->usingTinyInt($platform) ? $this->caseWhenSQL($sqlExpr, $platform) : $sqlExpr;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): int\|string\|null`
	`29`	`+ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int\|string\|null`
`30`	`30`	`{`
`31`	`31`	`$id = $this->convertValueToId($value, $platform);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ private function getEnums(): array`
`36`	`36`	`];`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): int\|string\|null`
	`39`	`+ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int\|string\|null`
`40`	`40`	`{`
`41`	`41`	`if ($value instanceof Level) {`
`42`	`42`	`$value = $value->toPsrLogLevel();`
Original file line number	Diff line number	Diff line change
`@@ -32,26 +32,17 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st`
`32`	`32`	`return 'text[]';`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function convertToPHPValueSQL($sqlExpr, $platform): string`
	`35`	`+ public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform): string`
`36`	`36`	`{`
`37`	`37`	`return sprintf('array_to_json(%s)', $sqlExpr);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform): string`
	`40`	`+ public function convertToDatabaseValueSQL(string $sqlExpr, AbstractPlatform $platform): string`
`41`	`41`	`{`
`42`	`42`	`return sprintf('jsonb_array_to_text_array(%s)', $sqlExpr);`
`43`	`43`	`}`
`44`	`44`
`45`		`- /**`
`46`		`- * {@inheritDoc}`
`47`		`- *`
`48`		`- * @param T $value`
`49`		`- *`
`50`		`- * @return (T is null ? null : string)`
`51`		`- *`
`52`		`- * @template T`
`53`		`- */`
`54`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform)`
	`45`	`+ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed`
`55`	`46`	`{`
`56`	`47`	`if ($value === null) {`
`57`	`48`	`return null;`
`@@ -64,10 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)`
`64`	`55`	`}`
`65`	`56`	`}`
`66`	`57`
`67`		`- /**`
`68`		`- * {@inheritDoc}`
`69`		`- */`
`70`		`- public function convertToPHPValue($value, AbstractPlatform $platform)`
	`58`	`+ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed`
`71`	`59`	`{`
`72`	`60`	`if ($value === null \|\| $value === '') {`
`73`	`61`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ abstract private function valueToId(string $value): ?int;`
`15`	`15`
`16`	`16`	`abstract private function getValueMap(): array;`
`17`	`17`
`18`		`- public function convertToPHPValueSQL($sqlExpr, $platform): string`
	`18`	`+ public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform): string`
`19`	`19`	`{`
`20`	`20`	`$sql = 'CASE ';`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function getBindingType(): ParameterType`
`35`	`35`	`return ParameterType::INTEGER;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function convertToPHPValue($value, AbstractPlatform $platform): mixed`
	`38`	`+ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed`
`39`	`39`	`{`
`40`	`40`	`return $value === null ? null : (int) $value;`
`41`	`41`	`}`