gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract checkWhetherDatabasesExist()

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-03-22 21:09:44 +01:00
parent bf09fd4f55
commit cdaaf02fb0
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -14250,6 +14250,11 @@ parameters:
count: 2
path: src/Table/TableMover.php
-
message: "#^Parameter \\#1 \\$query of method PhpMyAdmin\\\\DatabaseInterface\\:\\:query\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Table/TableMover.php
-
message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:quoteString\\(\\) expects string, string\\|null given\\.$#"
count: 6

57
src/Table/TableMover.php
View File

@ -60,33 +60,16 @@ class TableMover
}
}
// Setting required export settings.
$GLOBALS['asfile'] = 1;
// Ensuring the target database is valid.
$databaseList = $dbi->getDatabaseList();
if (! $databaseList->exists($sourceDb, $targetDb)) {
if (! $databaseList->exists($sourceDb)) {
$GLOBALS['message'] = Message::rawError(
sprintf(
__('Source database `%s` was not found!'),
htmlspecialchars($sourceDb),
),
);
}
if (! $databaseList->exists($targetDb)) {
$GLOBALS['message'] = Message::rawError(
sprintf(
__('Target database `%s` was not found!'),
htmlspecialchars($targetDb),
),
);
}
$missingDatabaseMessage = self::checkWhetherDatabasesExist($dbi, $sourceDb, $targetDb);
if ($missingDatabaseMessage !== null) {
$GLOBALS['message'] = $missingDatabaseMessage;
return false;
}
// Setting required export settings.
$GLOBALS['asfile'] = 1;
/**
* The full name of source table, quoted.
*/
@ -526,4 +509,32 @@ class TableMover
// Building back the query.
return $statement->build() . ';';
}
private static function checkWhetherDatabasesExist(
DatabaseInterface $dbi,
string $sourceDb,
string $targetDb,
): Message|null {
$databaseList = $dbi->getDatabaseList();
if (! $databaseList->exists($sourceDb)) {
return Message::rawError(
sprintf(
__('Source database `%s` was not found!'),
htmlspecialchars($sourceDb),
),
);
}
if (! $databaseList->exists($targetDb)) {
return Message::rawError(
sprintf(
__('Target database `%s` was not found!'),
htmlspecialchars($targetDb),
),
);
}
return null;
}
}