From 3a5f6c924d9d5e25935e483d42cdeac2952c0178 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Fri, 12 May 2023 22:14:26 +0100 Subject: [PATCH] getTableDef in ExportHtmlword Signed-off-by: Kamil Tekiela --- libraries/classes/Plugins/Export/ExportHtmlword.php | 6 ++---- psalm-baseline.xml | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index d0dd231329..27ef29f524 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -317,7 +317,6 @@ class ExportHtmlword extends ExportPlugin * export types which use this parameter * @param bool $doMime whether to include mime comments * at the end - * @param bool $view whether we're handling a view * @param mixed[] $aliases Aliases of db/table/columns * * @return string resulting schema @@ -328,7 +327,6 @@ class ExportHtmlword extends ExportPlugin bool $doRelation, bool $doComments, bool $doMime, - bool $view = false, array $aliases = [], ): string { $relationParameters = $this->relation->getRelationParameters(); @@ -532,7 +530,7 @@ class ExportHtmlword extends ExportPlugin . __('Table structure for table') . ' ' . htmlspecialchars($tableAlias) . ''; - $dump .= $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, false, $aliases); + $dump .= $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, $aliases); break; case 'triggers': $triggers = Triggers::getDetails($GLOBALS['dbi'], $db, $table); @@ -548,7 +546,7 @@ class ExportHtmlword extends ExportPlugin $dump .= '

' . __('Structure for view') . ' ' . htmlspecialchars($tableAlias) . '

'; - $dump .= $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, true, $aliases); + $dump .= $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, $aliases); break; case 'stand_in': $dump .= '

' diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 9c46f8adf4..596412652a 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -9210,9 +9210,6 @@ $comments $mimeMap - - $view - bool