Skip to content

Commit 0765b05

Browse files
Merge pull request #19447 from kamil-tekiela/plugin_param
Remove $GLOBALS['plugin_param'] and $GLOBALS['export_type']
2 parents 4d4196a + 681c22b commit 0765b05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+254
-504
lines changed

phpstan-baseline.neon

Lines changed: 8 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -2832,24 +2832,6 @@ parameters:
28322832
count: 1
28332833
path: src/Controllers/Export/ExportController.php
28342834

2835-
-
2836-
message: '#^Parameter \#1 \$exportType of method PhpMyAdmin\\Export\\Export\:\:getHtmlForDisplayedExportFooter\(\) expects string, mixed given\.$#'
2837-
identifier: argument.type
2838-
count: 1
2839-
path: src/Controllers/Export/ExportController.php
2840-
2841-
-
2842-
message: '#^Parameter \#1 \$exportType of method PhpMyAdmin\\Export\\Export\:\:getHtmlForDisplayedExportHeader\(\) expects string, mixed given\.$#'
2843-
identifier: argument.type
2844-
count: 1
2845-
path: src/Controllers/Export/ExportController.php
2846-
2847-
-
2848-
message: '#^Parameter \#1 \$exportType of method PhpMyAdmin\\Export\\Export\:\:getPageLocationAndSaveMessage\(\) expects string, mixed given\.$#'
2849-
identifier: argument.type
2850-
count: 3
2851-
path: src/Controllers/Export/ExportController.php
2852-
28532835
-
28542836
message: '#^Parameter \#1 \$fileHandle of method PhpMyAdmin\\Export\\Export\:\:closeFile\(\) expects resource, mixed given\.$#'
28552837
identifier: argument.type
@@ -2880,12 +2862,6 @@ parameters:
28802862
count: 1
28812863
path: src/Controllers/Export/ExportController.php
28822864

2883-
-
2884-
message: '#^Parameter \#2 \$exportType of method PhpMyAdmin\\Export\\Export\:\:rememberFilename\(\) expects string, mixed given\.$#'
2885-
identifier: argument.type
2886-
count: 1
2887-
path: src/Controllers/Export/ExportController.php
2888-
28892865
-
28902866
message: '#^Parameter \#3 \$saveFilename of method PhpMyAdmin\\Export\\Export\:\:closeFile\(\) expects string, mixed given\.$#'
28912867
identifier: argument.type
@@ -2898,24 +2874,12 @@ parameters:
28982874
count: 2
28992875
path: src/Controllers/Export/ExportController.php
29002876

2901-
-
2902-
message: '#^Parameter \#5 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#'
2903-
identifier: argument.type
2904-
count: 2
2905-
path: src/Controllers/Export/ExportController.php
2906-
29072877
-
29082878
message: '#^Parameter \#5 \$tableData of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects array\<string\>, array\<mixed\> given\.$#'
29092879
identifier: argument.type
29102880
count: 2
29112881
path: src/Controllers/Export/ExportController.php
29122882

2913-
-
2914-
message: '#^Parameter \#7 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#'
2915-
identifier: argument.type
2916-
count: 2
2917-
path: src/Controllers/Export/ExportController.php
2918-
29192883
-
29202884
message: '#^Property PhpMyAdmin\\Export\\Export\:\:\$dumpBuffer \(string\) does not accept array\|bool\|string\.$#'
29212885
identifier: assign.propertyType
@@ -8347,25 +8311,25 @@ parameters:
83478311
path: src/Export/Export.php
83488312

83498313
-
8350-
message: '#^Parameter \#2 \$dbAlias of method PhpMyAdmin\\Plugins\\ExportPlugin\:\:exportDBHeader\(\) expects string, mixed given\.$#'
8314+
message: '#^Parameter \#2 \$dbAlias of method PhpMyAdmin\\Plugins\\ExportPlugin\:\:exportDBCreate\(\) expects string, mixed given\.$#'
83518315
identifier: argument.type
8352-
count: 2
8316+
count: 1
83538317
path: src/Export/Export.php
83548318

83558319
-
8356-
message: '#^Parameter \#2 \$destCharset of static method PhpMyAdmin\\Encoding\:\:convertString\(\) expects string, mixed given\.$#'
8320+
message: '#^Parameter \#2 \$dbAlias of method PhpMyAdmin\\Plugins\\ExportPlugin\:\:exportDBHeader\(\) expects string, mixed given\.$#'
83578321
identifier: argument.type
83588322
count: 2
83598323
path: src/Export/Export.php
83608324

