Merge pull request phpmyadmin#18831 from kamil-tekiela/Small-fixes

A collection of refactorings
liviuconcioiu · Dec 6, 2023 · eb700c1 · eb700c1
2 parents c2f3b51 + ab4d0b6
commit eb700c1
Show file tree

Hide file tree

Showing 20 changed files with 257 additions and 383 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5470,11 +5470,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Table/AddFieldController.php
 
-		-
-			message: "#^Parameter \\#1 \\$value of function intval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
-			count: 2
-			path: src/Controllers/Table/AddFieldController.php
-
 		-
 			message: "#^Parameter \\#2 \\$sqlQuery of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getMessage\\(\\) expects string\\|null, mixed given\\.$#"
 			count: 1
@@ -5495,11 +5490,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Table/AddFieldController.php
 
-		-
-			message: "#^Parameter \\#3 \\$regenerate of method PhpMyAdmin\\\\Table\\\\ColumnsDefinition\\:\\:displayForm\\(\\) expects string\\|null, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Table/AddFieldController.php
-
 		-
 			message: "#^Parameter \\#4 \\$backUrl of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:mysqlDie\\(\\) expects string, mixed given\\.$#"
 			count: 1
@@ -5982,7 +5972,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
+			count: 1
 			path: src/Controllers/Table/DropColumnController.php
 
 		-
@@ -8222,7 +8212,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
+			count: 2
 			path: src/Controllers/VersionCheckController.php
 
 		-
@@ -11500,11 +11490,6 @@ parameters:
 			count: 1
 			path: src/Import/Import.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, string given\\.$#"
-			count: 1
-			path: src/Import/Import.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, string\\|false given\\.$#"
 			count: 1
@@ -11855,11 +11840,6 @@ parameters:
 			count: 2
 			path: src/InsertEdit.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
-			count: 1
-			path: src/InsertEdit.php
-
 		-
 			message: "#^Only booleans are allowed in an elseif condition, string\\|false given\\.$#"
 			count: 1
@@ -13457,7 +13437,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
+			count: 1
 			path: src/Plugins/AuthenticationPlugin.php
 
 		-
@@ -14030,16 +14010,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportSql.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, array given\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportSql.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, array\\<int, string\\|null\\>\\|null given\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, bool\\|null given\\.$#"
 			count: 1
@@ -14055,11 +14025,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportSql.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, string given\\.$#"
-			count: 2
-			path: src/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Only booleans are allowed in \\|\\|, array\\<int, string\\> given on the left side\\.$#"
 			count: 1
@@ -15765,11 +15730,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Schema/TableStats.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, int\\|string given\\.$#"
-			count: 1
-			path: src/Plugins/Schema/TableStats.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function rawurldecode expects string, mixed given\\.$#"
 			count: 2
@@ -16590,11 +16550,6 @@ parameters:
 			count: 1
 			path: src/Replication/ReplicationGui.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Replication/ReplicationGui.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given\\.$#"
 			count: 1
@@ -17981,32 +17936,27 @@ parameters:
 			path: src/Table/ColumnsDefinition.php
 
 		-
-			message: "#^Cannot access offset \\(int\\|string\\) on mixed\\.$#"
+			message: "#^Cannot access offset 'isEditable' on mixed\\.$#"
 			count: 2
 			path: src/Table/ColumnsDefinition.php
 
 		-
-			message: "#^Cannot access offset mixed on mixed\\.$#"
+			message: "#^Cannot access offset \\(int\\|string\\) on mixed\\.$#"
 			count: 2
 			path: src/Table/ColumnsDefinition.php
 
 		-
-			message: "#^Cannot cast mixed to string\\.$#"
+			message: "#^Cannot access offset mixed on mixed\\.$#"
 			count: 2
 			path: src/Table/ColumnsDefinition.php
 
 		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			message: "#^Cannot cast mixed to string\\.$#"
 			count: 2
 			path: src/Table/ColumnsDefinition.php
 
 		-
-			message: "#^Offset 'Default' does not exist on array\\{Field\\: mixed, Type\\: mixed, Collation\\: mixed, Null\\: mixed, DefaultType\\: mixed, DefaultValue\\: mixed, Extra\\: mixed, Virtuality\\: mixed, \\.\\.\\.\\}\\|array\\{Field\\: string, Type\\: string, Collation\\: string\\|null, Null\\: 'NO'\\|'YES', Key\\: string, Default\\: string\\|null, Extra\\: string, Privileges\\: string, \\.\\.\\.\\}\\.$#"
-			count: 1
-			path: src/Table/ColumnsDefinition.php
-
-		-
-			message: "#^Offset 'DefaultValue' does not exist on array\\{Field\\: mixed, Type\\: mixed, Collation\\: mixed, Null\\: mixed, DefaultType\\: mixed, DefaultValue\\: mixed, Extra\\: mixed, Virtuality\\: mixed, \\.\\.\\.\\}\\|array\\{Field\\: string, Type\\: string, Collation\\: string\\|null, Null\\: 'NO'\\|'YES', Key\\: string, Default\\: string\\|null, Extra\\: string, Privileges\\: string, \\.\\.\\.\\}\\|array\\{Type\\: ''\\}\\.$#"
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Table/ColumnsDefinition.php