Visitar URL original
Merge #20283 - Upgrading phpstan/phpstan (2.1.41 => 2.1.47) · phpmyadmin/phpmyadmin@ad78a57 · GitHub
Skip to content

Commit ad78a57

Browse files
committed
Merge #20283 - Upgrading phpstan/phpstan (2.1.41 => 2.1.47)
Pull-request: #20283 Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents 95058f7 + ce86769 commit ad78a57

4 files changed

Lines changed: 33 additions & 15 deletions

File tree

‎composer.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpstan-baseline.neon‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,12 @@ parameters:
10201020
count: 1
10211021
path: src/Config/Validator.php
10221022

1023+
-
1024+
message: '#^Offset ''Servers/1…'' on non\-empty\-array\<mixed\> in empty\(\) always exists and is not falsy\.$#'
1025+
identifier: empty.offset
1026+
count: 1
1027+
path: src/Config/Validator.php
1028+
10231029
-
10241030
message: '#^Only booleans are allowed in a negated boolean, mysqli\|false given\.$#'
10251031
identifier: booleanNot.exprNotBoolean
@@ -4788,6 +4794,12 @@ parameters:
47884794
count: 1
47894795
path: src/Dbal/DatabaseInterface.php
47904796

4797+
-
4798+
message: '#^Cannot assign new offset to array\<string\|null\>\|string\|null\.$#'
4799+
identifier: offsetAssign.dimType
4800+
count: 1
4801+
path: src/Dbal/DatabaseInterface.php
4802+
47914803
-
47924804
message: '#^Cannot cast mixed to string\.$#'
47934805
identifier: cast.string
@@ -4806,6 +4818,12 @@ parameters:
48064818
count: 1
48074819
path: src/Dbal/DatabaseInterface.php
48084820

4821+
-
4822+
message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:fetchResultMultidimensional\(\) should return array\<mixed\> but returns array\<string\|null\>\|string\|null\.$#'
4823+
identifier: return.type
4824+
count: 1
4825+
path: src/Dbal/DatabaseInterface.php
4826+
48094827
-
48104828
message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getColumnNames\(\) should return list\<string\> but returns list\<string\|null\>\.$#'
48114829
identifier: return.type
@@ -4836,12 +4854,6 @@ parameters:
48364854
count: 1
48374855
path: src/Dbal/DatabaseInterface.php
48384856

4839-
-
4840-
message: '#^Offset string\|null on array\{\} in isset\(\) does not exist\.$#'
4841-
identifier: isset.offset
4842-
count: 1
4843-
path: src/Dbal/DatabaseInterface.php
4844-
48454857
-
48464858
message: '#^Only booleans are allowed in &&, int\|false given on the left side\.$#'
48474859
identifier: booleanAnd.leftNotBoolean
@@ -6438,7 +6450,13 @@ parameters:
64386450
-
64396451
message: '#^Cannot access offset int\<0, max\> on mixed\.$#'
64406452
identifier: offsetAccess.nonOffsetAccessible
6441-
count: 8
6453+
count: 6
6454+
path: src/Gis/GisMultiPolygon.php
6455+
6456+
-
6457+
message: '#^Cannot access offset int\<0, max\> on non\-empty\-array\<''data_length''\|int\<0, max\>, array\{x\: float, y\: float\}\|int\<0, max\>\>\|int\<1, max\>\.$#'
6458+
identifier: offsetAccess.nonOffsetAccessible
6459+
count: 1
64426460
path: src/Gis/GisMultiPolygon.php
64436461

64446462
-

‎psalm-baseline.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8042,12 +8042,12 @@
80428042
<code><![CDATA[$statement->altered]]></code>
80438043
<code><![CDATA[$statement->altered]]></code>
80448044
</PossiblyNullIterator>
8045+
<PossiblyUndefinedVariable>
8046+
<code><![CDATA[$maintainRelations]]></code>
8047+
</PossiblyUndefinedVariable>
80458048
<RiskyTruthyFalsyComparison>
80468049
<code><![CDATA[! $relationParams[$work]]]></code>
80478050
</RiskyTruthyFalsyComparison>
8048-
<UnusedVariable>
8049-
<code><![CDATA[$maintainRelations]]></code>
8050-
</UnusedVariable>
80518051
</file>
80528052
<file src="src/Theme/Theme.php">
80538053
<MixedArgument>

‎src/Table/TableMover.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function moveCopy(
9898
return true;
9999
}
100100

101-
if ($what === MoveScope::DataOnly || isset($maintainRelations)) {
101+
if ($what === MoveScope::DataOnly || $maintainRelations) {
102102
return true;
103103
}
104104

0 commit comments

Comments
 (0)