From 7cc03fa4f49d793b40a6e5df68681c1cf5c260b2 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Wed, 29 Jan 2025 09:34:22 +0700 Subject: [PATCH 1/2] Replace `DbArrayHelper::getColumn()` with `array_column()` --- src/Schema.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Schema.php b/src/Schema.php index 4781f837e..e55d19f84 100644 --- a/src/Schema.php +++ b/src/Schema.php @@ -24,6 +24,7 @@ use Yiisoft\Db\Schema\TableSchemaInterface; use function array_change_key_case; +use function array_column; use function array_map; use function array_unique; use function array_values; @@ -326,7 +327,7 @@ protected function loadTableIndexes(string $tableName): array foreach ($indexes as $name => $index) { $ic = (new IndexConstraint()) ->name($name) - ->columnNames(DbArrayHelper::getColumn($index, 'column_name')) + ->columnNames(array_column($index, 'column_name')) ->primary($index[0]['index_is_primary']) ->unique($index[0]['index_is_unique']); @@ -871,7 +872,7 @@ private function loadTableConstraints(string $tableName, string $returnType): ar case 'p': $result[self::PRIMARY_KEY] = (new Constraint()) ->name($name) - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')); + ->columnNames(array_column($constraint, 'column_name')); break; case 'f': $onDelete = $actionTypes[$constraint[0]['on_delete']] ?? null; @@ -880,12 +881,12 @@ private function loadTableConstraints(string $tableName, string $returnType): ar $result[self::FOREIGN_KEYS][] = (new ForeignKeyConstraint()) ->name($name) ->columnNames(array_values( - array_unique(DbArrayHelper::getColumn($constraint, 'column_name')) + array_unique(array_column($constraint, 'column_name')) )) ->foreignSchemaName($constraint[0]['foreign_table_schema']) ->foreignTableName($constraint[0]['foreign_table_name']) ->foreignColumnNames(array_values( - array_unique(DbArrayHelper::getColumn($constraint, 'foreign_column_name')) + array_unique(array_column($constraint, 'foreign_column_name')) )) ->onDelete($onDelete) ->onUpdate($onUpdate); @@ -893,12 +894,12 @@ private function loadTableConstraints(string $tableName, string $returnType): ar case 'u': $result[self::UNIQUES][] = (new Constraint()) ->name($name) - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')); + ->columnNames(array_column($constraint, 'column_name')); break; case 'c': $result[self::CHECKS][] = (new CheckConstraint()) ->name($name) - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')) + ->columnNames(array_column($constraint, 'column_name')) ->expression($constraint[0]['check_expr']); break; } From c4287f558e29a1a74756be1d19bed84bee971765 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Wed, 29 Jan 2025 10:36:39 +0700 Subject: [PATCH 2/2] Add line to CHANGELOG.md [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a43be0222..b8f6bba6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Enh #379: Remove `ColumnInterface` (@Tigrov) - Enh #380: Rename `ColumnSchemaInterface` to `ColumnInterface` (@Tigrov) - Enh #381: Add `ColumnDefinitionParser` class (@Tigrov) +- Enh #382: Replace `DbArrayHelper::getColumn()` with `array_column()` (@Tigrov) ## 1.3.0 March 21, 2024