83618325
-
8362-
message: '#^Parameter \#2 \$enc of static method PhpMyAdmin\\Encoding\:\:kanjiStrConv\(\) expects string, mixed given\.$#'
8326+
message: '#^Parameter \#2 \$destCharset of static method PhpMyAdmin\\Encoding\:\:convertString\(\) expects string, mixed given\.$#'
83638327
identifier: argument.type
8364-
count: 1
8328+
count: 2
83658329
path: src/Export/Export.php
83668330

83678331
-
8368-
message: '#^Parameter \#3 \$dbAlias of method PhpMyAdmin\\Plugins\\ExportPlugin\:\:exportDBCreate\(\) expects string, mixed given\.$#'
8332+
message: '#^Parameter \#2 \$enc of static method PhpMyAdmin\\Encoding\:\:kanjiStrConv\(\) expects string, mixed given\.$#'
83698333
identifier: argument.type
83708334
count: 1
83718335
path: src/Export/Export.php
@@ -8443,13 +8407,13 @@ parameters:
84438407
path: src/Export/Template.php
84448408

84458409
-
8446-
message: '#^Parameter \#2 \$username of class PhpMyAdmin\\Export\\Template constructor expects string, mixed given\.$#'
8410+
message: '#^Parameter \#1 \$value of static method PhpMyAdmin\\Plugins\\ExportType\:\:from\(\) expects int\|string, mixed given\.$#'
84478411
identifier: argument.type
84488412
count: 1
84498413
path: src/Export/Template.php
84508414

84518415
-
8452-
message: '#^Parameter \#3 \$exportType of class PhpMyAdmin\\Export\\Template constructor expects string, mixed given\.$#'
8416+
message: '#^Parameter \#2 \$username of class PhpMyAdmin\\Export\\Template constructor expects string, mixed given\.$#'
84538417
identifier: argument.type
84548418
count: 1
84558419
path: src/Export/Template.php
@@ -12372,18 +12336,6 @@ parameters:
1237212336
count: 2
1237312337
path: src/Plugins/Export/ExportLatex.php
1237412338

12375-
-
12376-
message: '#^Cannot access offset ''export_type'' on mixed\.$#'
12377-
identifier: offsetAccess.nonOffsetAccessible
12378-
count: 1
12379-
path: src/Plugins/Export/ExportLatex.php
12380-
12381-
-
12382-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
12383-
identifier: offsetAccess.nonOffsetAccessible
12384-
count: 1
12385-
path: src/Plugins/Export/ExportLatex.php
12386-
1238712339
-
1238812340
message: '#^Cannot access offset ''tables'' on mixed\.$#'
1238912341
identifier: offsetAccess.nonOffsetAccessible
@@ -12426,12 +12378,6 @@ parameters:
1242612378
count: 1
1242712379
path: src/Plugins/Export/ExportLatex.php
1242812380

12429-
-
12430-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
12431-
identifier: booleanNot.exprNotBoolean
12432-
count: 1
12433-
path: src/Plugins/Export/ExportLatex.php
12434-
1243512381
-
1243612382
message: '#^Parameter \#1 \$string of static method PhpMyAdmin\\Plugins\\Export\\ExportLatex\:\:texEscape\(\) expects string, mixed given\.$#'
1243712383
identifier: argument.type
@@ -12651,18 +12597,6 @@ parameters:
1265112597
count: 4
1265212598
path: src/Plugins/Export/ExportOdt.php
1265312599

12654-
-
12655-
message: '#^Cannot access offset ''export_type'' on mixed\.$#'
12656-
identifier: offsetAccess.nonOffsetAccessible
12657-
count: 1
12658-
path: src/Plugins/Export/ExportOdt.php
12659-
12660-
-
12661-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
12662-
identifier: offsetAccess.nonOffsetAccessible
12663-
count: 1
12664-
path: src/Plugins/Export/ExportOdt.php
12665-
1266612600
-
1266712601
message: '#^Cannot access offset ''tables'' on mixed\.$#'
1266812602
identifier: offsetAccess.nonOffsetAccessible
@@ -12693,12 +12627,6 @@ parameters:
1269312627
count: 1
1269412628
path: src/Plugins/Export/ExportOdt.php
1269512629

12696-
-
12697-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
12698-
identifier: booleanNot.exprNotBoolean
12699-
count: 1
12700-
path: src/Plugins/Export/ExportOdt.php
12701-
1270212630
-
1270312631
message: '#^Only booleans are allowed in an if condition, array\|false given\.$#'
1270412632
identifier: if.condNotBoolean
@@ -12873,18 +12801,6 @@ parameters:
1287312801
count: 8
1287412802
path: src/Plugins/Export/ExportSql.php
1287512803

