Visitar URL original
Merge pull request #18770 from kamil-tekiela/Fix-getSpecialLinkUrl · phpmyadmin/phpmyadmin@0da0721 · GitHub
Skip to content

Commit 0da0721

Browse files
Merge pull request #18770 from kamil-tekiela/Fix-getSpecialLinkUrl
Fix param type in getSpecialLinkUrl()
2 parents ec5c8ad + 073a940 commit 0da0721

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

‎phpstan-baseline.neon‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9980,6 +9980,11 @@ parameters:
99809980
count: 1
99819981
path: src/Display/Results.php
99829982

9983+
-
9984+
message: "#^Parameter \\#1 \\$params of static method PhpMyAdmin\\\\Url\\:\\:getCommonRaw\\(\\) expects array\\<int\\|string, bool\\|int\\|string\\>, array\\<string, string\\|null\\> given\\.$#"
9985+
count: 1
9986+
path: src/Display/Results.php
9987+
99839988
-
99849989
message: "#^Parameter \\#1 \\$sqlQuery of static method PhpMyAdmin\\\\Core\\:\\:signSqlQuery\\(\\) expects string, mixed given\\.$#"
99859990
count: 4
@@ -10011,7 +10016,7 @@ parameters:
1001110016
path: src/Display/Results.php
1001210017

1001310018
-
10014-
message: "#^Parameter \\#2 \\$columnValue of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getSpecialLinkUrl\\(\\) expects string, mixed given\\.$#"
10019+
message: "#^Parameter \\#2 \\$columnValue of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getSpecialLinkUrl\\(\\) expects string\\|null, mixed given\\.$#"
1001510020
count: 1
1001610021
path: src/Display/Results.php
1001710022

‎psalm-baseline.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5525,6 +5525,8 @@
55255525
</DeprecatedMethod>
55265526
<InvalidArgument>
55275527
<code>$added[$orgFullTableName]</code>
5528+
<code>$linkingUrlParams</code>
5529+
<code>$linkingUrlParams</code>
55285530
<code>$multiOrderUrlParams</code>
55295531
<code>$sortExpressionNoDirection</code>
55305532
</InvalidArgument>
@@ -5585,7 +5587,6 @@
55855587
<code><![CDATA[empty($field->database) ? $this->properties['db'] : $field->database]]></code>
55865588
</MixedArgument>
55875589
<MixedArgumentTypeCoercion>
5588-
<code>$linkingUrlParams</code>
55895590
<code>$row</code>
55905591
<code>$sortDirection</code>
55915592
<code>$sortExpression</code>

‎src/Display/Results.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2487,7 +2487,6 @@ private function getRowValues(
24872487
* Get link for display special schema links
24882488
*
24892489
* @param array<string,array<int,array<string,string>>|string> $linkRelations
2490-
* @param string $columnValue column value
24912490
* @param mixed[] $rowInfo information about row
24922491
* @phpstan-param array{
24932492
* 'link_param': string,
@@ -2502,7 +2501,7 @@ private function getRowValues(
25022501
*/
25032502
private function getSpecialLinkUrl(
25042503
array $linkRelations,
2505-
string $columnValue,
2504+
string|null $columnValue,
25062505
array $rowInfo,
25072506
): string {
25082507
$linkingUrlParams = [];

0 commit comments

Comments
 (0)