Skip to content

Call DbArrayHelper::arrange() instead of DbArrayHelper::index() #350

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
Tigrov merged 3 commits into from
Apr 6, 2025
Merged

Call DbArrayHelper::arrange() instead of DbArrayHelper::index() #350

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95bf3ac
Call `DbArrayHelper::arrange()` instead of `DbArrayHelper::index()`
Tigrov Apr 6, 2025
ca27910
Fix psalm
Tigrov Apr 6, 2025
25e30c3
Add line to CHANGELOG.md [skip ci]
Tigrov Apr 6, 2025
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
7 changes: 2 additions & 5 deletions src/Schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ protected function loadTableForeignKeys(string $tableName): array

$foreignKeysList = $this->getPragmaForeignKeyList($tableName);
/** @psalm-var GroupedForeignKeyInfo $foreignKeysList */
$foreignKeysList = DbArrayHelper::index($foreignKeysList, null, ['table', 'id']);
$foreignKeysList = DbArrayHelper::arrange($foreignKeysList, ['table', 'id']);

foreach ($foreignKeysList as $table => $foreignKeysById) {
/**
Expand Down Expand Up @@ -453,11 +453,8 @@ private function loadColumn(array $info): ColumnInterface
private function loadTableColumnsInfo(string $tableName): array
{
$tableColumns = $this->getPragmaTableInfo($tableName);
/** @psalm-var ColumnInfo[] $tableColumns */
$tableColumns = array_map(array_change_key_case(...), $tableColumns);

/** @psalm-var ColumnInfo[] */
return DbArrayHelper::index($tableColumns, 'cid');
return array_map(array_change_key_case(...), $tableColumns);
}

/**
Expand Down