12876-
-
12877-
message: '#^Cannot access offset ''export_type'' on mixed\.$#'
12878-
identifier: offsetAccess.nonOffsetAccessible
12879-
count: 2
12880-
path: src/Plugins/Export/ExportSql.php
12881-
12882-
-
12883-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
12884-
identifier: offsetAccess.nonOffsetAccessible
12885-
count: 1
12886-
path: src/Plugins/Export/ExportSql.php
12887-
1288812804
-
1288912805
message: '#^Cannot access offset ''tables'' on mixed\.$#'
1289012806
identifier: offsetAccess.nonOffsetAccessible
@@ -12993,12 +12909,6 @@ parameters:
1299312909
count: 6
1299412910
path: src/Plugins/Export/ExportSql.php
1299512911

12996-
-
12997-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
12998-
identifier: booleanNot.exprNotBoolean
12999-
count: 1
13000-
path: src/Plugins/Export/ExportSql.php
13001-
1300212912
-
1300312913
message: '#^Only booleans are allowed in an if condition, bool\|null given\.$#'
1300412914
identifier: if.condNotBoolean
@@ -18033,12 +17943,6 @@ parameters:
1803317943
count: 1
1803417944
path: src/Tracking/Tracker.php
1803517945

18036-
-
18037-
message: '#^Cannot cast mixed to string\.$#'
18038-
identifier: cast.string
18039-
count: 1
18040-
path: src/Tracking/Tracker.php
18041-
1804217946
-
1804317947
message: '#^Loose comparison via "\!\=" is not allowed\.$#'
1804417948
identifier: notEqual.notAllowed
@@ -22176,18 +22080,6 @@ parameters:
2217622080
count: 3
2217722081
path: tests/unit/Plugins/Export/ExportLatexTest.php
2217822082

22179-
-
22180-
message: '#^Cannot access offset ''export_type'' on mixed\.$#'
22181-
identifier: offsetAccess.nonOffsetAccessible
22182-
count: 2
22183-
path: tests/unit/Plugins/Export/ExportLatexTest.php
22184-
22185-
-
22186-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
22187-
identifier: offsetAccess.nonOffsetAccessible
22188-
count: 3
22189-
path: tests/unit/Plugins/Export/ExportLatexTest.php
22190-
2219122083
-
2219222084
message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\) does not accept array\{host\: string, port\: 80, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\.$#'
2219322085
identifier: assign.propertyType
@@ -22203,18 +22095,6 @@ parameters:
2220322095
count: 1
2220422096
path: tests/unit/Plugins/Export/ExportOdtTest.php
2220522097

22206-
-
22207-
message: '#^Cannot access offset ''export_type'' on mixed\.$#'
22208-
identifier: offsetAccess.nonOffsetAccessible
22209-
count: 2
22210-
path: tests/unit/Plugins/Export/ExportOdtTest.php
22211-
22212-
-
22213-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
22214-
identifier: offsetAccess.nonOffsetAccessible
22215-
count: 3
22216-
path: tests/unit/Plugins/Export/ExportOdtTest.php
22217-
2221822098
-
2221922099
message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertStringContainsString\(\) expects string, mixed given\.$#'
2222022100
identifier: argument.type
@@ -22230,18 +22110,6 @@ parameters:
2223022110
count: 9
2223122111
path: tests/unit/Plugins/Export/ExportSqlTest.php
2223222112

22233-
-
22234-
message: '#^Cannot access offset ''export_type'' on mixed\.$#'
22235-
identifier: offsetAccess.nonOffsetAccessible
22236-
count: 2
22237-
path: tests/unit/Plugins/Export/ExportSqlTest.php
22238-
22239-
-
22240-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
22241-
identifier: offsetAccess.nonOffsetAccessible
22242-
count: 3
22243-
path: tests/unit/Plugins/Export/ExportSqlTest.php
22244-
2224522113
-
2224622114
message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertStringContainsString\(\) expects string, mixed given\.$#'
2224722115
identifier: argument.type
@@ -22263,12 +22131,6 @@ parameters:
2226322131
count: 1
2226422132
path: tests/unit/Plugins/Export/ExportTexytextTest.php
2226522133

22266-
-
22267-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
22268-
identifier: offsetAccess.nonOffsetAccessible
22269-
count: 1
22270-
path: tests/unit/Plugins/Export/ExportTexytextTest.php
22271-
2227222134
-
2227322135
message: '''
2227422136
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@@ -22278,12 +22140,6 @@ parameters:
2227822140
count: 2
2227922141
path: tests/unit/Plugins/Export/ExportXmlTest.php
2228022142

22281-
-
22282-
message: '#^Cannot access offset ''single_table'' on mixed\.$#'
22283-
identifier: offsetAccess.nonOffsetAccessible
22284-
count: 1
22285-
path: tests/unit/Plugins/Export/ExportXmlTest.php
22286-
2228722143
-
2228822144
message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\) does not accept array\{host\: string, port\: 80, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\.$#'
2228922145
identifier: assign.propertyType

0 commit comments

Comments
 (0)