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

Inline controller method

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-12-18 22:50:52 +01:00
parent c028d421d7
commit 0b6e5fd1a0
3 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -1610,11 +1610,6 @@ parameters:
count: 2
path: src/Controllers/Database/DesignerController.php
-
message: "#^Parameter \\#1 \\$db of method PhpMyAdmin\\\\Database\\\\Designer\\:\\:getDatabaseTables\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Controllers/Database/DesignerController.php
-
message: "#^Parameter \\#1 \\$db of method PhpMyAdmin\\\\Database\\\\Designer\\:\\:getHtmlForEditOrDeletePages\\(\\) expects string, mixed given\\.$#"
count: 2

26
src/Controllers/Database/DesignerController.php
View File

@ -64,15 +64,23 @@ class DesignerController extends AbstractController
$tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
$tablesPkOrUniqueKeys = $this->designerCommon->getPkOrUniqueKeys($scriptDisplayField);
$html = $this->databaseDesigner->getDatabaseTables(
$db,
$scriptDisplayField,
[],
-1,
$tableColumn,
$tablesAllKeys,
$tablesPkOrUniqueKeys,
);
$GLOBALS['text_dir'] ??= null;
$columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesPkOrUniqueKeys);
$html = $this->template->render('database/designer/database_tables', [
'db' => Current::$database,
'text_dir' => $GLOBALS['text_dir'],
'get_db' => $db,
'has_query' => isset($_REQUEST['query']),
'tab_pos' => [],
'display_page' => -1,
'tab_column' => $tableColumn,
'tables_all_keys' => $tablesAllKeys,
'tables_pk_or_unique_keys' => $tablesPkOrUniqueKeys,
'tables' => $scriptDisplayField,
'columns_type' => $columnsType,
]);
}
if ($html !== '') {

44
src/Database/Designer.php
View File

@ -6,7 +6,6 @@ namespace PhpMyAdmin\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Designer\ColumnInfo;
use PhpMyAdmin\Database\Designer\DesignerTable;
use PhpMyAdmin\DatabaseInterface;
@ -210,47 +209,6 @@ class Designer
return $classesArray;
}
/**
* Get HTML to display tables on designer page
*
* @param string $db The database name from the request
* @param DesignerTable[] $designerTables The designer tables
* @param mixed[] $tabPos tables positions
* @param int $displayPage page number of the selected page
* @param list<ColumnInfo>[] $tableColumnsInfo table column info
* @param mixed[] $tablesAllKeys all indices
* @param mixed[] $tablesPkOrUniqueKeys unique or primary indices
*
* @return string html
*/
public function getDatabaseTables(
string $db,
array $designerTables,
array $tabPos,
int $displayPage,
array $tableColumnsInfo,
array $tablesAllKeys,
array $tablesPkOrUniqueKeys,
): string {
$GLOBALS['text_dir'] ??= null;
$columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesPkOrUniqueKeys);
return $this->template->render('database/designer/database_tables', [
'db' => Current::$database,
'text_dir' => $GLOBALS['text_dir'],
'get_db' => $db,
'has_query' => isset($_REQUEST['query']),
'tab_pos' => $tabPos,
'display_page' => $displayPage,
'tab_column' => $tableColumnsInfo,
'tables_all_keys' => $tablesAllKeys,
'tables_pk_or_unique_keys' => $tablesPkOrUniqueKeys,
'tables' => $designerTables,
'columns_type' => $columnsType,
]);
}
/**
* Returns HTML for Designer page
*
@ -335,7 +293,7 @@ class Designer
*
* @return array<string, string>
*/
private function getColumnTypes(array $tableColumnsInfo, array $tablesPkOrUniqueKeys): array
public function getColumnTypes(array $tableColumnsInfo, array $tablesPkOrUniqueKeys): array
{
$columnsType = [];
foreach ($tableColumnsInfo as $tableName => $columnsInfo) {