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

Remove invalid type union

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-09-27 22:30:41 +01:00
parent 57a27fd9a2
commit 9db72b5f62
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -1255,11 +1255,6 @@ parameters:
count: 2
path: src/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$foreigners of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:searchColumnInForeigners\\(\\) expects array, array\\|true given\\.$#"
count: 1
path: src/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
count: 7

3
psalm-baseline.xml
View File

@ -755,9 +755,6 @@
<code><![CDATA[$this->config->selectedServer['column_info']]]></code>
<code><![CDATA[$this->config->selectedServer['column_info']]]></code>
</PossiblyFalseArgument>
<PossiblyInvalidArgument>
<code><![CDATA[$foreigners]]></code>
</PossiblyInvalidArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[bool]]></code>
</PossiblyUnusedReturnValue>

20
src/ConfigStorage/Relation.php
View File

@ -887,17 +887,17 @@ class Relation
/**
* Gets foreign keys in preparation for a drop-down selector
*
* @param mixed[]|bool $foreigners array of the foreign keys
* @param string $field the foreign field name
* @param bool $overrideTotal whether to override the total
* @param string $foreignFilter a possible filter
* @param string $foreignLimit a possible LIMIT clause
* @param bool $getTotal optional, whether to get total num of rows
* in $foreignData['the_total;]
* (has an effect of performance)
* @param mixed[] $foreigners array of the foreign keys
* @param string $field the foreign field name
* @param bool $overrideTotal whether to override the total
* @param string $foreignFilter a possible filter
* @param string $foreignLimit a possible LIMIT clause
* @param bool $getTotal optional, whether to get total num of rows
* in $foreignData['the_total;]
* (has an effect of performance)
*/
public function getForeignData(
array|bool $foreigners,
array $foreigners,
string $field,
bool $overrideTotal,
string $foreignFilter,
@ -909,7 +909,7 @@ class Relation
$foreignLink = false;
$dispRow = $foreignDisplay = $theTotal = $foreignField = null;
do {
if ($foreigners === false || $foreigners === []) {
if ($foreigners === []) {
break;
}