Refactor AbstractSchema::getDataType() (#786)

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
yiisoft · Nov 26, 2023 · f06cf26 · f06cf26
1 parent f655cb7
commit f06cf26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
   `DbArrayHelper::populate()` methods to `array[]` (@vjik)
 - Enh #779: Specify populate closure type in `BatchQueryResultInterface` (@vjik)
 - Enh #778: Deprecate unnecessary argument `$rawSql` of `AbstractCommand::internalExecute()` (@Tigrov)
+- Enh #786: Refactor `AbstractSchema::getDataType()` (@Tigrov)
 - Enh #784: Specify result type of `ConstraintSchemaInterface::getTableIndexes()` method to `IndexConstraint[]` (@vjik)
 - Enh #784: Remove unused code in `AbstractSchema::getTableIndexes()` (@vjik)
 

diff --git a/src/Schema/AbstractSchema.php b/src/Schema/AbstractSchema.php
@@ -134,19 +134,14 @@ public function getDefaultSchema(): string|null
 
     public function getDataType(mixed $data): int
     {
-        /** @psalm-var array<string, int> $typeMap */
-        $typeMap = [
+        return match (gettype($data)) {
             // php type => SQL data type
             SchemaInterface::PHP_TYPE_BOOLEAN => DataType::BOOLEAN,
             SchemaInterface::PHP_TYPE_INTEGER => DataType::INTEGER,
-            SchemaInterface::PHP_TYPE_STRING => DataType::STRING,
             SchemaInterface::PHP_TYPE_RESOURCE => DataType::LOB,
             SchemaInterface::PHP_TYPE_NULL => DataType::NULL,
-        ];
-
-        $type = gettype($data);
-
-        return $typeMap[$type] ?? DataType::STRING;
+            default => DataType::STRING,
+        };
     }
 
     public function getRawTableName(string $name): string