Merge pull request phpmyadmin#19451 from MauricioFauth/export-globals

Remove some export plugins global variables
liviuconcioiu · Dec 18, 2024 · 7d7da4a · 7d7da4a
2 parents 2a90fa3 + bc1d6ee
commit 7d7da4a
Show file tree

Hide file tree

Showing 20 changed files with 596 additions and 641 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -11877,18 +11877,6 @@ parameters:
 			count: 2
 			path: src/Plugins/Export/ExportCodegen.php
 
-		-
-			message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportCsv.php
-
-		-
-			message: '#^Binary operation "\." between mixed and ''_removeCRLF'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 2
-			path: src/Plugins/Export/ExportCsv.php
-
 		-
 			message: '#^Binary operation "\." between mixed and \(list\<string\>\|string\) results in an error\.$#'
 			identifier: binaryOp.invalid
@@ -11967,7 +11955,7 @@ parameters:
 		-
 			message: '#^Only booleans are allowed in &&, mixed given on the right side\.$#'
 			identifier: booleanAnd.rightNotBoolean
-			count: 2
+			count: 3
 			path: src/Plugins/Export/ExportCsv.php
 
 		-
@@ -12006,12 +11994,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportHtmlword.php
 
-		-
-			message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportHtmlword.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12039,12 +12021,6 @@ parameters:
 			count: 6
 			path: src/Plugins/Export/ExportHtmlword.php
 
-		-
-			message: '#^Cannot cast mixed to string\.$#'
-			identifier: cast.string
-			count: 1
-			path: src/Plugins/Export/ExportHtmlword.php
-
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
@@ -12090,12 +12066,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportJson.php
 
-		-
-			message: '#^Only booleans are allowed in &&, mixed given on the right side\.$#'
-			identifier: booleanAnd.rightNotBoolean
-			count: 2
-			path: src/Plugins/Export/ExportJson.php
-
 		-
 			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\.$#'
 			identifier: argument.type
@@ -12108,24 +12078,12 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportLatex.php
 
-		-
-			message: '#^Binary operation "\." between mixed and '' & '' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportLatex.php
-
 		-
 			message: '#^Binary operation "\." between non\-falsy\-string and mixed results in an error\.$#'
 			identifier: binaryOp.invalid
 			count: 1
 			path: src/Plugins/Export/ExportLatex.php
 
-		-
-			message: '#^Binary operation "\.\=" between string and mixed results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportLatex.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@@ -12198,12 +12156,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportLatex.php
 
-		-
-			message: '#^Parameter \#1 \$string of static method PhpMyAdmin\\Util\:\:expandUserString\(\) expects string, mixed given\.$#'
-			identifier: argument.type
-			count: 6
-			path: src/Plugins/Export/ExportLatex.php
-
 		-
 			message: '#^Binary operation "\." between '' \! '' and mixed results in an error\.$#'
 			identifier: binaryOp.invalid
@@ -12255,36 +12207,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportMediawiki.php
 
-		-
-			message: '#^Binary operation "\." between mixed and ''_columns'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOds.php
-
-		-
-			message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOds.php
-
-		-
-			message: '#^Binary operation "\.\=" between mixed and ''\</office…'' results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOds.php
-
-		-
-			message: '#^Binary operation "\.\=" between mixed and ''\<\?xml version\="1\.0"…'' results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOds.php
-
-		-
-			message: '#^Binary operation "\.\=" between mixed and non\-falsy\-string results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOds.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12327,7 +12249,7 @@ parameters:
 		-
 			message: '#^Parameter \#1 \$string of function htmlspecialchars expects string, mixed given\.$#'
 			identifier: argument.type
-			count: 2
+			count: 1
 			path: src/Plugins/Export/ExportOds.php
 
 		-
@@ -12348,48 +12270,12 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportOdt.php
 
-		-
-			message: '#^Binary operation "\." between mixed and ''_columns'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOdt.php
-
-		-
-			message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOdt.php
-
 		-
 			message: '#^Binary operation "\." between non\-falsy\-string and mixed results in an error\.$#'
 			identifier: binaryOp.invalid
 			count: 1
 			path: src/Plugins/Export/ExportOdt.php
 
-		-
-			message: '#^Binary operation "\.\=" between mixed and ''\</office\:text\>\<…'' results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOdt.php
-
-		-
-			message: '#^Binary operation "\.\=" between mixed and ''\<\?xml version\="1\.0"…'' results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOdt.php
-
-		-
-			message: '#^Binary operation "\.\=" between mixed and ''\<text\:h text…'' results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportOdt.php
-
-		-
-			message: '#^Binary operation "\.\=" between mixed and non\-falsy\-string results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 8
-			path: src/Plugins/Export/ExportOdt.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12456,7 +12342,7 @@ parameters:
 		-
 			message: '#^Parameter \#1 \$string of function htmlspecialchars expects string, mixed given\.$#'
 			identifier: argument.type
-			count: 3
+			count: 2
 			path: src/Plugins/Export/ExportOdt.php
 
 		-
@@ -12843,18 +12729,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportSql.php
 
-		-
-			message: '#^Binary operation "\." between mixed and ''_columns'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportTexytext.php
-
-		-
-			message: '#^Binary operation "\." between mixed and ''_null'' results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Plugins/Export/ExportTexytext.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\:
@@ -12897,7 +12771,7 @@ parameters:
 		-
 			message: '#^Parameter \#1 \$string of function htmlspecialchars expects string, mixed given\.$#'
 			identifier: argument.type
-			count: 3
+			count: 2
 			path: src/Plugins/Export/ExportTexytext.php
 
 		-
@@ -21861,12 +21735,6 @@ parameters:
 			count: 1
 			path: tests/unit/Plugins/Export/ExportOdtTest.php
 
-		-
-			message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertStringContainsString\(\) expects string, mixed given\.$#'
-			identifier: argument.type
-			count: 11
-			path: tests/unit/Plugins/Export/ExportOdtTest.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: