Skip to content

Commit 3f0b692

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18985 from kamil-tekiela/Refactor-Import
Refactor import
2 parents 271ce8c + 686eca2 commit 3f0b692

10 files changed

Lines changed: 253 additions & 737 deletions

File tree

‎phpstan-baseline.neon‎

Lines changed: 29 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -8577,22 +8577,27 @@ parameters:
85778577

85788578
-
85798579
message: "#^Cannot access offset 0 on mixed\\.$#"
8580-
count: 14
8580+
count: 3
85818581
path: src/Import/Import.php
85828582

85838583
-
85848584
message: "#^Cannot access offset 1 on mixed\\.$#"
8585-
count: 6
8585+
count: 1
85868586
path: src/Import/Import.php
85878587

85888588
-
85898589
message: "#^Cannot access offset 2 on mixed\\.$#"
8590-
count: 9
8590+
count: 1
8591+
path: src/Import/Import.php
8592+
8593+
-
8594+
message: "#^Cannot access offset int on mixed\\.$#"
8595+
count: 3
85918596
path: src/Import/Import.php
85928597

85938598
-
85948599
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
8595-
count: 21
8600+
count: 2
85968601
path: src/Import/Import.php
85978602

85988603
-
@@ -8612,7 +8617,7 @@ parameters:
86128617

86138618
-
86148619
message: "#^Cannot cast mixed to string\\.$#"
8615-
count: 7
8620+
count: 6
86168621
path: src/Import/Import.php
86178622

86188623
-
@@ -8675,11 +8680,6 @@ parameters:
86758680
count: 2
86768681
path: src/Import/Import.php
86778682

8678-
-
8679-
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
8680-
count: 8
8681-
path: src/Import/Import.php
8682-
86838683
-
86848684
message: "#^Parameter \\#1 \\$lastCumulativeSize of method PhpMyAdmin\\\\Import\\\\Import\\:\\:getDecimalPrecision\\(\\) expects string, int\\|string given\\.$#"
86858685
count: 3
@@ -8690,26 +8690,16 @@ parameters:
86908690
count: 2
86918691
path: src/Import/Import.php
86928692

8693-
-
8694-
message: "#^Parameter \\#1 \\$name of class PhpMyAdmin\\\\Table\\\\Table constructor expects string, mixed given\\.$#"
8695-
count: 1
8696-
path: src/Import/Import.php
8697-
86988693
-
86998694
message: "#^Parameter \\#1 \\$separator of function explode expects non\\-empty\\-string, mixed given\\.$#"
87008695
count: 1
87018696
path: src/Import/Import.php
87028697

87038698
-
8704-
message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\\\Import\\:\\:runQuery\\(\\) expects string, \\(array\\<int, string\\>\\|string\\|null\\) given\\.$#"
8699+
message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\\\Import\\:\\:runQuery\\(\\) expects string, string\\|null given\\.$#"
87058700
count: 1
87068701
path: src/Import/Import.php
87078702

8708-
-
8709-
message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, mixed given\\.$#"
8710-
count: 2
8711-
path: src/Import/Import.php
8712-
87138703
-
87148704
message: "#^Parameter \\#1 \\$string of function mb_strlen expects string, mixed given\\.$#"
87158705
count: 2
@@ -8720,16 +8710,6 @@ parameters:
87208710
count: 2
87218711
path: src/Import/Import.php
87228712

8723-
-
8724-
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
8725-
count: 6
8726-
path: src/Import/Import.php
8727-
8728-
-
8729-
message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, mixed given\\.$#"
8730-
count: 1
8731-
path: src/Import/Import.php
8732-
87338713
-
87348714
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
87358715
count: 1
@@ -11400,26 +11380,11 @@ parameters:
1140011380
count: 1
1140111381
path: src/Plugins/ExportPlugin.php
1140211382

11403-
-
11404-
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
11405-
count: 1
11406-
path: src/Plugins/Import/ImportCsv.php
11407-
11408-
-
11409-
message: "#^Cannot access an offset on mixed\\.$#"
11410-
count: 1
11411-
path: src/Plugins/Import/ImportCsv.php
11412-
1141311383
-
1141411384
message: "#^Cannot access offset 0 on mixed\\.$#"
1141511385
count: 10
1141611386
path: src/Plugins/Import/ImportCsv.php
1141711387

11418-
-
11419-
message: "#^Cannot access offset mixed on mixed\\.$#"
11420-
count: 1
11421-
path: src/Plugins/Import/ImportCsv.php
11422-
1142311388
-
1142411389
message: "#^Cannot call method getMessage\\(\\) on mixed\\.$#"
1142511390
count: 1
@@ -11431,7 +11396,7 @@ parameters:
1143111396
path: src/Plugins/Import/ImportCsv.php
1143211397

1143311398
-
11434-
message: "#^For loop initial assignment overwrites variable \\$i\\.$#"
11399+
message: "#^Foreach overwrites \\$i with its key variable\\.$#"
1143511400
count: 1
1143611401
path: src/Plugins/Import/ImportCsv.php
1143711402

@@ -11441,17 +11406,17 @@ parameters:
1144111406
path: src/Plugins/Import/ImportCsv.php
1144211407

1144311408
-
11444-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportCsv\\:\\:getColumnNames\\(\\) should return array but returns mixed\\.$#"
11409+
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportCsv\\:\\:getTableNameFromImport\\(\\) should return string but returns mixed\\.$#"
1144511410
count: 1
1144611411
path: src/Plugins/Import/ImportCsv.php
1144711412

1144811413
-
11449-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportCsv\\:\\:getTableNameFromImport\\(\\) should return string but returns mixed\\.$#"
11414+
message: "#^Only booleans are allowed in &&, string given on the right side\\.$#"
1145011415
count: 1
1145111416
path: src/Plugins/Import/ImportCsv.php
1145211417

1145311418
-
11454-
message: "#^Only booleans are allowed in &&, string given on the right side\\.$#"
11419+
message: "#^Parameter \\#1 \\$columnNames of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportCsv\\:\\:getColumnNames\\(\\) expects array\\<int, string\\>, array\\|null given\\.$#"
1145511420
count: 1
1145611421
path: src/Plugins/Import/ImportCsv.php
1145711422

@@ -11480,16 +11445,6 @@ parameters:
1148011445
count: 1
1148111446
path: src/Plugins/Import/ImportCsv.php
1148211447

11483-
-
11484-
message: "#^Parameter \\#1 \\$string of function rtrim expects string, mixed given\\.$#"
11485-
count: 1
11486-
path: src/Plugins/Import/ImportCsv.php
11487-
11488-
-
11489-
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
11490-
count: 1
11491-
path: src/Plugins/Import/ImportCsv.php
11492-
1149311448
-
1149411449
message: "#^Parameter \\#2 \\$csvEnclosed of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportCsv\\:\\:buildErrorsForParams\\(\\) expects string, mixed given\\.$#"
1149511450
count: 1
@@ -11510,6 +11465,11 @@ parameters:
1151011465
count: 1
1151111466
path: src/Plugins/Import/ImportCsv.php
1151211467

11468+
-
11469+
message: "#^Parameter \\#3 \\$rows of class PhpMyAdmin\\\\Import\\\\ImportTable constructor expects array\\<int, array\\<int, mixed\\>\\>, array\\<int\\<0, max\\>, array\\> given\\.$#"
11470+
count: 1
11471+
path: src/Plugins/Import/ImportCsv.php
11472+
1151311473
-
1151411474
message: "#^Cannot cast mixed to string\\.$#"
1151511475
count: 5
@@ -11530,11 +11490,6 @@ parameters:
1153011490
count: 1
1153111491
path: src/Plugins/Import/ImportLdi.php
1153211492

