Skip to content

Commit 7d7da4a

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19451 from MauricioFauth/export-globals
Remove some export plugins global variables
2 parents 2a90fa3 + bc1d6ee commit 7d7da4a

20 files changed

Lines changed: 596 additions & 641 deletions

‎phpstan-baseline.neon‎

Lines changed: 4 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -11877,18 +11877,6 @@ parameters:
1187711877
count: 2
1187811878
path: src/Plugins/Export/ExportCodegen.php
1187911879

11880-
-
11881-
message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
11882-
identifier: binaryOp.invalid
11883-
count: 1
11884-
path: src/Plugins/Export/ExportCsv.php
11885-
11886-
-
11887-
message: '#^Binary operation "\." between mixed and ''_removeCRLF'' results in an error\.$#'
11888-
identifier: binaryOp.invalid
11889-
count: 2
11890-
path: src/Plugins/Export/ExportCsv.php
11891-
1189211880
-
1189311881
message: '#^Binary operation "\." between mixed and \(list\<string\>\|string\) results in an error\.$#'
1189411882
identifier: binaryOp.invalid
@@ -11967,7 +11955,7 @@ parameters:
1196711955
-
1196811956
message: '#^Only booleans are allowed in &&, mixed given on the right side\.$#'
1196911957
identifier: booleanAnd.rightNotBoolean
11970-
count: 2
11958+
count: 3
1197111959
path: src/Plugins/Export/ExportCsv.php
1197211960

1197311961
-
@@ -12006,12 +11994,6 @@ parameters:
1200611994
count: 1
1200711995
path: src/Plugins/Export/ExportHtmlword.php
1200811996

12009-
-
12010-
message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
12011-
identifier: binaryOp.invalid
12012-
count: 1
12013-
path: src/Plugins/Export/ExportHtmlword.php
12014-
1201511997
-
1201611998
message: '''
1201711999
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12039,12 +12021,6 @@ parameters:
1203912021
count: 6
1204012022
path: src/Plugins/Export/ExportHtmlword.php
1204112023

12042-
-
12043-
message: '#^Cannot cast mixed to string\.$#'
12044-
identifier: cast.string
12045-
count: 1
12046-
path: src/Plugins/Export/ExportHtmlword.php
12047-
1204812024
-
1204912025
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
1205012026
identifier: empty.notAllowed
@@ -12090,12 +12066,6 @@ parameters:
1209012066
count: 1
1209112067
path: src/Plugins/Export/ExportJson.php
1209212068

12093-
-
12094-
message: '#^Only booleans are allowed in &&, mixed given on the right side\.$#'
12095-
identifier: booleanAnd.rightNotBoolean
12096-
count: 2
12097-
path: src/Plugins/Export/ExportJson.php
12098-
1209912069
-
1210012070
message: '#^Parameter \#4 \$aliases of method PhpMyAdmin\\Plugins\\Export\\ExportJson\:\:doExportForQuery\(\) expects array\<string, array\{tables\: array\<string, array\{columns\: array\<string, string\>\}\>\}\>\|null, array\<mixed\> given\.$#'
1210112071
identifier: argument.type
@@ -12108,24 +12078,12 @@ parameters:
1210812078
count: 1
1210912079
path: src/Plugins/Export/ExportLatex.php
1211012080

12111-
-
12112-
message: '#^Binary operation "\." between mixed and '' & '' results in an error\.$#'
12113-
identifier: binaryOp.invalid
12114-
count: 1
12115-
path: src/Plugins/Export/ExportLatex.php
12116-
1211712081
-
1211812082
message: '#^Binary operation "\." between non\-falsy\-string and mixed results in an error\.$#'
1211912083
identifier: binaryOp.invalid
1212012084
count: 1
1212112085
path: src/Plugins/Export/ExportLatex.php
1212212086

12123-
-
12124-
message: '#^Binary operation "\.\=" between string and mixed results in an error\.$#'
12125-
identifier: assignOp.invalid
12126-
count: 1
12127-
path: src/Plugins/Export/ExportLatex.php
12128-
1212912087
-
1213012088
message: '''
1213112089
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@@ -12198,12 +12156,6 @@ parameters:
1219812156
count: 1
1219912157
path: src/Plugins/Export/ExportLatex.php
1220012158

12201-
-
12202-
message: '#^Parameter \#1 \$string of static method PhpMyAdmin\\Util\:\:expandUserString\(\) expects string, mixed given\.$#'
12203-
identifier: argument.type
12204-
count: 6
12205-
path: src/Plugins/Export/ExportLatex.php
12206-
1220712159
-
1220812160
message: '#^Binary operation "\." between '' \! '' and mixed results in an error\.$#'
1220912161
identifier: binaryOp.invalid
@@ -12255,36 +12207,6 @@ parameters:
1225512207
count: 1
1225612208
path: src/Plugins/Export/ExportMediawiki.php
1225712209

