Skip to content

Commit d3a8edb

Browse files
MauricioFauthMauricioFauth
committed
Update Psalm/PHPStan baselines
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent edfe8a5 commit d3a8edb

File tree

2 files changed

+156
-80
lines changed

2 files changed

+156
-80
lines changed

‎phpstan-baseline.neon‎

Lines changed: 105 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,6 @@ parameters:
400400
count: 1
401401
path: libraries/classes/Config/FormDisplay.php
402402

403-
-
404-
message: "#^Cannot cast mixed to string\\.$#"
405-
count: 1
406-
path: libraries/classes/Config/FormDisplay.php
407-
408403
-
409404
message: "#^Call to function function_exists\\(\\) with 'bzcompress'\\|'gzcompress'\\|'gzencode' will always evaluate to true\\.$#"
410405
count: 1
@@ -420,6 +415,11 @@ parameters:
420415
count: 2
421416
path: libraries/classes/Config/FormDisplay.php
422417

418+
-
419+
message: "#^Cannot cast mixed to string\\.$#"
420+
count: 1
421+
path: libraries/classes/Config/FormDisplay.php
422+
423423
-
424424
message: "#^Method PhpMyAdmin\\\\Config\\\\FormDisplay\\:\\:displayFieldInput\\(\\) has parameter \\$jsDefault with no value type specified in iterable type array\\.$#"
425425
count: 1
@@ -1540,11 +1540,56 @@ parameters:
15401540
count: 1
15411541
path: libraries/classes/Controllers/Table/SearchController.php
15421542

1543+
-
1544+
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
1545+
count: 1
1546+
path: libraries/classes/Controllers/Table/Structure/AddIndexController.php
1547+
1548+
-
1549+
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
1550+
count: 1
1551+
path: libraries/classes/Controllers/Table/Structure/AddIndexController.php
1552+
1553+
-
1554+
message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
1555+
count: 1
1556+
path: libraries/classes/Controllers/Table/Structure/AddIndexController.php
1557+
1558+
-
1559+
message: "#^Parameter \\#1 \\$field_select of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:syncUniqueColumns\\(\\) expects array, mixed given\\.$#"
1560+
count: 1
1561+
path: libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php
1562+
1563+
-
1564+
message: "#^Parameter \\#2 \\$field_select of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:deleteColumnsFromList\\(\\) expects array, mixed given\\.$#"
1565+
count: 1
1566+
path: libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php
1567+
15431568
-
15441569
message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\Structure\\\\ChangeController\\:\\:displayHtmlForColumnChange\\(\\) has parameter \\$selected with no value type specified in iterable type array\\.$#"
15451570
count: 1
15461571
path: libraries/classes/Controllers/Table/Structure/ChangeController.php
15471572

1573+
-
1574+
message: "#^Parameter \\#1 \\$selected of method PhpMyAdmin\\\\Controllers\\\\Table\\\\Structure\\\\ChangeController\\:\\:displayHtmlForColumnChange\\(\\) expects array\\|null, mixed given\\.$#"
1575+
count: 1
1576+
path: libraries/classes/Controllers/Table/Structure/ChangeController.php
1577+
1578+
-
1579+
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
1580+
count: 1
1581+
path: libraries/classes/Controllers/Table/Structure/FulltextController.php
1582+
1583+
-
1584+
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
1585+
count: 1
1586+
path: libraries/classes/Controllers/Table/Structure/FulltextController.php
1587+
1588+
-
1589+
message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
1590+
count: 1
1591+
path: libraries/classes/Controllers/Table/Structure/FulltextController.php
1592+
15481593
-
15491594
message: "#^Cannot cast mixed to string\\.$#"
15501595
count: 6
@@ -1570,6 +1615,31 @@ parameters:
15701615
count: 1
15711616
path: libraries/classes/Controllers/Table/Structure/PartitioningController.php
15721617