11533-
-
11534-
message: "#^Cannot access offset 0 on mixed\\.$#"
11535-
count: 1
11536-
path: src/Plugins/Import/ImportMediawiki.php
11537-
1153811493
-
1153911494
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportMediawiki\\:\\:doImport\\(\\) should return array\\<string\\> but returns mixed\\.$#"
1154011495
count: 1
@@ -11555,46 +11510,6 @@ parameters:
1155511510
count: 2
1155611511
path: src/Plugins/Import/ImportMediawiki.php
1155711512

11558-
-
11559-
message: "#^Parameter \\#2 \\$tableRow of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportMediawiki\\:\\:setTableHeaders\\(\\) expects array, mixed given\\.$#"
11560-
count: 1
11561-
path: src/Plugins/Import/ImportMediawiki.php
11562-
11563-
-
11564-
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
11565-
count: 1
11566-
path: src/Plugins/Import/ImportOds.php
11567-
11568-
-
11569-
message: "#^Cannot access an offset on mixed\\.$#"
11570-
count: 3
11571-
path: src/Plugins/Import/ImportOds.php
11572-
11573-
-
11574-
message: "#^Cannot access offset 0 on mixed\\.$#"
11575-
count: 3
11576-
path: src/Plugins/Import/ImportOds.php
11577-
11578-
-
11579-
message: "#^Cannot access offset 1 on mixed\\.$#"
11580-
count: 2
11581-
path: src/Plugins/Import/ImportOds.php
11582-
11583-
-
11584-
message: "#^Cannot access offset 2 on mixed\\.$#"
11585-
count: 2
11586-
path: src/Plugins/Import/ImportOds.php
11587-
11588-
-
11589-
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
11590-
count: 10
11591-
path: src/Plugins/Import/ImportOds.php
11592-
11593-
-
11594-
message: "#^Cannot access property \\$spreadsheet on mixed\\.$#"
11595-
count: 1
11596-
path: src/Plugins/Import/ImportOds.php
11597-
1159811513
-
1159911514
message: "#^Cannot call method __toString\\(\\) on mixed\\.$#"
1160011515
count: 1
@@ -11607,12 +11522,7 @@ parameters:
1160711522

1160811523
-
1160911524
message: "#^Cannot cast mixed to string\\.$#"
11610-
count: 3
11611-
path: src/Plugins/Import/ImportOds.php
11612-
11613-
-
11614-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
11615-
count: 1
11525+
count: 2
1161611526
path: src/Plugins/Import/ImportOds.php
1161711527

1161811528
-
@@ -11626,42 +11536,17 @@ parameters:
1162611536
path: src/Plugins/Import/ImportOds.php
1162711537

1162811538
-
11629-
message: "#^Parameter \\#1 \\$sheets of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportOds\\:\\:iterateOverTables\\(\\) expects array\\|SimpleXMLElement, array\\|SimpleXMLElement\\|null given\\.$#"
11630-
count: 1
11631-
path: src/Plugins/Import/ImportOds.php
11632-
11633-
-
11634-
message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Import\\\\Import\\:\\:analyzeTable\\(\\) expects array, mixed given\\.$#"
11539+
message: "#^Parameter \\#1 \\$sheets of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportOds\\:\\:readSheets\\(\\) expects array\\|SimpleXMLElement, array\\|SimpleXMLElement\\|null given\\.$#"
1163511540
count: 1
1163611541
path: src/Plugins/Import/ImportOds.php
1163711542

11638-
-
11639-
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
11640-
count: 8
11641-
path: src/Plugins/Import/ImportOds.php
11642-
1164311543
-
1164411544
message: "#^Parameter \\#2 \\$text of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportOds\\:\\:getValue\\(\\) expects SimpleXMLElement, \\(SimpleXMLElement\\|null\\) given\\.$#"
1164511545
count: 1
1164611546
path: src/Plugins/Import/ImportOds.php
1164711547

