diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index ad6605b283..a2f8b69e1e 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -305,35 +305,27 @@ class ExportTexytext extends ExportPlugin /** * Returns $table's CREATE definition * - * @param string $db the database name - * @param string $table the table name - * @param string $errorUrl the url to go back in case of error - * @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 - * $this->exportStructure() also for other - * export types which use this parameter - * @param bool $doMime whether to include mime comments - * @param bool $showDates whether to include creation/update/check dates - * @param bool $addSemicolon whether to add semicolon and end-of-line - * at the end - * @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 + * $this->exportStructure() also for other + * export types which use this parameter + * @param bool $doMime whether to include mime comments + * at the end + * @param mixed[] $aliases Aliases of db/table/columns * * @return string resulting schema */ public function getTableDef( string $db, string $table, - string $errorUrl, bool $doRelation, bool $doComments, bool $doMime, - bool $showDates = false, - bool $addSemicolon = true, - bool $view = false, array $aliases = [], ): string { $relationParameters = $this->relation->getRelationParameters(); @@ -503,18 +495,7 @@ class ExportTexytext extends ExportPlugin case 'create_table': $dump .= '== ' . __('Table structure for table') . ' ' . $tableAlias . "\n\n"; - $dump .= $this->getTableDef( - $db, - $table, - $errorUrl, - $doRelation, - $doComments, - $doMime, - $dates, - true, - false, - $aliases, - ); + $dump .= $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, $aliases); break; case 'triggers': $triggers = Triggers::getDetails($GLOBALS['dbi'], $db, $table); @@ -526,18 +507,7 @@ class ExportTexytext extends ExportPlugin break; case 'create_view': $dump .= '== ' . __('Structure for view') . ' ' . $tableAlias . "\n\n"; - $dump .= $this->getTableDef( - $db, - $table, - $errorUrl, - $doRelation, - $doComments, - $doMime, - $dates, - true, - true, - $aliases, - ); + $dump .= $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, $aliases); break; case 'stand_in': $dump .= '== ' . __('Stand-in structure for view') diff --git a/psalm-baseline.xml b/psalm-baseline.xml index d4a1941072..80400fa342 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -9735,12 +9735,6 @@ $comments $mimeMap - - $addSemicolon - $errorUrl - $showDates - $view - diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php index 450c23905c..11b0e2942f 100644 --- a/test/classes/Plugins/Export/ExportTexytextTest.php +++ b/test/classes/Plugins/Export/ExportTexytextTest.php @@ -310,7 +310,7 @@ class ExportTexytextTest extends AbstractTestCase [$GLOBALS['server'] => $relationParameters], ); - $result = $this->object->getTableDef('db', 'table', 'example.com', true, true, true); + $result = $this->object->getTableDef('db', 'table', true, true, true); $this->assertStringContainsString('1|<ftable (ffield>)|comm|Test<', $result); }