1618+
-
1619+
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
1620+
count: 1
1621+
path: libraries/classes/Controllers/Table/Structure/PrimaryController.php
1622+
1623+
-
1624+
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
1625+
count: 1
1626+
path: libraries/classes/Controllers/Table/Structure/PrimaryController.php
1627+
1628+
-
1629+
message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
1630+
count: 1
1631+
path: libraries/classes/Controllers/Table/Structure/PrimaryController.php
1632+
1633+
-
1634+
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
1635+
count: 1
1636+
path: libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php
1637+
1638+
-
1639+
message: "#^Parameter \\#1 \\$str of function trim expects string, mixed given\\.$#"
1640+
count: 2
1641+
path: libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php
1642+
15731643
-
15741644
message: "#^Cannot cast mixed to string\\.$#"
15751645
count: 1
@@ -1620,6 +1690,36 @@ parameters:
16201690
count: 2
16211691
path: libraries/classes/Controllers/Table/Structure/SaveController.php
16221692

1693+
-
1694+
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
1695+
count: 1
1696+
path: libraries/classes/Controllers/Table/Structure/SpatialController.php
1697+
1698+
-
1699+
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
1700+
count: 1
1701+
path: libraries/classes/Controllers/Table/Structure/SpatialController.php
1702+
1703+
-
1704+
message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
1705+
count: 1
1706+
path: libraries/classes/Controllers/Table/Structure/SpatialController.php
1707+
1708+
-
1709+
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
1710+
count: 1
1711+
path: libraries/classes/Controllers/Table/Structure/UniqueController.php
1712+
1713+
-
1714+
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
1715+
count: 1
1716+
path: libraries/classes/Controllers/Table/Structure/UniqueController.php
1717+
1718+
-
1719+
message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
1720+
count: 1
1721+
path: libraries/classes/Controllers/Table/Structure/UniqueController.php
1722+
16231723
-
16241724
message: "#^Cannot use array destructuring on array\\|null\\.$#"
16251725
count: 7

‎psalm-baseline.xml‎

