From 0131d59250f7d156b6b50cdb478fd7faa235978e Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 12 Dec 2024 22:08:58 +0000 Subject: [PATCH] Drop $errorUrl from exportData Signed-off-by: Kamil Tekiela --- psalm-baseline.xml | 4 ++++ src/Export/Export.php | 4 ++-- src/Plugins/Export/ExportCodegen.php | 2 -- src/Plugins/Export/ExportCsv.php | 4 +--- src/Plugins/Export/ExportHtmlword.php | 2 -- src/Plugins/Export/ExportJson.php | 2 -- src/Plugins/Export/ExportLatex.php | 4 +--- src/Plugins/Export/ExportMediawiki.php | 4 +--- src/Plugins/Export/ExportOds.php | 4 +--- src/Plugins/Export/ExportOdt.php | 4 +--- src/Plugins/Export/ExportPdf.php | 2 -- src/Plugins/Export/ExportPhparray.php | 4 +--- src/Plugins/Export/ExportSql.php | 7 +------ src/Plugins/Export/ExportTexytext.php | 4 +--- src/Plugins/Export/ExportXml.php | 2 -- src/Plugins/Export/ExportYaml.php | 4 +--- src/Plugins/ExportPlugin.php | 2 -- tests/unit/Plugins/Export/ExportCodegenTest.php | 4 ++-- tests/unit/Plugins/Export/ExportCsvTest.php | 6 ------ tests/unit/Plugins/Export/ExportHtmlwordTest.php | 1 - tests/unit/Plugins/Export/ExportJsonTest.php | 2 -- tests/unit/Plugins/Export/ExportLatexTest.php | 2 -- tests/unit/Plugins/Export/ExportMediawikiTest.php | 1 - tests/unit/Plugins/Export/ExportOdsTest.php | 3 --- tests/unit/Plugins/Export/ExportOdtTest.php | 3 --- tests/unit/Plugins/Export/ExportPdfTest.php | 1 - tests/unit/Plugins/Export/ExportPhparrayTest.php | 2 -- tests/unit/Plugins/Export/ExportSqlTest.php | 8 ++++---- tests/unit/Plugins/Export/ExportTexytextTest.php | 1 - tests/unit/Plugins/Export/ExportXmlTest.php | 1 - tests/unit/Plugins/Export/ExportYamlTest.php | 1 - 31 files changed, 21 insertions(+), 74 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 69eb80c16e..c944b4beb4 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -5525,6 +5525,10 @@ + + + + diff --git a/src/Export/Export.php b/src/Export/Export.php index b4cacd7d2e..6746daf347 100644 --- a/src/Export/Export.php +++ b/src/Export/Export.php @@ -707,7 +707,7 @@ class Export . ' FROM ' . Util::backquote($db->getName()) . '.' . Util::backquote($table); - if (! $exportPlugin->exportData($db->getName(), $table, $errorUrl, $localQuery, $aliases)) { + if (! $exportPlugin->exportData($db->getName(), $table, $localQuery, $aliases)) { break; } } @@ -963,7 +963,7 @@ class Export . '.' . Util::backquote($table) . $addQuery; } - if (! $exportPlugin->exportData($db, $table, $errorUrl, $localQuery, $aliases)) { + if (! $exportPlugin->exportData($db, $table, $localQuery, $aliases)) { return; } } diff --git a/src/Plugins/Export/ExportCodegen.php b/src/Plugins/Export/ExportCodegen.php index 256baabb6c..056d4fe4ef 100644 --- a/src/Plugins/Export/ExportCodegen.php +++ b/src/Plugins/Export/ExportCodegen.php @@ -130,14 +130,12 @@ class ExportCodegen extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportCsv.php b/src/Plugins/Export/ExportCsv.php index 804597145f..a53468f3c4 100644 --- a/src/Plugins/Export/ExportCsv.php +++ b/src/Plugins/Export/ExportCsv.php @@ -188,14 +188,12 @@ class ExportCsv extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -317,6 +315,6 @@ class ExportCsv extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/ExportHtmlword.php b/src/Plugins/Export/ExportHtmlword.php index f04b50e6a4..7de23ba12a 100644 --- a/src/Plugins/Export/ExportHtmlword.php +++ b/src/Plugins/Export/ExportHtmlword.php @@ -166,14 +166,12 @@ class ExportHtmlword extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportJson.php b/src/Plugins/Export/ExportJson.php index e68bf8534d..66e474d2c6 100644 --- a/src/Plugins/Export/ExportJson.php +++ b/src/Plugins/Export/ExportJson.php @@ -170,14 +170,12 @@ class ExportJson extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportLatex.php b/src/Plugins/Export/ExportLatex.php index 5ad445936b..054f46a1bd 100644 --- a/src/Plugins/Export/ExportLatex.php +++ b/src/Plugins/Export/ExportLatex.php @@ -272,14 +272,12 @@ class ExportLatex extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -410,7 +408,7 @@ class ExportLatex extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportMediawiki.php b/src/Plugins/Export/ExportMediawiki.php index 86f3972ed7..29ccb114c5 100644 --- a/src/Plugins/Export/ExportMediawiki.php +++ b/src/Plugins/Export/ExportMediawiki.php @@ -242,14 +242,12 @@ class ExportMediawiki extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -330,7 +328,7 @@ class ExportMediawiki extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportOds.php b/src/Plugins/Export/ExportOds.php index 519f3233ac..5f7cec39f4 100644 --- a/src/Plugins/Export/ExportOds.php +++ b/src/Plugins/Export/ExportOds.php @@ -186,14 +186,12 @@ class ExportOds extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -316,6 +314,6 @@ class ExportOds extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/ExportOdt.php b/src/Plugins/Export/ExportOdt.php index 55451a7bd0..6a62cc6947 100644 --- a/src/Plugins/Export/ExportOdt.php +++ b/src/Plugins/Export/ExportOdt.php @@ -212,14 +212,12 @@ class ExportOdt extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -324,7 +322,7 @@ class ExportOdt extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportPdf.php b/src/Plugins/Export/ExportPdf.php index 4d2fc492d1..24d513e1bd 100644 --- a/src/Plugins/Export/ExportPdf.php +++ b/src/Plugins/Export/ExportPdf.php @@ -158,14 +158,12 @@ class ExportPdf extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportPhparray.php b/src/Plugins/Export/ExportPhparray.php index 83f37ec652..483058a596 100644 --- a/src/Plugins/Export/ExportPhparray.php +++ b/src/Plugins/Export/ExportPhparray.php @@ -143,14 +143,12 @@ class ExportPhparray extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -242,6 +240,6 @@ class ExportPhparray extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php index 645df9800d..f949159dda 100644 --- a/src/Plugins/Export/ExportSql.php +++ b/src/Plugins/Export/ExportSql.php @@ -1130,7 +1130,6 @@ class ExportSql extends ExportPlugin ! $this->exportData( $relationParameters->pdfFeature->database->getName(), $relationParameters->pdfFeature->pdfPages->getName(), - '', $sqlQueryRow, $aliases, ) @@ -1156,7 +1155,6 @@ class ExportSql extends ExportPlugin ! $this->exportData( $relationParameters->pdfFeature->database->getName(), $relationParameters->pdfFeature->tableCoords->getName(), - '', $sqlQueryCoords, $aliases, ) @@ -1195,7 +1193,6 @@ class ExportSql extends ExportPlugin ! $this->exportData( (string) $relationParameters->db, (string) $relationParams[$type], - '', $sqlQuery, $aliases, ) @@ -1869,7 +1866,7 @@ class ExportSql extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** @@ -2033,14 +2030,12 @@ class ExportSql extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportTexytext.php b/src/Plugins/Export/ExportTexytext.php index 8dd696e790..4b058ba501 100644 --- a/src/Plugins/Export/ExportTexytext.php +++ b/src/Plugins/Export/ExportTexytext.php @@ -150,14 +150,12 @@ class ExportTexytext extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -242,7 +240,7 @@ class ExportTexytext extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportXml.php b/src/Plugins/Export/ExportXml.php index 518267b64a..032023bf51 100644 --- a/src/Plugins/Export/ExportXml.php +++ b/src/Plugins/Export/ExportXml.php @@ -397,14 +397,12 @@ class ExportXml extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportYaml.php b/src/Plugins/Export/ExportYaml.php index fba11e75c3..15eea1720f 100644 --- a/src/Plugins/Export/ExportYaml.php +++ b/src/Plugins/Export/ExportYaml.php @@ -118,14 +118,12 @@ class ExportYaml extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -206,6 +204,6 @@ class ExportYaml extends ExportPlugin DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/ExportPlugin.php b/src/Plugins/ExportPlugin.php index b9709fc207..e87fd769cb 100644 --- a/src/Plugins/ExportPlugin.php +++ b/src/Plugins/ExportPlugin.php @@ -76,14 +76,12 @@ abstract class ExportPlugin implements Plugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ abstract public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool; diff --git a/tests/unit/Plugins/Export/ExportCodegenTest.php b/tests/unit/Plugins/Export/ExportCodegenTest.php index 7b84bf6627..9f5fa435e2 100644 --- a/tests/unit/Plugins/Export/ExportCodegenTest.php +++ b/tests/unit/Plugins/Export/ExportCodegenTest.php @@ -174,7 +174,7 @@ class ExportCodegenTest extends AbstractTestCase $GLOBALS['save_on_server'] = false; ob_start(); - $this->object->exportData('test_db', 'test_table', 'localhost', 'SELECT * FROM `test_db`.`test_table`;'); + $this->object->exportData('test_db', 'test_table', 'SELECT * FROM `test_db`.`test_table`;'); $result = ob_get_clean(); self::assertIsString($result); @@ -199,7 +199,7 @@ class ExportCodegenTest extends AbstractTestCase $GLOBALS['codegen_format'] = 4; - $this->object->exportData('test_db', 'test_table', 'localhost', 'SELECT * FROM `test_db`.`test_table`;'); + $this->object->exportData('test_db', 'test_table', 'SELECT * FROM `test_db`.`test_table`;'); $this->expectOutputString('4 is not supported.'); } diff --git a/tests/unit/Plugins/Export/ExportCsvTest.php b/tests/unit/Plugins/Export/ExportCsvTest.php index e46e4478fc..b0de9ff66b 100644 --- a/tests/unit/Plugins/Export/ExportCsvTest.php +++ b/tests/unit/Plugins/Export/ExportCsvTest.php @@ -383,7 +383,6 @@ class ExportCsvTest extends AbstractTestCase self::assertFalse($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); ob_get_clean(); @@ -403,7 +402,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -421,7 +419,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -442,7 +439,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -462,7 +458,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -481,7 +476,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportHtmlwordTest.php b/tests/unit/Plugins/Export/ExportHtmlwordTest.php index 01e9516e64..d887222d94 100644 --- a/tests/unit/Plugins/Export/ExportHtmlwordTest.php +++ b/tests/unit/Plugins/Export/ExportHtmlwordTest.php @@ -304,7 +304,6 @@ class ExportHtmlwordTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportJsonTest.php b/tests/unit/Plugins/Export/ExportJsonTest.php index 1fc67376fb..9b6b6a917f 100644 --- a/tests/unit/Plugins/Export/ExportJsonTest.php +++ b/tests/unit/Plugins/Export/ExportJsonTest.php @@ -179,7 +179,6 @@ class ExportJsonTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); } @@ -202,7 +201,6 @@ class ExportJsonTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table_complex', - 'example.com', 'SELECT * FROM `test_db`.`test_table_complex`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportLatexTest.php b/tests/unit/Plugins/Export/ExportLatexTest.php index c69a47ccab..877a1e050b 100644 --- a/tests/unit/Plugins/Export/ExportLatexTest.php +++ b/tests/unit/Plugins/Export/ExportLatexTest.php @@ -492,7 +492,6 @@ class ExportLatexTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -523,7 +522,6 @@ class ExportLatexTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportMediawikiTest.php b/tests/unit/Plugins/Export/ExportMediawikiTest.php index 96ce6adaa0..8492ac8d0f 100644 --- a/tests/unit/Plugins/Export/ExportMediawikiTest.php +++ b/tests/unit/Plugins/Export/ExportMediawikiTest.php @@ -294,7 +294,6 @@ class ExportMediawikiTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportOdsTest.php b/tests/unit/Plugins/Export/ExportOdsTest.php index d7025a521e..8205ccf1e9 100644 --- a/tests/unit/Plugins/Export/ExportOdsTest.php +++ b/tests/unit/Plugins/Export/ExportOdsTest.php @@ -264,7 +264,6 @@ class ExportOdsTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); @@ -340,7 +339,6 @@ class ExportOdsTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); @@ -392,7 +390,6 @@ class ExportOdsTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); diff --git a/tests/unit/Plugins/Export/ExportOdtTest.php b/tests/unit/Plugins/Export/ExportOdtTest.php index 44ad146fcc..1868a63943 100644 --- a/tests/unit/Plugins/Export/ExportOdtTest.php +++ b/tests/unit/Plugins/Export/ExportOdtTest.php @@ -399,7 +399,6 @@ class ExportOdtTest extends AbstractTestCase $this->object->exportData( 'db', 'taobject->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); @@ -522,7 +520,6 @@ class ExportOdtTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); diff --git a/tests/unit/Plugins/Export/ExportPdfTest.php b/tests/unit/Plugins/Export/ExportPdfTest.php index e533abc2a6..0f327af1b6 100644 --- a/tests/unit/Plugins/Export/ExportPdfTest.php +++ b/tests/unit/Plugins/Export/ExportPdfTest.php @@ -233,7 +233,6 @@ class ExportPdfTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'phpmyadmin.net/err', 'SELECT', ), ); diff --git a/tests/unit/Plugins/Export/ExportPhparrayTest.php b/tests/unit/Plugins/Export/ExportPhparrayTest.php index be531f9808..f12327d258 100644 --- a/tests/unit/Plugins/Export/ExportPhparrayTest.php +++ b/tests/unit/Plugins/Export/ExportPhparrayTest.php @@ -173,7 +173,6 @@ class ExportPhparrayTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'phpmyadmin.net/err', 'SELECT * FROM `test_db`.`test_table`;', ), ); @@ -195,7 +194,6 @@ class ExportPhparrayTest extends AbstractTestCase $this->object->exportData( 'test_db', '0`932table', - 'phpmyadmin.net/err', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportSqlTest.php b/tests/unit/Plugins/Export/ExportSqlTest.php index f3c1db2656..d9a74d7736 100644 --- a/tests/unit/Plugins/Export/ExportSqlTest.php +++ b/tests/unit/Plugins/Export/ExportSqlTest.php @@ -1095,7 +1095,7 @@ SQL; $this->object->useSqlBackquotes(true); ob_start(); - $this->object->exportData('db', 'table', 'example.com/err', 'SELECT a FROM b WHERE 1'); + $this->object->exportData('db', 'table', 'SELECT a FROM b WHERE 1'); $result = ob_get_clean(); self::assertIsString($result); @@ -1191,7 +1191,7 @@ SQL; $this->object->useSqlBackquotes(true); ob_start(); - $this->object->exportData('db', 'table', 'example.com/err', 'SELECT a FROM b WHERE 1'); + $this->object->exportData('db', 'table', 'SELECT a FROM b WHERE 1'); $result = ob_get_clean(); self::assertIsString($result); @@ -1234,7 +1234,7 @@ SQL; ob_start(); self::assertTrue( - $this->object->exportData('db', 'tbl', 'err.com', 'SELECT'), + $this->object->exportData('db', 'tbl', 'SELECT'), ); $result = ob_get_clean(); @@ -1279,7 +1279,7 @@ SQL; ob_start(); self::assertTrue( - $this->object->exportData('db', 'table', 'err.com', 'SELECT'), + $this->object->exportData('db', 'table', 'SELECT'), ); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportTexytextTest.php b/tests/unit/Plugins/Export/ExportTexytextTest.php index 1ccd811224..eb45bbd83f 100644 --- a/tests/unit/Plugins/Export/ExportTexytextTest.php +++ b/tests/unit/Plugins/Export/ExportTexytextTest.php @@ -220,7 +220,6 @@ class ExportTexytextTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportXmlTest.php b/tests/unit/Plugins/Export/ExportXmlTest.php index 04394e1cc6..3ab87ac212 100644 --- a/tests/unit/Plugins/Export/ExportXmlTest.php +++ b/tests/unit/Plugins/Export/ExportXmlTest.php @@ -380,7 +380,6 @@ class ExportXmlTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportYamlTest.php b/tests/unit/Plugins/Export/ExportYamlTest.php index d9712113ae..a9097f1ed5 100644 --- a/tests/unit/Plugins/Export/ExportYamlTest.php +++ b/tests/unit/Plugins/Export/ExportYamlTest.php @@ -163,7 +163,6 @@ class ExportYamlTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table_yaml`;', ), );