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

Drop $errorUrl from exportData

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-12-12 22:08:58 +00:00
parent 95af8a812c
commit 0131d59250
31 changed files with 21 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
psalm-baseline.xml
View File

@ -5525,6 +5525,10 @@
<PossiblyNullArrayAccess>
<code><![CDATA[$error['message']]]></code>
</PossiblyNullArrayAccess>
<PossiblyUnusedParam>
<code><![CDATA[$errorUrl]]></code>
<code><![CDATA[$errorUrl]]></code>
</PossiblyUnusedParam>
<RiskyTruthyFalsyComparison>
<code><![CDATA[! ini_get('zlib.output_compression')]]></code>
<code><![CDATA[empty($_POST['onserver_overwrite'])]]></code>

4
src/Export/Export.php
View File

@ -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;
}
}

2
src/Plugins/Export/ExportCodegen.php
View File

@ -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 {

4
src/Plugins/Export/ExportCsv.php
View File

@ -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);
}
}

2
src/Plugins/Export/ExportHtmlword.php
View File

@ -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 {

2
src/Plugins/Export/ExportJson.php
View File

@ -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 {

4
src/Plugins/Export/ExportLatex.php
View File

@ -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);
}
/**

4
src/Plugins/Export/ExportMediawiki.php
View File

@ -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);
}
/**

4
src/Plugins/Export/ExportOds.php
View File

@ -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);
}
}

4
src/Plugins/Export/ExportOdt.php
View File

@ -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);
}
/**

2
src/Plugins/Export/ExportPdf.php
View File

@ -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 {

4
src/Plugins/Export/ExportPhparray.php
View File

@ -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);
}
}

7
src/Plugins/Export/ExportSql.php
View File

@ -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 {

4
src/Plugins/Export/ExportTexytext.php
View File

@ -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);
}
/**

2
src/Plugins/Export/ExportXml.php
View File

@ -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 {

4
src/Plugins/Export/ExportYaml.php
View File

@ -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);
}
}

2
src/Plugins/ExportPlugin.php
View File

@ -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;

4
tests/unit/Plugins/Export/ExportCodegenTest.php
View File

@ -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.');
}

6
tests/unit/Plugins/Export/ExportCsvTest.php
View File

@ -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();

1
tests/unit/Plugins/Export/ExportHtmlwordTest.php
View File

@ -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();

2
tests/unit/Plugins/Export/ExportJsonTest.php
View File

@ -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`;',
),
);

2
tests/unit/Plugins/Export/ExportLatexTest.php
View File

@ -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();

1
tests/unit/Plugins/Export/ExportMediawikiTest.php
View File

@ -294,7 +294,6 @@ class ExportMediawikiTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
),
);

3
tests/unit/Plugins/Export/ExportOdsTest.php
View File

@ -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',
),
);

3
tests/unit/Plugins/Export/ExportOdtTest.php
View File

@ -399,7 +399,6 @@ class ExportOdtTest extends AbstractTestCase
$this->object->exportData(
'db',
'ta<ble',
'example.com',
'SELECT',
),
);
@ -468,7 +467,6 @@ class ExportOdtTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);
@ -522,7 +520,6 @@ class ExportOdtTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);

1
tests/unit/Plugins/Export/ExportPdfTest.php
View File

@ -233,7 +233,6 @@ class ExportPdfTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'phpmyadmin.net/err',
'SELECT',
),
);

2
tests/unit/Plugins/Export/ExportPhparrayTest.php
View File

@ -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`;',
),
);

8
tests/unit/Plugins/Export/ExportSqlTest.php
View File

@ -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();

1
tests/unit/Plugins/Export/ExportTexytextTest.php
View File

@ -220,7 +220,6 @@ class ExportTexytextTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
),
);

1
tests/unit/Plugins/Export/ExportXmlTest.php
View File

@ -380,7 +380,6 @@ class ExportXmlTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
),
);

1
tests/unit/Plugins/Export/ExportYamlTest.php
View File

@ -163,7 +163,6 @@ class ExportYamlTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table_yaml`;',
),
);