1164811548
-
11649-
message: "#^Parameter \\#3 \\$tempRow of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportOds\\:\\:iterateOverRows\\(\\) expects array, mixed given\\.$#"
11650-
count: 1
11651-
path: src/Plugins/Import/ImportOds.php
11652-
11653-
-
11654-
message: "#^Parameter \\#4 \\$colNames of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportOds\\:\\:iterateOverColumns\\(\\) expects array, mixed given\\.$#"
11655-
count: 1
11656-
path: src/Plugins/Import/ImportOds.php
11657-
11658-
-
11659-
message: "#^Parameter \\#6 \\$maxCols of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportOds\\:\\:iterateOverRows\\(\\) expects int, mixed given\\.$#"
11660-
count: 1
11661-
path: src/Plugins/Import/ImportOds.php
11662-
11663-
-
11664-
message: "#^Variable property access on \\(SimpleXMLElement\\|null\\)\\.$#"
11549+
message: "#^Parameter \\#3 \\$rows of class PhpMyAdmin\\\\Import\\\\ImportTable constructor expects array\\<int, array\\<int, mixed\\>\\>, array\\<int, array\\> given\\.$#"
1166511550
count: 1
1166611551
path: src/Plugins/Import/ImportOds.php
1166711552

@@ -11670,19 +11555,9 @@ parameters:
1167011555
count: 2
1167111556
path: src/Plugins/Import/ImportOds.php
1167211557

11673-
-
11674-
message: "#^Variable property access on mixed\\.$#"
11675-
count: 1
11676-
path: src/Plugins/Import/ImportOds.php
11677-
11678-
-
11679-
message: "#^Cannot access offset 0 on array\\|bool\\.$#"
11680-
count: 1
11681-
path: src/Plugins/Import/ImportShp.php
11682-
1168311558
-
1168411559
message: "#^Cannot access offset 0 on mixed\\.$#"
11685-
count: 4
11560+
count: 3
1168611561
path: src/Plugins/Import/ImportShp.php
1168711562

1168811563
-
@@ -11715,6 +11590,11 @@ parameters:
1171511590
count: 2
1171611591
path: src/Plugins/Import/ImportShp.php
1171711592

11593+
-
11594+
message: "#^Parameter \\#2 \\$columns of class PhpMyAdmin\\\\Import\\\\ImportTable constructor expects array\\<int, string\\>, array\\<int, mixed\\> given\\.$#"
11595+
count: 1
11596+
path: src/Plugins/Import/ImportShp.php
11597+
1171811598
-
1171911599
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
1172011600
count: 1
@@ -11740,11 +11620,6 @@ parameters:
1174011620
count: 1
1174111621
path: src/Plugins/Import/ImportXml.php
1174211622

11743-
-
11744-
message: "#^Cannot assign new offset to array\\<int\\<0, max\\>, array\\<int\\<0, max\\>, string\\>\\|string\\>\\|string\\.$#"
11745-
count: 1
11746-
path: src/Plugins/Import/ImportXml.php
11747-
1174811623
-
1174911624
message: "#^Cannot cast mixed to string\\.$#"
1175011625
count: 10
@@ -11775,11 +11650,6 @@ parameters:
1177511650
count: 1
1177611651
path: src/Plugins/Import/ImportXml.php
1177711652

11778-
-
11779-
message: "#^array\\<int\\<0, max\\>, array\\<int\\<0, max\\>, string\\>\\|string\\>\\|string does not accept array\\<int\\<0, max\\>, string\\>\\.$#"
11780-
count: 1
11781-
path: src/Plugins/Import/ImportXml.php
11782-
1178311653
-
1178411654
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ShapeFileImport\\:\\:readSHP\\(\\) never returns false so it can be removed from the return type\\.$#"
1178511655
count: 1

0 commit comments

Comments
 (0)