Skip to content

Commit 548edd4

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19052 from kamil-tekiela/fix-baselines
Fix baselines after merge
2 parents e72c9d4 + c959a04 commit 548edd4

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

‎phpstan-baseline.neon‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9255,6 +9255,11 @@ parameters:
92559255
count: 4
92569256
path: src/Navigation/NavigationTree.php
92579257

9258+
-
9259+
message: "#^Method PhpMyAdmin\\\\Navigation\\\\NavigationTree\\:\\:parsePath\\(\\) should return non\\-empty\\-array\\<int, string\\> but returns non\\-empty\\-array\\<int, string\\|false\\>\\.$#"
9260+
count: 1
9261+
path: src/Navigation/NavigationTree.php
9262+
92589263
-
92599264
message: "#^Only booleans are allowed in &&, int given on the right side\\.$#"
92609265
count: 5
@@ -12875,11 +12880,6 @@ parameters:
1287512880
count: 1
1287612881
path: src/Server/Plugins.php
1287712882

12878-
-
12879-
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
12880-
count: 1
12881-
path: src/Server/Privileges.php
12882-
1288312883
-
1288412884
message: "#^Cannot access offset 'CHARACTER_MAXIMUM…' on mixed\\.$#"
1288512885
count: 2

‎psalm-baseline.xml‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
2+
<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
33
<file src="app/services_loader.php">
44
<MixedArgument>
55
<code><![CDATA[$argumentName]]></code>
@@ -833,9 +833,6 @@
833833
<code><![CDATA[$userGroups]]></code>
834834
<code><![CDATA[$userGroups[$groupName]]]></code>
835835
</PossiblyNullArrayOffset>
836-
<RiskyTruthyFalsyComparison>
837-
<code><![CDATA[$result->numRows()]]></code>
838-
</RiskyTruthyFalsyComparison>
839836
</file>
840837
<file src="src/Console.php">
841838
<DeprecatedMethod>
@@ -2998,7 +2995,6 @@
29982995
<RiskyTruthyFalsyComparison>
29992996
<code><![CDATA[empty($GLOBALS['back'])]]></code>
30002997
<code><![CDATA[empty($GLOBALS['goto'])]]></code>
3001-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
30022998
</RiskyTruthyFalsyComparison>
30032999
</file>
30043000
<file src="src/Controllers/Table/AddFieldController.php">
@@ -3219,7 +3215,6 @@
32193215
</PossiblyInvalidIterator>
32203216
<RiskyTruthyFalsyComparison>
32213217
<code><![CDATA[$message->isError()]]></code>
3222-
<code><![CDATA[empty($selected)]]></code>
32233218
</RiskyTruthyFalsyComparison>
32243219
<UnusedParam>
32253220
<code><![CDATA[$request]]></code>
@@ -3896,11 +3891,6 @@
38963891
<code><![CDATA[$_POST['field_expression'][$i]]]></code>
38973892
<code><![CDATA[$_POST['field_virtuality'][$i]]]></code>
38983893
</PossiblyInvalidOperand>
3899-
<RiskyTruthyFalsyComparison>
3900-
<code><![CDATA[$_POST['field_virtuality'][$i]]]></code>
3901-
<code><![CDATA[empty($_POST['field_adjust_privileges'][$i])]]></code>
3902-
<code><![CDATA[empty($_POST['field_move_to'][$i])]]></code>
3903-
</RiskyTruthyFalsyComparison>
39043894
</file>
39053895
<file src="src/Controllers/Table/StructureController.php">
39063896
<DeprecatedMethod>
@@ -4221,7 +4211,6 @@
42214211
<code><![CDATA[$array]]></code>
42224212
</PossiblyUnusedParam>
42234213
<RiskyTruthyFalsyComparison>
4224-
<code><![CDATA[! $size]]></code>
42254214
<code><![CDATA[Config::getInstance()->get('is_setup')]]></code>
42264215
<code><![CDATA[empty($_SERVER['REMOTE_ADDR'])]]></code>
42274216
</RiskyTruthyFalsyComparison>
@@ -4557,7 +4546,6 @@
45574546
<code><![CDATA[! empty($indexArray2[$f2])]]></code>
45584547
</RedundantCondition>
45594548
<RiskyTruthyFalsyComparison>
4560-
<code><![CDATA[! $value]]></code>
45614549
<code><![CDATA[$foreigner]]></code>
45624550
</RiskyTruthyFalsyComparison>
45634551
</file>
@@ -4712,6 +4700,8 @@
47124700
<code><![CDATA[$routine['item_param_name'][$i]]]></code>
47134701
<code><![CDATA[$routine['item_param_name'][$i]]]></code>
47144702
<code><![CDATA[$routine['item_param_name'][$i]]]></code>
4703+
<code><![CDATA[$routine['item_param_name'][$i]]]></code>
4704+
<code><![CDATA[$routine['item_param_name'][$i]]]></code>
47154705
<code><![CDATA[$routine['item_param_opts_text'][$i]]]></code>
47164706
<code><![CDATA[$routine['item_param_type'][$i]]]></code>
47174707
<code><![CDATA[$routine['item_param_type'][$i]]]></code>
@@ -4858,7 +4848,6 @@
48584848
</PossiblyUndefinedArrayOffset>
48594849
<RiskyTruthyFalsyComparison>
48604850
<code><![CDATA[empty($_POST['editor_process_edit'])]]></code>
4861-
<code><![CDATA[empty($_POST['funcs'][$routine['item_param_name'][$i]])]]></code>
48624851
<code><![CDATA[empty($_POST['item_adjust_privileges'])]]></code>
48634852
<code><![CDATA[empty($_POST['item_comment'])]]></code>
48644853
<code><![CDATA[empty($_POST['item_returnlength'])]]></code>
@@ -4935,8 +4924,6 @@
49354924
</MixedArrayAssignment>
49364925
<MixedArrayOffset>
49374926
<code><![CDATA[$row[$keyIndex]]]></code>
4938-
<code><![CDATA[$row[$keyIndex]]]></code>
4939-
<code><![CDATA[$row[$keyIndex]]]></code>
49404927
</MixedArrayOffset>
49414928
<MixedAssignment>
49424929
<code><![CDATA[$aLength]]></code>
@@ -6698,9 +6685,6 @@
66986685
<PossiblyFalseOperand>
66996686
<code><![CDATA[mb_strpos($tab, '_')]]></code>
67006687
</PossiblyFalseOperand>
6701-
<RiskyTruthyFalsyComparison>
6702-
<code><![CDATA[empty($binaryLogs)]]></code>
6703-
</RiskyTruthyFalsyComparison>
67046688
</file>
67056689
<file src="src/Message.php">
67066690
<MixedArgument>
@@ -6874,10 +6858,6 @@
68746858
<PossiblyNullOperand>
68756859
<code><![CDATA[$arr[0]]]></code>
68766860
</PossiblyNullOperand>
6877-
<RiskyTruthyFalsyComparison>
6878-
<code><![CDATA[empty($this->config->selectedServer['only_db'])]]></code>
6879-
<code><![CDATA[empty($this->config->selectedServer['only_db'])]]></code>
6880-
</RiskyTruthyFalsyComparison>
68816861
</file>
68826862
<file src="src/Navigation/Nodes/NodeColumn.php">
68836863
<MixedArgument>
@@ -9367,7 +9347,6 @@
93679347
<RiskyTruthyFalsyComparison>
93689348
<code><![CDATA[$foreigner]]></code>
93699349
<code><![CDATA[$foreigner]]></code>
9370-
<code><![CDATA[empty($showComment)]]></code>
93719350
</RiskyTruthyFalsyComparison>
93729351
<UnusedProperty>
93739352
<code><![CDATA[$bottomMargin]]></code>
@@ -10380,9 +10359,6 @@
1038010359
<DeprecatedMethod>
1038110360
<code><![CDATA[Config::getInstance()]]></code>
1038210361
</DeprecatedMethod>
10383-
<RiskyTruthyFalsyComparison>
10384-
<code><![CDATA[empty($server['only_db'])]]></code>
10385-
</RiskyTruthyFalsyComparison>
1038610362
</file>
1038710363
<file src="src/Server/Status/Data.php">
1038810364
<MixedArgumentTypeCoercion>

0 commit comments

Comments
 (0)