Lines changed: 51 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,10 +1933,8 @@
19331933
<MixedArrayAssignment occurrences="1">
19341934
<code>$_SESSION['tmpval']['aliases']</code>
19351935
</MixedArrayAssignment>
1936-
<MixedAssignment occurrences="150">
1936+
<MixedAssignment occurrences="148">
19371937
<code>$GLOBALS['active_page']</code>
1938-
<code>$GLOBALS['aliases']</code>
1939-
<code>$GLOBALS['aliases']</code>
19401938
<code>$GLOBALS['allrows']</code>
19411939
<code>$GLOBALS['allrows']</code>
19421940
<code>$GLOBALS['as_separate_files']</code>
@@ -3905,18 +3903,14 @@
39053903
</PossiblyInvalidArgument>
39063904
</file>
39073905
<file src="libraries/classes/Controllers/Table/Structure/AddIndexController.php">
3908-
<MixedArgument occurrences="1">
3906+
<MixedArgument occurrences="2">
39093907
<code>$field</code>
3908+
<code>$selected</code>
39103909
</MixedArgument>
3911-
<MixedAssignment occurrences="1">
3910+
<MixedAssignment occurrences="2">
39123911
<code>$field</code>
3913-
</MixedAssignment>
3914-
<PossiblyInvalidArgument occurrences="1">
3915-
<code>$selected</code>
3916-
</PossiblyInvalidArgument>
3917-
<PossiblyInvalidIterator occurrences="1">
39183912
<code>$selected</code>
3919-
</PossiblyInvalidIterator>
3913+
</MixedAssignment>
39203914
</file>
39213915
<file src="libraries/classes/Controllers/Table/Structure/AddKeyController.php">
39223916
<MixedAssignment occurrences="1">
@@ -3938,46 +3932,53 @@
39383932
</PossiblyInvalidIterator>
39393933
</file>
39403934
<file src="libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php">
3941-
<PossiblyInvalidArgument occurrences="1">
3935+
<MixedArgument occurrences="1">
39423936
<code>$selected</code>
3943-
</PossiblyInvalidArgument>
3937+
</MixedArgument>
3938+
<MixedAssignment occurrences="1">
3939+
<code>$selected</code>
3940+
</MixedAssignment>
39443941
</file>
39453942
<file src="libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php">
3946-
<PossiblyInvalidArgument occurrences="1">
3943+
<MixedArgument occurrences="1">
39473944
<code>$selected</code>
3948-
</PossiblyInvalidArgument>
3945+
</MixedArgument>
3946+
<MixedAssignment occurrences="1">
3947+
<code>$selected</code>
3948+
</MixedAssignment>
39493949
</file>
39503950
<file src="libraries/classes/Controllers/Table/Structure/ChangeController.php">
3951-
<MixedArgument occurrences="1">
3951+
<MixedArgument occurrences="2">
3952+
<code>$selected</code>
39523953
<code>$selected[$i]</code>
39533954
</MixedArgument>
3954-
<MixedAssignment occurrences="1">
3955+
<MixedAssignment occurrences="2">
39553956
<code>$GLOBALS['num_fields']</code>
3956-
</MixedAssignment>
3957-
<PossiblyInvalidArgument occurrences="2">
39583957
<code>$selected</code>
3958+
</MixedAssignment>
3959+
<PossiblyInvalidArgument occurrences="1">
39593960
<code>$selected[$i]</code>
39603961
</PossiblyInvalidArgument>
39613962
<PossiblyInvalidCast occurrences="1">
39623963
<code>$selected[$i]</code>
39633964
</PossiblyInvalidCast>
39643965
</file>
39653966
<file src="libraries/classes/Controllers/Table/Structure/FulltextController.php">
3966-
<MixedArgument occurrences="1">
3967+
<MixedArgument occurrences="2">
39673968
<code>$field</code>
3969+
<code>$selected</code>
39683970
</MixedArgument>
3969-
<MixedAssignment occurrences="1">
3971+
<MixedAssignment occurrences="2">
39703972
<code>$field</code>
3971-
</MixedAssignment>
3972-
<PossiblyInvalidArgument occurrences="1">
39733973
<code>$selected</code>
3974-
</PossiblyInvalidArgument>
3975-
<PossiblyInvalidIterator occurrences="1">
3976-
<code>$selected</code>
3977-
</PossiblyInvalidIterator>
3974+
</MixedAssignment>
39783975
</file>
39793976
<file src="libraries/classes/Controllers/Table/Structure/MoveColumnsController.php">
3980-
<MixedArgument occurrences="12">
3977+
<MixedArgument occurrences="16">
3978+
<code>$column</code>
3979+
<code>$column</code>
3980+
<code>$column</code>
3981+
<code>$column</code>
39813982
<code>$current_timestamp ? '' : $data['Default']</code>
39823983
<code>$data['Collation'] ?? ''</code>
39833984
<code>$data['Expression']</code>
@@ -4004,24 +4005,16 @@
40044005
<code>$data['Expression']</code>
40054006
<code>$data['Virtuality']</code>
40064007
</MixedArrayAssignment>
4007-
<MixedAssignment occurrences="2">
4008+
<MixedArrayOffset occurrences="2">
4009+
<code>$columns[$column]</code>
4010+
<code>$expressions[$column]</code>
4011+
</MixedArrayOffset>
4012+
<MixedAssignment occurrences="3">
4013+
<code>$column</code>
40084014
<code>$data</code>
40094015
<code>$data['Expression']</code>
40104016
</MixedAssignment>
40114017
<PossiblyFalseArgument occurrences="2"/>
4012-
<PossiblyInvalidArgument occurrences="3">
4013-
<code>$column</code>
4014-
<code>$column</code>
4015-
<code>$column</code>
4016-
</PossiblyInvalidArgument>
4017-
<PossiblyInvalidArrayOffset occurrences="2">
4018-
<code>$columns[$column]</code>
4019-
<code>$expressions[$column]</code>
4020-
</PossiblyInvalidArrayOffset>
4021-
<PossiblyInvalidCast occurrences="2">
4022-
<code>$column</code>
4023-
<code>$column</code>
4024-
</PossiblyInvalidCast>
40254018
<PossiblyNullArgument occurrences="4">
40264019
<code>$current_timestamp ? '' : $data['Default']</code>
40274020
<code>$data['Collation'] ?? ''</code>
@@ -4046,39 +4039,30 @@
40464039
</RedundantConditionGivenDocblockType>
40474040
</file>
40484041
<file src="libraries/classes/Controllers/Table/Structure/PrimaryController.php">
4049-
<MixedArgument occurrences="1">
4042+
<MixedArgument occurrences="2">
40504043
<code>$field</code>
4044+
<code>$selected</code>
40514045
</MixedArgument>
4052-
<MixedAssignment occurrences="3">
4046+
<MixedAssignment occurrences="6">
40534047
<code>$GLOBALS['errorUrl']</code>
40544048
<code>$field</code>
40554049
<code>$mult_btn</code>
4056-
</MixedAssignment>
4057-
<PossiblyInvalidArgument occurrences="1">
40584050
<code>$selected</code>
4059-
</PossiblyInvalidArgument>
4060-
<PossiblyInvalidIterator occurrences="1">
40614051
<code>$selected</code>
4062-
</PossiblyInvalidIterator>
4052+
<code>$selected_fld</code>
4053+
</MixedAssignment>
40634054
<PossiblyNullOperand occurrences="1">
40644055
<code>$row['Column_name']</code>
40654056
</PossiblyNullOperand>
40664057
</file>
40674058
<file src="libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php">
4068-
<MixedArgument occurrences="2">
4069-
<code>$column</code>
4059+
<MixedArgument occurrences="1">
40704060
<code>$column</code>
40714061
</MixedArgument>
4072-
<MixedAssignment occurrences="1">
4073-
<code>$column</code>
4074-
</MixedAssignment>
4075-
<PossiblyInvalidArgument occurrences="2">
4076-
<code>$column</code>
4062+
<MixedAssignment occurrences="2">
40774063
<code>$column</code>
4078-
</PossiblyInvalidArgument>
4079-
<PossiblyInvalidIterator occurrences="1">
40804064
<code>$columns_names</code>
4081-
</PossiblyInvalidIterator>
4065+
</MixedAssignment>
40824066
</file>
40834067
<file src="libraries/classes/Controllers/Table/Structure/SaveController.php">
40844068
<InvalidArgument occurrences="1">
@@ -4164,32 +4148,24 @@
41644148
</PossiblyInvalidOperand>
41654149
</file>
41664150
<file src="libraries/classes/Controllers/Table/Structure/SpatialController.php">
4167-
<MixedArgument occurrences="1">
4151+
<MixedArgument occurrences="2">
41684152
<code>$field</code>
4153+
<code>$selected</code>
41694154
</MixedArgument>
4170-
<MixedAssignment occurrences="1">
4155+
<MixedAssignment occurrences="2">
41714156
<code>$field</code>
4172-
</MixedAssignment>
4173-
<PossiblyInvalidArgument occurrences="1">
4174-
<code>$selected</code>
4175-
</PossiblyInvalidArgument>
4176-
<PossiblyInvalidIterator occurrences="1">
41774157
<code>$selected</code>
4178-
</PossiblyInvalidIterator>
4158+
</MixedAssignment>
41794159
</file>
41804160
<file src="libraries/classes/Controllers/Table/Structure/UniqueController.php">
4181-
<MixedArgument occurrences="1">
4161+
<MixedArgument occurrences="2">
41824162
<code>$field</code>
4163+
<code>$selected</code>
41834164
</MixedArgument>
4184-
<MixedAssignment occurrences="1">
4165+
<MixedAssignment occurrences="2">
41854166
<code>$field</code>
4186-
</MixedAssignment>
4187-
<PossiblyInvalidArgument occurrences="1">
41884167
<code>$selected</code>
4189-
</PossiblyInvalidArgument>
4190-
<PossiblyInvalidIterator occurrences="1">
4191-
<code>$selected</code>
4192-
</PossiblyInvalidIterator>
4168+
</MixedAssignment>
41934169
</file>
41944170
<file src="libraries/classes/Controllers/Table/StructureController.php">
41954171
<MixedArgument occurrences="12">

0 commit comments

Comments
 (0)