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

Remove nullability from $db param

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2026-01-22 15:31:01 +00:00
parent d6a93684e9
commit 6b502d72ad
14 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,16 +213,16 @@ class ExportCsv extends ExportPlugin
/**
* Outputs result of raw query in CSV format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/** @inheritDoc */

10
src/Plugins/Export/ExportExcel.php
View File

@ -211,16 +211,16 @@ class ExportExcel extends ExportPlugin
/**
* Outputs result of raw query in CSV format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/** @inheritDoc */

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

@ -276,10 +276,10 @@ class ExportJson extends ExportPlugin
/**
* Outputs result raw query in JSON format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
$buffer = $this->encode(['type' => 'raw', 'data' => '@@DATA@@']);
if ($buffer === false) {
@ -287,7 +287,7 @@ class ExportJson extends ExportPlugin
}
$dbi = DatabaseInterface::getInstance();
if ($db !== null) {
if ($db !== '') {
$dbi->selectDb($db);
}

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

@ -371,16 +371,16 @@ class ExportLatex extends ExportPlugin
/**
* Outputs result raw query
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/**

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

@ -246,16 +246,16 @@ class ExportMediawiki extends ExportPlugin
/**
* Outputs result raw query in MediaWiki format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/**

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

@ -259,16 +259,16 @@ class ExportOds extends ExportPlugin
/**
* Outputs result raw query in ODS format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/** @inheritDoc */

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

@ -281,16 +281,16 @@ class ExportOdt extends ExportPlugin
/**
* Outputs result raw query in ODT format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/**

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

@ -135,16 +135,16 @@ class ExportPdf extends ExportPlugin
/**
* Outputs result of raw query in PDF format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
$this->pdf->setDbAlias('----');
$this->pdf->setTableAlias('----');
$this->pdf->setPurpose(__('Query result data'));
if ($db !== null) {
if ($db !== '') {
$this->pdf->setCurrentDb($db);
DatabaseInterface::getInstance()->selectDb($db);
}

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

@ -191,16 +191,16 @@ class ExportPhparray extends ExportPlugin
/**
* Outputs result of raw query as PHP array
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/** @inheritDoc */

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

@ -1807,16 +1807,16 @@ class ExportSql extends ExportPlugin
/**
* Outputs a raw query
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/**

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

@ -185,16 +185,16 @@ class ExportTexytext extends ExportPlugin
/**
* Outputs result raw query in TexyText format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/**

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

@ -151,16 +151,16 @@ class ExportYaml extends ExportPlugin
/**
* Outputs result raw query in YAML format
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
if ($db !== null) {
if ($db !== '') {
DatabaseInterface::getInstance()->selectDb($db);
}
$this->exportData($db ?? '', '', $sqlQuery);
$this->exportData($db, '', $sqlQuery);
}
/** @inheritDoc */

6
src/Plugins/ExportPlugin.php
View File

@ -129,10 +129,10 @@ abstract class ExportPlugin implements Plugin
/**
* Outputs for raw query
*
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
* @param string $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string|null $db, string $sqlQuery): void
public function exportRawQuery(string $db, string $sqlQuery): void
{
}

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

@ -194,6 +194,6 @@ class ExportJsonTest extends AbstractTestCase
. "]\n}\n",
);
$this->object->exportRawQuery(null, 'SELECT * FROM `test_db`.`test_table_complex`;');
$this->object->exportRawQuery('', 'SELECT * FROM `test_db`.`test_table_complex`;');
}
}