Merge pull request #362 from mauriciofauth/components-final

Add `@final` annotation to `Components` classes
phpmyadmin · Nov 25, 2021 · c78df57 · c78df57
2 parents f45b16c + 072143a
commit c78df57
Show file tree

Hide file tree

Showing 28 changed files with 57 additions and 204 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -80,11 +80,6 @@ parameters:
 			count: 1
 			path: src/Components/AlterOperation.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/AlterOperation.php
-
 		-
 			message: "#^array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string does not accept PhpMyAdmin\\\\SqlParser\\\\Token\\.$#"
 			count: 2
@@ -110,21 +105,6 @@ parameters:
 			count: 1
 			path: src/Components/Array2d.php
 
-		-
-			message: "#^Cannot access an offset on array\\<int, mixed\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
-			count: 1
-			path: src/Components/ArrayObj.php
-
-		-
-			message: "#^Cannot access property \\$raw on array\\<int, mixed\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
-			count: 2
-			path: src/Components/ArrayObj.php
-
-		-
-			message: "#^Cannot access property \\$values on array\\<int, mixed\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
-			count: 2
-			path: src/Components/ArrayObj.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\:\\:__construct\\(\\) has parameter \\$raw with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -155,11 +135,6 @@ parameters:
 			count: 1
 			path: src/Components/ArrayObj.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/ArrayObj.php
-
 		-
 			message: "#^Binary operation \"\\.\" between ' AS ' and array\\|string results in an error\\.$#"
 			count: 1
@@ -211,17 +186,17 @@ parameters:
 			path: src/Components/CaseExpression.php
 
 		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: src/Components/CaseExpression.php
+			path: src/Components/Condition.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition\\:\\:parse\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: src/Components/Condition.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition\\:\\:parse\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$expr of class PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition constructor expects string\\|null, mixed given\\.$#"
 			count: 1
 			path: src/Components/Condition.php
 
@@ -245,11 +220,6 @@ parameters:
 			count: 1
 			path: src/Components/Condition.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 3
-			path: src/Components/Condition.php
-
 		-
 			message: "#^Binary operation \"\\.\" between array\\|string and ' ' results in an error\\.$#"
 			count: 1
@@ -315,11 +285,6 @@ parameters:
 			count: 3
 			path: src/Components/CreateDefinition.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
-			path: src/Components/CreateDefinition.php
-
 		-
 			message: "#^Cannot access property \\$raw on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
 			count: 1
@@ -370,11 +335,6 @@ parameters:
 			count: 1
 			path: src/Components/DataType.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/DataType.php
-
 		-
 			message: "#^Binary operation \"\\.\" between ' AS ' and array\\|string results in an error\\.$#"
 			count: 1
@@ -465,11 +425,6 @@ parameters:
 			count: 1
 			path: src/Components/Expression.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/Expression.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\ExpressionArray\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -515,11 +470,6 @@ parameters:
 			count: 1
 			path: src/Components/FunctionCall.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/FunctionCall.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\GroupKeyword\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -540,11 +490,6 @@ parameters:
 			count: 2
 			path: src/Components/GroupKeyword.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
-			path: src/Components/GroupKeyword.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\IndexHint\\:\\:__construct\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -580,11 +525,6 @@ parameters:
 			count: 1
 			path: src/Components/IndexHint.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 3
-			path: src/Components/IndexHint.php
-
 		-
 			message: "#^Cannot access property \\$values on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
 			count: 1
@@ -675,11 +615,6 @@ parameters:
 			count: 1
 			path: src/Components/IntoKeyword.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/IntoKeyword.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -725,11 +660,6 @@ parameters:
 			count: 1
 			path: src/Components/JoinKeyword.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 4
-			path: src/Components/JoinKeyword.php
-
 		-
 			message: "#^Array \\(array\\<array\\{name\\?\\: string, length\\?\\: int, order\\?\\: string\\}\\>\\) does not accept non\\-empty\\-array\\<string, mixed\\>\\.$#"
 			count: 1
@@ -785,11 +715,6 @@ parameters:
 			count: 1
 			path: src/Components/Key.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/Key.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -810,11 +735,6 @@ parameters:
 			count: 1
 			path: src/Components/Limit.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/Limit.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\LockExpression\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -830,11 +750,6 @@ parameters:
 			count: 1
 			path: src/Components/LockExpression.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/LockExpression.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -875,11 +790,6 @@ parameters:
 			count: 1
 			path: src/Components/OptionsArray.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/OptionsArray.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\OrderKeyword\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -900,11 +810,6 @@ parameters:
 			count: 2
 			path: src/Components/OrderKeyword.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
-			path: src/Components/OrderKeyword.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -945,11 +850,6 @@ parameters:
 			count: 1
 			path: src/Components/ParameterDefinition.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
-			path: src/Components/ParameterDefinition.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\PartitionDefinition\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -990,11 +890,6 @@ parameters:
 			count: 1
 			path: src/Components/PartitionDefinition.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/PartitionDefinition.php
-
 		-
 			message: "#^Cannot access property \\$values on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
 			count: 1
@@ -1040,11 +935,6 @@ parameters:
 			count: 2
 			path: src/Components/Reference.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 1
-			path: src/Components/Reference.php
-
 		-
 			message: "#^Call to function is_array\\(\\) with PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation will always evaluate to false\\.$#"
 			count: 1
@@ -1080,11 +970,6 @@ parameters:
 			count: 2
 			path: src/Components/RenameOperation.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
-			path: src/Components/RenameOperation.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1095,11 +980,6 @@ parameters:
 			count: 1
 			path: src/Components/SetOperation.php
 
-		-
-			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
-			path: src/Components/SetOperation.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\UnionKeyword\\:\\:build\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1