12258-
-
12259-
message: '#^Binary operation "\." between mixed and ''_columns'' results in an error\.$#'
12260-
identifier: binaryOp.invalid
12261-
count: 1
12262-
path: src/Plugins/Export/ExportOds.php
12263-
12264-
-
12265-
message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
12266-
identifier: binaryOp.invalid
12267-
count: 1
12268-
path: src/Plugins/Export/ExportOds.php
12269-
12270-
-
12271-
message: '#^Binary operation "\.\=" between mixed and ''\</office…'' results in an error\.$#'
12272-
identifier: assignOp.invalid
12273-
count: 1
12274-
path: src/Plugins/Export/ExportOds.php
12275-
12276-
-
12277-
message: '#^Binary operation "\.\=" between mixed and ''\<\?xml version\="1\.0"…'' results in an error\.$#'
12278-
identifier: assignOp.invalid
12279-
count: 1
12280-
path: src/Plugins/Export/ExportOds.php
12281-
12282-
-
12283-
message: '#^Binary operation "\.\=" between mixed and non\-falsy\-string results in an error\.$#'
12284-
identifier: assignOp.invalid
12285-
count: 1
12286-
path: src/Plugins/Export/ExportOds.php
12287-
1228812210
-
1228912211
message: '''
1229012212
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12327,7 +12249,7 @@ parameters:
1232712249
-
1232812250
message: '#^Parameter \#1 \$string of function htmlspecialchars expects string, mixed given\.$#'
1232912251
identifier: argument.type
12330-
count: 2
12252+
count: 1
1233112253
path: src/Plugins/Export/ExportOds.php
1233212254

1233312255
-
@@ -12348,48 +12270,12 @@ parameters:
1234812270
count: 1
1234912271
path: src/Plugins/Export/ExportOdt.php
1235012272

12351-
-
12352-
message: '#^Binary operation "\." between mixed and ''_columns'' results in an error\.$#'
12353-
identifier: binaryOp.invalid
12354-
count: 1
12355-
path: src/Plugins/Export/ExportOdt.php
12356-
12357-
-
12358-
message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
12359-
identifier: binaryOp.invalid
12360-
count: 1
12361-
path: src/Plugins/Export/ExportOdt.php
12362-
1236312273
-
1236412274
message: '#^Binary operation "\." between non\-falsy\-string and mixed results in an error\.$#'
1236512275
identifier: binaryOp.invalid
1236612276
count: 1
1236712277
path: src/Plugins/Export/ExportOdt.php
1236812278

12369-
-
12370-
message: '#^Binary operation "\.\=" between mixed and ''\</office\:text\>\<…'' results in an error\.$#'
12371-
identifier: assignOp.invalid
12372-
count: 1
12373-
path: src/Plugins/Export/ExportOdt.php
12374-
12375-
-
12376-
message: '#^Binary operation "\.\=" between mixed and ''\<\?xml version\="1\.0"…'' results in an error\.$#'
12377-
identifier: assignOp.invalid
12378-
count: 1
12379-
path: src/Plugins/Export/ExportOdt.php
12380-
12381-
-
12382-
message: '#^Binary operation "\.\=" between mixed and ''\<text\:h text…'' results in an error\.$#'
12383-
identifier: assignOp.invalid
12384-
count: 1
12385-
path: src/Plugins/Export/ExportOdt.php
12386-
12387-
-
12388-
message: '#^Binary operation "\.\=" between mixed and non\-falsy\-string results in an error\.$#'
12389-
identifier: assignOp.invalid
12390-
count: 8
12391-
path: src/Plugins/Export/ExportOdt.php
12392-
1239312279
-
1239412280
message: '''
1239512281
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12456,7 +12342,7 @@ parameters:
1245612342
-
1245712343
message: '#^Parameter \#1 \$string of function htmlspecialchars expects string, mixed given\.$#'
1245812344
identifier: argument.type
12459-
count: 3
12345+
count: 2
1246012346
path: src/Plugins/Export/ExportOdt.php
1246112347

1246212348
-
@@ -12843,18 +12729,6 @@ parameters:
1284312729
count: 1
1284412730
path: src/Plugins/Export/ExportSql.php
1284512731

12846-
-
12847-
message: '#^Binary operation "\." between mixed and ''_columns'' results in an error\.$#'
12848-
identifier: binaryOp.invalid
12849-
count: 1
12850-
path: src/Plugins/Export/ExportTexytext.php
12851-
12852-
-
12853-
message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
12854-
identifier: binaryOp.invalid
12855-
count: 1
12856-
path: src/Plugins/Export/ExportTexytext.php
12857-
1285812732
-
1285912733
message: '''
1286012734
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12897,7 +12771,7 @@ parameters:
1289712771
-
1289812772
message: '#^Parameter \#1 \$string of function htmlspecialchars expects string, mixed given\.$#'
1289912773
identifier: argument.type
12900-
count: 3
12774+
count: 2
1290112775
path: src/Plugins/Export/ExportTexytext.php
1290212776

1290312777
-
@@ -21861,12 +21735,6 @@ parameters:
2186121735
count: 1
2186221736
path: tests/unit/Plugins/Export/ExportOdtTest.php
2186321737

21864-
-
21865-
message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertStringContainsString\(\) expects string, mixed given\.$#'
21866-
identifier: argument.type
21867-
count: 11
21868-
path: tests/unit/Plugins/Export/ExportOdtTest.php
21869-
2187021738
-
2187121739
message: '''
2187221740
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:

0 commit comments

Comments
 (0)