From d3701b52cf03d6846fe32313f312c1caa22c5688 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Fri, 12 May 2023 22:17:18 +0100 Subject: [PATCH] getTableDef in Pdf Signed-off-by: Kamil Tekiela --- .../classes/Plugins/Export/ExportPdf.php | 4 ++-- .../classes/Plugins/Export/Helpers/Pdf.php | 24 ++++++++----------- psalm-baseline.xml | 4 ---- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index 6d5aa1bc5a..6b47b0924d 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -272,13 +272,13 @@ class ExportPdf extends ExportPlugin */ switch ($exportMode) { case 'create_table': - $pdf->getTableDef($db, $table, $doRelation, true, $doMime, false, $aliases); + $pdf->getTableDef($db, $table, $doRelation, true, $doMime); break; case 'triggers': $pdf->getTriggers($db, $table); break; case 'create_view': - $pdf->getTableDef($db, $table, $doRelation, true, $doMime, false, $aliases); + $pdf->getTableDef($db, $table, $doRelation, true, $doMime); break; case 'stand_in': // export a stand-in definition to resolve view dependencies diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index 3fb67a40cf..3f8dad6824 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -431,18 +431,16 @@ class Pdf extends PdfLib /** * Print $table's CREATE definition * - * @param string $db the database name - * @param string $table the table name - * @param bool $doRelation whether to include relation comments - * @param bool $doComments whether to include the pmadb-style column - * comments as comments in the structure; - * this is deprecated but the parameter is - * left here because /export calls - * PMA_exportStructure() also for other - * export types which use this parameter - * @param bool $doMime whether to include mime comments - * @param bool $view whether we're handling a view - * @param mixed[] $aliases aliases of db/table/columns + * @param string $db the database name + * @param string $table the table name + * @param bool $doRelation whether to include relation comments + * @param bool $doComments whether to include the pmadb-style column + * comments as comments in the structure; + * this is deprecated but the parameter is + * left here because /export calls + * PMA_exportStructure() also for other + * export types which use this parameter + * @param bool $doMime whether to include mime comments */ public function getTableDef( string $db, @@ -450,8 +448,6 @@ class Pdf extends PdfLib bool $doRelation, bool $doComments, bool $doMime, - bool $view = false, - array $aliases = [], ): void { $relationParameters = $this->relation->getRelationParameters(); diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 80400fa342..d8755312f5 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -10089,10 +10089,6 @@ $resRel $resRel - - $aliases - $view - $results Pdf