diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f8d6dffb0a..f6c2613c23 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -9176,17 +9176,17 @@ parameters:
 			path: test/classes/AdvisorTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 3
 			path: test/classes/BrowseForeignersTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$string of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringEndsWith\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringEndsWith\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/BrowseForeignersTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$string of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringStartsWith\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringStartsWith\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/BrowseForeignersTest.php
 
@@ -9226,17 +9226,17 @@ parameters:
 			path: test/classes/Command/TwigLintCommandTest.php
 
 		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) with true will always evaluate to false\\.$#"
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) with true will always evaluate to false\\.$#"
 			count: 1
 			path: test/classes/CommonTest.php
 
 		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with \\*NEVER\\* will always evaluate to false\\.$#"
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with \\*NEVER\\* will always evaluate to false\\.$#"
 			count: 1
 			path: test/classes/CommonTest.php
 
 		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with false will always evaluate to false\\.$#"
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with false will always evaluate to false\\.$#"
 			count: 1
 			path: test/classes/CommonTest.php
 
@@ -9251,7 +9251,17 @@ parameters:
 			path: test/classes/Config/DescriptionTest.php
 
 		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with null will always evaluate to false\\.$#"
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with ''\\|'; Compressed export…'\\|'Compressed export…'\\|'Compressed import…' and null will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/Config/FormDisplayTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 'string' and 'NULL' will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/Config/FormDisplayTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with null will always evaluate to false\\.$#"
 			count: 1
 			path: test/classes/Config/FormDisplayTest.php
 
@@ -9376,7 +9386,7 @@ parameters:
 			path: test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$array of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, mixed given\\.$#"
 			count: 1
 			path: test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
 
@@ -9411,17 +9421,17 @@ parameters:
 			path: test/classes/Controllers/Database/StructureControllerTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$array of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayNotHasKey\\(\\) expects array\\|ArrayAccess, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayNotHasKey\\(\\) expects array\\|ArrayAccess, mixed given\\.$#"
 			count: 1
 			path: test/classes/Controllers/Database/StructureControllerTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 4
 			path: test/classes/Controllers/Database/StructureControllerTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringNotContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringNotContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/Controllers/Database/StructureControllerTest.php
 
@@ -9511,7 +9521,7 @@ parameters:
 			path: test/classes/Database/CentralColumnsTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$needle of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$needle of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/Database/CentralColumnsTest.php
 
@@ -9571,12 +9581,12 @@ parameters:
 			path: test/classes/Database/EventsTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 7
 			path: test/classes/Database/QbeTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringNotContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringNotContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/Database/QbeTest.php
 
@@ -9941,7 +9951,7 @@ parameters:
 			path: test/classes/Display/ResultsTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 9
 			path: test/classes/Display/ResultsTest.php
 
@@ -10580,6 +10590,21 @@ parameters:
 			count: 1
 			path: test/classes/ImportTest.php
 
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 'Cardinality1' and int\\|null will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/IndexTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 'PMA_Non_unique' and int will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/IndexTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 'index1' and int will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/IndexTest.php
+
 		-
 			message: "#^Property PhpMyAdmin\\\\Tests\\\\IndexTest\\:\\:\\$params type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -10711,7 +10736,7 @@ parameters:
 			path: test/classes/Partitioning/TablePartitionDefinitionTest.php
 
 		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 32 and 0 will always evaluate to false\\.$#"
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 32 and 0 will always evaluate to false\\.$#"
 			count: 1
 			path: test/classes/Plugins/Auth/AuthenticationCookieTest.php
 
@@ -10741,17 +10766,17 @@ parameters:
 			path: test/classes/Plugins/Auth/AuthenticationHttpTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/Plugins/Export/ExportHtmlwordTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 5
 			path: test/classes/Plugins/Export/ExportOdtTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 2
 			path: test/classes/Plugins/Export/ExportSqlTest.php
 
@@ -10800,6 +10825,11 @@ parameters:
 			count: 1
 			path: test/classes/Plugins/Transformations/TransformationPluginsTest.php
 
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 'subGroupHeader123' and PhpMyAdmin\\\\Properties\\\\PropertyItem\\|null will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
+
 		-
 			message: "#^Parameter \\#1 \\$subgroupHeader of method PhpMyAdmin\\\\Properties\\\\Options\\\\Groups\\\\OptionsPropertySubgroup\\:\\:setSubgroupHeader\\(\\) expects PhpMyAdmin\\\\Properties\\\\PropertyItem, string given\\.$#"
 			count: 1
@@ -10925,11 +10955,31 @@ parameters:
 			count: 1
 			path: test/classes/Stubs/ResponseRenderer.php
 
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) with true will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/TableTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with '5' and int will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/TableTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with array\\<PhpMyAdmin\\\\FieldMetadata\\> and array\\{'aNonValidExampleToR…'\\} will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/TableTest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\TableTest\\:\\:dataValidateName\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: test/classes/TableTest.php
 
+		-
+			message: "#^Offset 'col_order' on array in isset\\(\\) always exists and is not nullable\\.$#"
+			count: 1
+			path: test/classes/TableTest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\TemplateTest\\:\\:providerTestDynamicRender\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -11231,12 +11281,12 @@ parameters:
 			path: test/classes/Utils/HttpRequestTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$needle of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$needle of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/Utils/HttpRequestTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: test/classes/Utils/HttpRequestTest.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index fa4e5af576..8860e84b2a 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -14723,8 +14723,7 @@
       <code>$filesFound</code>
       <code>$filesInfos</code>
     </MixedArgument>
-    <MixedAssignment occurrences="6">
-      <code>$context</code>
+    <MixedAssignment occurrences="5">
       <code>$context</code>
       <code>$context</code>
       <code>$filesFound</code>
@@ -14740,6 +14739,9 @@
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
     </MixedInferredReturnType>
+    <RedundantCondition occurrences="1">
+      <code>assertSame</code>
+    </RedundantCondition>
     <RedundantConditionGivenDocblockType occurrences="4">
       <code>assertFalse</code>
       <code>assertTrue</code>
@@ -14777,6 +14779,11 @@
       <code>$second</code>
     </MixedOperand>
   </file>
+  <file src="test/classes/Config/FormDisplayTemplateTest.php">
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
+  </file>
   <file src="test/classes/Config/FormDisplayTest.php">
     <MixedArrayAccess occurrences="10">
       <code>$_forms['pma_testform']</code>
@@ -14841,7 +14848,8 @@
       <code>assertSame</code>
       <code>assertSame</code>
     </RedundantConditionGivenDocblockType>
-    <TypeDoesNotContainType occurrences="5">
+    <TypeDoesNotContainType occurrences="6">
+      <code>assertSame</code>
       <code>assertSame</code>
       <code>assertSame</code>
       <code>assertSame</code>
@@ -15042,6 +15050,11 @@
       <code>expects</code>
     </UndefinedMethod>
   </file>
+  <file src="test/classes/Controllers/Table/ReplaceControllerTest.php">
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
+  </file>
   <file src="test/classes/Controllers/Table/SearchControllerTest.php">
     <MixedMethodCall occurrences="3">
       <code>method</code>
@@ -15102,6 +15115,10 @@
     <PossiblyNullArgument occurrences="1">
       <code>$page</code>
     </PossiblyNullArgument>
+    <TypeDoesNotContainType occurrences="2">
+      <code>assertSame</code>
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="test/classes/CreateAddFieldTest.php">
     <MixedInferredReturnType occurrences="3">
@@ -15181,11 +15198,6 @@
       <code>expects</code>
     </UndefinedMethod>
   </file>
-  <file src="test/classes/Database/DesignerTest.php">
-    <MixedAssignment occurrences="1">
-      <code>$result</code>
-    </MixedAssignment>
-  </file>
   <file src="test/classes/Database/EventsTest.php">
     <MixedAssignment occurrences="2">
       <code>$_POST[$key]</code>
@@ -15507,17 +15519,10 @@
     </NonInvariantDocblockPropertyType>
   </file>
   <file src="test/classes/Gis/GisVisualizationTest.php">
-    <MixedAssignment occurrences="10">
+    <MixedAssignment occurrences="3">
       <code>$dataSet</code>
       <code>$dataSet</code>
       <code>$queryString</code>
-      <code>$queryString</code>
-      <code>$queryString</code>
-      <code>$queryString</code>
-      <code>$queryString</code>
-      <code>$queryString</code>
-      <code>$queryString</code>
-      <code>$queryString</code>
     </MixedAssignment>
   </file>
   <file src="test/classes/HeaderTest.php">
@@ -15529,9 +15534,6 @@
     </RedundantCast>
   </file>
   <file src="test/classes/Html/GeneratorTest.php">
-    <MixedAssignment occurrences="1">
-      <code>$result</code>
-    </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
     </MixedInferredReturnType>
@@ -15617,7 +15619,7 @@
       <code>$_SESSION['tmpval']['relational_display']</code>
       <code>$_SESSION['tmpval']['relational_display']</code>
     </MixedArrayAssignment>
-    <MixedAssignment occurrences="28">
+    <MixedAssignment occurrences="21">
       <code>$actual</code>
       <code>$actual</code>
       <code>$result</code>
@@ -15639,17 +15641,13 @@
       <code>$result</code>
       <code>$result</code>
       <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
     </MixedInferredReturnType>
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="test/classes/InternalRelationsTest.php">
     <MixedAssignment occurrences="2">
@@ -15815,9 +15813,6 @@
     <MixedArgument occurrences="1">
       <code>$result1['html']</code>
     </MixedArgument>
-    <MixedAssignment occurrences="1">
-      <code>$result</code>
-    </MixedAssignment>
     <RedundantConditionGivenDocblockType occurrences="9">
       <code>assertIsArray</code>
       <code>assertIsArray</code>
@@ -15838,6 +15833,11 @@
       <code>assertNotFalse</code>
     </RedundantConditionGivenDocblockType>
   </file>
+  <file src="test/classes/OperationsTest.php">
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
+  </file>
   <file src="test/classes/PdfTest.php">
     <MixedArgument occurrences="3">
       <code>$arr-&gt;getPDFData()</code>
@@ -15863,6 +15863,9 @@
     <RedundantCondition occurrences="1">
       <code>assertIsString</code>
     </RedundantCondition>
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="test/classes/Plugins/Auth/AuthenticationHttpTest.php">
     <InvalidArgument occurrences="3">
@@ -15878,14 +15881,24 @@
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
     </MixedInferredReturnType>
+    <RedundantCondition occurrences="3">
+      <code>assertSame</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>assertSame</code>
+    </RedundantConditionGivenDocblockType>
   </file>
-  <file src="test/classes/Plugins/Export/ExportCodegenTest.php">
-    <MixedAssignment occurrences="2">
-      <code>$result</code>
-      <code>$result</code>
-    </MixedAssignment>
+  <file src="test/classes/Plugins/Auth/AuthenticationSignonTest.php">
+    <RedundantCondition occurrences="1">
+      <code>assertSame</code>
+    </RedundantCondition>
   </file>
   <file src="test/classes/Plugins/Export/ExportCsvTest.php">
+    <DocblockTypeContradiction occurrences="1">
+      <code>assertSame</code>
+    </DocblockTypeContradiction>
     <MixedAssignment occurrences="7">
       <code>$property</code>
       <code>$property</code>
@@ -15895,6 +15908,20 @@
       <code>$property</code>
       <code>$property</code>
     </MixedAssignment>
+    <RedundantCondition occurrences="2">
+      <code>assertFalse</code>
+      <code>assertSame</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="8">
+      <code>assertFalse</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+      <code>assertSame</code>
+    </RedundantConditionGivenDocblockType>
   </file>
   <file src="test/classes/Plugins/Export/ExportExcelTest.php">
     <MixedAssignment occurrences="4">
@@ -15954,6 +15981,9 @@
       <code>$property</code>
       <code>$property</code>
     </MixedAssignment>
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="test/classes/Plugins/Export/ExportOdtTest.php">
     <InternalMethod occurrences="1">
@@ -15981,6 +16011,9 @@
       <code>$GLOBALS['plugin_param']['single_table']</code>
       <code>$GLOBALS['plugin_param']['single_table']</code>
     </PossiblyInvalidArrayOffset>
+    <TypeDoesNotContainType occurrences="1">
+      <code>assertSame</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="test/classes/Plugins/Export/ExportPdfTest.php">
     <MixedAssignment occurrences="2">
@@ -16000,7 +16033,7 @@
       <code>$properties[1]-&gt;getProperties()</code>
       <code>$result</code>
     </MixedArgument>
-    <MixedAssignment occurrences="21">
+    <MixedAssignment occurrences="19">
       <code>$leaf</code>
       <code>$leaf</code>
       <code>$leaf</code>
@@ -16020,8 +16053,6 @@
       <code>$property</code>
       <code>$result</code>
       <code>$result</code>
-      <code>$result</code>
-      <code>$result</code>
     </MixedAssignment>
     <MixedMethodCall occurrences="1">
       <code>getProperties</code>
@@ -16093,12 +16124,14 @@
     </MixedInferredReturnType>
   </file>
   <file src="test/classes/Plugins/Import/ImportShpTest.php">
-    <MixedArgument occurrences="2">
+    <MixedArgument occurrences="3">
       <code>$import_notice</code>
       <code>$sql_query</code>
+      <code>$sql_query</code>
     </MixedArgument>
-    <RedundantCondition occurrences="1">
+    <RedundantCondition occurrences="2">
       <code>assertFalse</code>
+      <code>assertSame</code>
     </RedundantCondition>
   </file>
   <file src="test/classes/Plugins/Import/ImportSqlTest.php">
@@ -16195,21 +16228,16 @@
     </RedundantCondition>
   </file>
   <file src="test/classes/Server/PrivilegesTest.php">
-    <MixedArgument occurrences="7">
+    <MixedArgument occurrences="5">
       <code>$export</code>
       <code>$extra_data['new_privileges']</code>
       <code>$extra_data['new_user_string']</code>
       <code>$extra_data['new_user_string']</code>
-      <code>$real_sql_query</code>
-      <code>$sql_query</code>
       <code>$title</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$this-&gt;serverPrivileges-&gt;extractPrivInfo(null, true)</code>
     </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="1">
-      <code>$returned_userGroup</code>
-    </MixedAssignment>
     <MixedMethodCall occurrences="19">
       <code>getMessage</code>
       <code>getMessage</code>
@@ -16231,6 +16259,9 @@
       <code>will</code>
       <code>will</code>
     </MixedMethodCall>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>assertNull</code>
+    </RedundantConditionGivenDocblockType>
     <UndefinedMethod occurrences="5">
       <code>expects</code>
       <code>expects</code>
@@ -16262,8 +16293,7 @@
     </MixedInferredReturnType>
   </file>
   <file src="test/classes/Setup/ConfigGeneratorTest.php">
-    <MixedAssignment occurrences="2">
-      <code>$result</code>
+    <MixedAssignment occurrences="1">
       <code>$result</code>
     </MixedAssignment>
   </file>
@@ -16291,9 +16321,6 @@
     </MixedInferredReturnType>
   </file>
   <file src="test/classes/StorageEngineTest.php">
-    <MixedAssignment occurrences="1">
-      <code>$actual</code>
-    </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
     </MixedInferredReturnType>
@@ -16383,14 +16410,16 @@
     </UndefinedMethod>
   </file>
   <file src="test/classes/TableTest.php">
+    <DocblockTypeContradiction occurrences="1">
+      <code>assertSame</code>
+    </DocblockTypeContradiction>
     <InvalidArrayOffset occurrences="2">
       <code>$GLOBALS['sql_drop_table']</code>
       <code>$_POST['old_index']['Key_name']</code>
     </InvalidArrayOffset>
-    <MixedAssignment occurrences="3">
+    <MixedAssignment occurrences="2">
       <code>$is_define_property</code>
       <code>$sql</code>
-      <code>$sql</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
index ef7047b3b7..e273025dcf 100644
--- a/test/classes/AbstractTestCase.php
+++ b/test/classes/AbstractTestCase.php
@@ -104,23 +104,19 @@ abstract class AbstractTestCase extends TestCase
     protected function assertAllQueriesConsumed(): void
     {
         $unUsedQueries = $this->dummyDbi->getUnUsedQueries();
-        $this->assertSame([], $unUsedQueries, 'Some queries where not used !');
+        self::assertSame([], $unUsedQueries, 'Some queries where not used !');
     }
 
     protected function assertAllSelectsConsumed(): void
     {
         $unUsedSelects = $this->dummyDbi->getUnUsedDatabaseSelects();
-        $this->assertSame(
-            [],
-            $unUsedSelects,
-            'Some database selects where not used !'
-        );
+        self::assertSame([], $unUsedSelects, 'Some database selects where not used !');
     }
 
     protected function assertAllErrorCodesConsumed(): void
     {
         if ($this->dummyDbi->hasUnUsedErrors() === false) {
-            $this->assertTrue(true);// increment the assertion count
+            self::assertTrue(true);// increment the assertion count
 
             return;
         }
@@ -205,7 +201,7 @@ abstract class AbstractTestCase extends TestCase
         /** @var ResponseRenderer $response */
         $response = $containerBuilder->get(ResponseRenderer::class);
 
-        $this->assertFalse($response->hasSuccessState(), 'expected the request to fail');
+        self::assertFalse($response->hasSuccessState(), 'expected the request to fail');
     }
 
     protected function assertResponseWasSuccessfull(): void
@@ -214,7 +210,7 @@ abstract class AbstractTestCase extends TestCase
         /** @var ResponseRenderer $response */
         $response = $containerBuilder->get(ResponseRenderer::class);
 
-        $this->assertTrue($response->hasSuccessState(), 'expected the request not to fail');
+        self::assertTrue($response->hasSuccessState(), 'expected the request not to fail');
     }
 
     protected function setGlobalDbi(): void
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
index 35b3171bc0..2947e341dc 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -30,7 +30,7 @@ class AdvisorTest extends AbstractTestCase
     public function testAdvisorBytime(float $time, string $expected): void
     {
         $result = Advisor::byTime($time, 2);
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
     }
 
     public static function advisorTimes(): array
@@ -73,21 +73,21 @@ class AdvisorTest extends AbstractTestCase
         parent::setLanguage();
         $advisor = new Advisor($GLOBALS['dbi'], new ExpressionLanguage());
         $parseResult = include ROOT_PATH . 'libraries/advisory_rules_generic.php';
-        $this->assertIsArray($parseResult);
-        $this->assertArrayHasKey(0, $parseResult);
-        $this->assertIsArray($parseResult[0]);
+        self::assertIsArray($parseResult);
+        self::assertArrayHasKey(0, $parseResult);
+        self::assertIsArray($parseResult[0]);
         $advisor->setVariable('value', 0);
         $advisor->addRule('fired', $rule);
         $runResult = $advisor->getRunResult();
         if (isset($runResult['errors']) || $error !== null) {
-            $this->assertEquals([$error], $runResult['errors']);
+            self::assertSame([$error], $runResult['errors']);
         }
 
         if (! isset($runResult['fired']) && $expected == []) {
             return;
         }
 
-        $this->assertEquals([$expected], $runResult['fired']);
+        self::assertEquals([$expected], $runResult['fired']);
     }
 
     public static function rulesProvider(): array
diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php
index 588c77c956..4cb3291b2f 100644
--- a/test/classes/BookmarkTest.php
+++ b/test/classes/BookmarkTest.php
@@ -46,7 +46,7 @@ class BookmarkTest extends AbstractTestCase
             $GLOBALS['cfg']['Server']['user'],
             'sakila'
         );
-        $this->assertContainsOnlyInstancesOf(Bookmark::class, $actual);
+        self::assertContainsOnlyInstancesOf(Bookmark::class, $actual);
         $this->assertAllSelectsConsumed();
     }
 
@@ -56,14 +56,12 @@ class BookmarkTest extends AbstractTestCase
     public function testGet(): void
     {
         $this->dummyDbi->addSelectDb('phpmyadmin');
-        $this->assertNull(
-            Bookmark::get(
-                $GLOBALS['dbi'],
-                $GLOBALS['cfg']['Server']['user'],
-                'phpmyadmin',
-                '1'
-            )
-        );
+        self::assertNull(Bookmark::get(
+            $GLOBALS['dbi'],
+            $GLOBALS['cfg']['Server']['user'],
+            'phpmyadmin',
+            '1'
+        ));
         $this->assertAllSelectsConsumed();
     }
 
@@ -80,9 +78,9 @@ class BookmarkTest extends AbstractTestCase
         ];
 
         $bookmark = Bookmark::createBookmark($GLOBALS['dbi'], $bookmarkData);
-        $this->assertNotFalse($bookmark);
+        self::assertNotFalse($bookmark);
         $this->dummyDbi->addSelectDb('phpmyadmin');
-        $this->assertFalse($bookmark->save());
+        self::assertFalse($bookmark->save());
         $this->assertAllSelectsConsumed();
     }
 }
diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
index e60f7352ae..c5c30624b9 100644
--- a/test/classes/BrowseForeignersTest.php
+++ b/test/classes/BrowseForeignersTest.php
@@ -34,34 +34,20 @@ class BrowseForeignersTest extends AbstractTestCase
      */
     public function testGetForeignLimit(): void
     {
-        $this->assertNull(
-            $this->browseForeigners->getForeignLimit('Show all')
-        );
+        self::assertNull($this->browseForeigners->getForeignLimit('Show all'));
 
-        $this->assertEquals(
-            'LIMIT 0, 25 ',
-            $this->browseForeigners->getForeignLimit(null)
-        );
+        self::assertSame('LIMIT 0, 25 ', $this->browseForeigners->getForeignLimit(null));
 
         $_POST['pos'] = 10;
 
-        $this->assertEquals(
-            'LIMIT 10, 25 ',
-            $this->browseForeigners->getForeignLimit(null)
-        );
+        self::assertSame('LIMIT 10, 25 ', $this->browseForeigners->getForeignLimit(null));
 
         $GLOBALS['cfg']['MaxRows'] = 50;
         $browseForeigners = new BrowseForeigners(new Template());
 
-        $this->assertEquals(
-            'LIMIT 10, 50 ',
-            $browseForeigners->getForeignLimit(null)
-        );
+        self::assertSame('LIMIT 10, 50 ', $browseForeigners->getForeignLimit(null));
 
-        $this->assertEquals(
-            'LIMIT 10, 50 ',
-            $browseForeigners->getForeignLimit('xyz')
-        );
+        self::assertSame('LIMIT 10, 50 ', $browseForeigners->getForeignLimit('xyz'));
     }
 
     /**
@@ -69,30 +55,24 @@ class BrowseForeignersTest extends AbstractTestCase
      */
     public function testGetHtmlForGotoPage(): void
     {
-        $this->assertEquals(
-            '',
-            $this->callFunction(
-                $this->browseForeigners,
-                BrowseForeigners::class,
-                'getHtmlForGotoPage',
-                [null]
-            )
-        );
+        self::assertSame('', $this->callFunction(
+            $this->browseForeigners,
+            BrowseForeigners::class,
+            'getHtmlForGotoPage',
+            [null]
+        ));
 
         $_POST['pos'] = 15;
         $foreignData = [];
         $foreignData['disp_row'] = [];
         $foreignData['the_total'] = 5;
 
-        $this->assertEquals(
-            '',
-            $this->callFunction(
-                $this->browseForeigners,
-                BrowseForeigners::class,
-                'getHtmlForGotoPage',
-                [$foreignData]
-            )
-        );
+        self::assertSame('', $this->callFunction(
+            $this->browseForeigners,
+            BrowseForeigners::class,
+            'getHtmlForGotoPage',
+            [$foreignData]
+        ));
 
         $foreignData['the_total'] = 30;
         $result = $this->callFunction(
@@ -102,15 +82,15 @@ class BrowseForeignersTest extends AbstractTestCase
             [$foreignData]
         );
 
-        $this->assertStringStartsWith('Page number:', $result);
+        self::assertStringStartsWith('Page number:', $result);
 
-        $this->assertStringEndsWith('</select>', $result);
+        self::assertStringEndsWith('</select>', $result);
 
-        $this->assertStringContainsString('<select class="pageselector ajax" name="pos"', $result);
+        self::assertStringContainsString('<select class="pageselector ajax" name="pos"', $result);
 
-        $this->assertStringContainsString('<option selected="selected" style="font-weight: bold" value="0">', $result);
+        self::assertStringContainsString('<option selected="selected" style="font-weight: bold" value="0">', $result);
 
-        $this->assertStringContainsString('<option  value="25"', $result);
+        self::assertStringContainsString('<option  value="25"', $result);
     }
 
     /**
@@ -120,34 +100,28 @@ class BrowseForeignersTest extends AbstractTestCase
     {
         $desc = 'foobar<baz';
 
-        $this->assertEquals(
-            [
-                'foobar<baz',
-                '',
-            ],
-            $this->callFunction(
-                $this->browseForeigners,
-                BrowseForeigners::class,
-                'getDescriptionAndTitle',
-                [$desc]
-            )
-        );
+        self::assertSame([
+            'foobar<baz',
+            '',
+        ], $this->callFunction(
+            $this->browseForeigners,
+            BrowseForeigners::class,
+            'getDescriptionAndTitle',
+            [$desc]
+        ));
 
         $GLOBALS['cfg']['LimitChars'] = 5;
         $browseForeigners = new BrowseForeigners(new Template());
 
-        $this->assertEquals(
-            [
-                'fooba...',
-                'foobar<baz',
-            ],
-            $this->callFunction(
-                $browseForeigners,
-                BrowseForeigners::class,
-                'getDescriptionAndTitle',
-                [$desc]
-            )
-        );
+        self::assertSame([
+            'fooba...',
+            'foobar<baz',
+        ], $this->callFunction(
+            $browseForeigners,
+            BrowseForeigners::class,
+            'getDescriptionAndTitle',
+            [$desc]
+        ));
     }
 
     /**
@@ -173,36 +147,30 @@ class BrowseForeignersTest extends AbstractTestCase
             $current_value
         );
 
-        $this->assertStringContainsString(
-            '<form class="ajax" '
-            . 'id="browse_foreign_form" name="browse_foreign_from" '
-            . 'action="index.php?route=/browse-foreigners',
-            $result
-        );
-        $this->assertStringContainsString('" method="post">', $result);
+        self::assertStringContainsString('<form class="ajax" '
+        . 'id="browse_foreign_form" name="browse_foreign_from" '
+        . 'action="index.php?route=/browse-foreigners', $result);
+        self::assertStringContainsString('" method="post">', $result);
 
-        $this->assertStringContainsString('<fieldset class="row g-3 align-items-center mb-3">', $result);
+        self::assertStringContainsString('<fieldset class="row g-3 align-items-center mb-3">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="field" value="foo">', $result);
+        self::assertStringContainsString('<input type="hidden" name="field" value="foo">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="fieldkey" value="bar">', $result);
+        self::assertStringContainsString('<input type="hidden" name="fieldkey" value="bar">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="rownumber" value="1">', $result);
+        self::assertStringContainsString('<input type="hidden" name="rownumber" value="1">', $result);
 
-        $this->assertStringContainsString('<div class="col-auto">', $result);
-        $this->assertStringContainsString('<label class="form-label" for="input_foreign_filter">', $result);
-        $this->assertStringContainsString(
-            '<input class="form-control" type="text" name="foreign_filter" '
-            . 'id="input_foreign_filter" value="5" data-old="5">',
-            $result
-        );
+        self::assertStringContainsString('<div class="col-auto">', $result);
+        self::assertStringContainsString('<label class="form-label" for="input_foreign_filter">', $result);
+        self::assertStringContainsString('<input class="form-control" type="text" name="foreign_filter" '
+        . 'id="input_foreign_filter" value="5" data-old="5">', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input class="btn btn-primary" type="submit" name="submit_foreign_filter" value="Go">',
             $result
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table class="table table-striped table-hover" id="browse_foreign_table">',
             $result
         );
@@ -218,11 +186,11 @@ class BrowseForeignersTest extends AbstractTestCase
             $current_value
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table class="table table-striped table-hover" id="browse_foreign_table">',
             $result
         );
 
-        $this->assertStringContainsString('<th>', $result);
+        self::assertStringContainsString('<th>', $result);
     }
 }
diff --git a/test/classes/CacheTest.php b/test/classes/CacheTest.php
index 39be97aa7a..b9cddf044d 100644
--- a/test/classes/CacheTest.php
+++ b/test/classes/CacheTest.php
@@ -45,11 +45,11 @@ class CacheTest extends AbstractTestCase
      */
     public function testCacheHas(string $cacheKey, $valueToCache): void
     {
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertTrue(Cache::set($cacheKey, $valueToCache));
-        $this->assertTrue(Cache::has($cacheKey));
-        $this->assertTrue(Cache::remove($cacheKey));
-        $this->assertFalse(Cache::has($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertTrue(Cache::set($cacheKey, $valueToCache));
+        self::assertTrue(Cache::has($cacheKey));
+        self::assertTrue(Cache::remove($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
     }
 
     /**
@@ -59,11 +59,11 @@ class CacheTest extends AbstractTestCase
      */
     public function testCachePurge(string $cacheKey, $valueToCache): void
     {
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertTrue(Cache::set($cacheKey, $valueToCache));
-        $this->assertTrue(Cache::has($cacheKey));
-        $this->assertTrue(Cache::purge());
-        $this->assertFalse(Cache::has($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertTrue(Cache::set($cacheKey, $valueToCache));
+        self::assertTrue(Cache::has($cacheKey));
+        self::assertTrue(Cache::purge());
+        self::assertFalse(Cache::has($cacheKey));
     }
 
     /**
@@ -73,9 +73,9 @@ class CacheTest extends AbstractTestCase
      */
     public function testCacheSet(string $cacheKey, $valueToCache): void
     {
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertTrue(Cache::set($cacheKey, $valueToCache));
-        $this->assertTrue(Cache::has($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertTrue(Cache::set($cacheKey, $valueToCache));
+        self::assertTrue(Cache::has($cacheKey));
     }
 
     /**
@@ -85,10 +85,10 @@ class CacheTest extends AbstractTestCase
      */
     public function testCacheGet(string $cacheKey, $valueToCache): void
     {
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertTrue(Cache::set($cacheKey, $valueToCache));
-        $this->assertTrue(Cache::has($cacheKey));
-        $this->assertSame(Cache::get($cacheKey), $valueToCache);
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertTrue(Cache::set($cacheKey, $valueToCache));
+        self::assertTrue(Cache::has($cacheKey));
+        self::assertSame(Cache::get($cacheKey), $valueToCache);
     }
 
     /**
@@ -98,16 +98,16 @@ class CacheTest extends AbstractTestCase
      */
     public function testCacheGetDefaultValue(string $cacheKey, $valueToCache): void
     {
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertTrue(Cache::set($cacheKey, $valueToCache));
-        $this->assertTrue(Cache::has($cacheKey));
-        $this->assertSame(Cache::get($cacheKey, null), $valueToCache);
-        $this->assertTrue(Cache::remove($cacheKey));
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertNull(Cache::get($cacheKey, null));
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertTrue(Cache::set($cacheKey, $valueToCache));
+        self::assertTrue(Cache::has($cacheKey));
+        self::assertSame(Cache::get($cacheKey, null), $valueToCache);
+        self::assertTrue(Cache::remove($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertNull(Cache::get($cacheKey, null));
         $defaultValue = new stdClass();
-        $this->assertSame($defaultValue, Cache::get($cacheKey, $defaultValue));
-        $this->assertFalse(Cache::get($cacheKey, false));
+        self::assertSame($defaultValue, Cache::get($cacheKey, $defaultValue));
+        self::assertFalse(Cache::get($cacheKey, false));
     }
 
     /**
@@ -117,10 +117,10 @@ class CacheTest extends AbstractTestCase
      */
     public function testCacheRemove(string $cacheKey, $valueToCache): void
     {
-        $this->assertFalse(Cache::has($cacheKey));
-        $this->assertTrue(Cache::set($cacheKey, $valueToCache));
-        $this->assertTrue(Cache::has($cacheKey));
-        $this->assertTrue(Cache::remove($cacheKey));
-        $this->assertFalse(Cache::has($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
+        self::assertTrue(Cache::set($cacheKey, $valueToCache));
+        self::assertTrue(Cache::has($cacheKey));
+        self::assertTrue(Cache::remove($cacheKey));
+        self::assertFalse(Cache::has($cacheKey));
     }
 }
diff --git a/test/classes/Charsets/CharsetTest.php b/test/classes/Charsets/CharsetTest.php
index 93782260ae..fb2b644706 100644
--- a/test/classes/Charsets/CharsetTest.php
+++ b/test/classes/Charsets/CharsetTest.php
@@ -23,10 +23,10 @@ class CharsetTest extends AbstractTestCase
 
         $charset = Charset::fromServer($serverCharset);
 
-        $this->assertInstanceOf(Charset::class, $charset);
-        $this->assertSame('utf8', $charset->getName());
-        $this->assertSame('utf8_general_ci', $charset->getDefaultCollation());
-        $this->assertSame('UTF-8 Unicode', $charset->getDescription());
-        $this->assertSame(3, $charset->getMaxLength());
+        self::assertInstanceOf(Charset::class, $charset);
+        self::assertSame('utf8', $charset->getName());
+        self::assertSame('utf8_general_ci', $charset->getDefaultCollation());
+        self::assertSame('UTF-8 Unicode', $charset->getDescription());
+        self::assertSame(3, $charset->getMaxLength());
     }
 }
diff --git a/test/classes/Charsets/CollationTest.php b/test/classes/Charsets/CollationTest.php
index aeee685a41..ed9dca1d39 100644
--- a/test/classes/Charsets/CollationTest.php
+++ b/test/classes/Charsets/CollationTest.php
@@ -26,15 +26,15 @@ class CollationTest extends AbstractTestCase
 
         $collation = Collation::fromServer($serverCollation);
 
-        $this->assertInstanceOf(Collation::class, $collation);
-        $this->assertSame('utf8_general_ci', $collation->getName());
-        $this->assertSame('Unicode, case-insensitive', $collation->getDescription());
-        $this->assertSame('utf8', $collation->getCharset());
-        $this->assertSame(33, $collation->getId());
-        $this->assertTrue($collation->isDefault());
-        $this->assertTrue($collation->isCompiled());
-        $this->assertSame(1, $collation->getSortLength());
-        $this->assertSame('PAD SPACE', $collation->getPadAttribute());
+        self::assertInstanceOf(Collation::class, $collation);
+        self::assertSame('utf8_general_ci', $collation->getName());
+        self::assertSame('Unicode, case-insensitive', $collation->getDescription());
+        self::assertSame('utf8', $collation->getCharset());
+        self::assertSame(33, $collation->getId());
+        self::assertTrue($collation->isDefault());
+        self::assertTrue($collation->isCompiled());
+        self::assertSame(1, $collation->getSortLength());
+        self::assertSame('PAD SPACE', $collation->getPadAttribute());
     }
 
     /**
@@ -48,7 +48,7 @@ class CollationTest extends AbstractTestCase
     public function testBuildDescription(string $collation, string $description): void
     {
         $actual = Collation::fromServer(['Collation' => $collation]);
-        $this->assertEquals($description, $actual->getDescription());
+        self::assertSame($description, $actual->getDescription());
     }
 
     /**
diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php
index c7dfaba92d..fc65521402 100644
--- a/test/classes/CharsetsTest.php
+++ b/test/classes/CharsetsTest.php
@@ -46,32 +46,32 @@ class CharsetsTest extends AbstractTestCase
         );
 
         $charset = Charsets::getServerCharset($GLOBALS['dbi'], $GLOBALS['cfg']['Server']['DisableIS']);
-        $this->assertSame('utf8', $charset->getName());
+        self::assertSame('utf8', $charset->getName());
 
         $charset = Charsets::getServerCharset($GLOBALS['dbi'], $GLOBALS['cfg']['Server']['DisableIS']);
-        $this->assertSame('Unknown', $charset->getName());
+        self::assertSame('Unknown', $charset->getName());
 
         $charset = Charsets::getServerCharset($GLOBALS['dbi'], $GLOBALS['cfg']['Server']['DisableIS']);
-        $this->assertSame('utf8', $charset->getName());
+        self::assertSame('utf8', $charset->getName());
 
         $this->assertAllQueriesConsumed();
     }
 
     public function testFindCollationByName(): void
     {
-        $this->assertNull(Charsets::findCollationByName(
+        self::assertNull(Charsets::findCollationByName(
             $GLOBALS['dbi'],
             $GLOBALS['cfg']['Server']['DisableIS'],
             null
         ));
 
-        $this->assertNull(Charsets::findCollationByName(
+        self::assertNull(Charsets::findCollationByName(
             $GLOBALS['dbi'],
             $GLOBALS['cfg']['Server']['DisableIS'],
             ''
         ));
 
-        $this->assertNull(Charsets::findCollationByName(
+        self::assertNull(Charsets::findCollationByName(
             $GLOBALS['dbi'],
             $GLOBALS['cfg']['Server']['DisableIS'],
             'invalid'
@@ -83,19 +83,19 @@ class CharsetsTest extends AbstractTestCase
             'utf8_general_ci'
         );
 
-        $this->assertInstanceOf(Charsets\Collation::class, $actual);
+        self::assertInstanceOf(Charsets\Collation::class, $actual);
 
-        $this->assertSame('utf8_general_ci', $actual->getName());
+        self::assertSame('utf8_general_ci', $actual->getName());
     }
 
     public function testGetCollationsMariaDB(): void
     {
         $this->dbi->setVersion(['@@version' => '10.10.0-MariaDB']);
         $collations = Charsets::getCollations($this->dbi, false);
-        $this->assertCount(4, $collations);
-        $this->assertContainsOnly('array', $collations);
+        self::assertCount(4, $collations);
+        self::assertContainsOnly('array', $collations);
         foreach ($collations as $collation) {
-            $this->assertContainsOnlyInstancesOf(Charsets\Collation::class, $collation);
+            self::assertContainsOnlyInstancesOf(Charsets\Collation::class, $collation);
         }
     }
 }
diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php
index f258940905..2fa7e0128f 100644
--- a/test/classes/CheckUserPrivilegesTest.php
+++ b/test/classes/CheckUserPrivilegesTest.php
@@ -46,11 +46,11 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             'GRANT ALL PRIVILEGES ON *.* TO \'root\'@\'localhost\' WITH GRANT OPTION'
         );
 
-        $this->assertEquals('ALL PRIVILEGES', $show_grants_str);
+        self::assertSame('ALL PRIVILEGES', $show_grants_str);
 
-        $this->assertEquals('*', $show_grants_dbname);
+        self::assertSame('*', $show_grants_dbname);
 
-        $this->assertEquals('*', $show_grants_tblname);
+        self::assertSame('*', $show_grants_tblname);
 
         // TEST CASE 2
 
@@ -62,11 +62,11 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             'GRANT ALL PRIVILEGES ON `mysql`.* TO \'root\'@\'localhost\' WITH GRANT OPTION'
         );
 
-        $this->assertEquals('ALL PRIVILEGES', $show_grants_str);
+        self::assertSame('ALL PRIVILEGES', $show_grants_str);
 
-        $this->assertEquals('mysql', $show_grants_dbname);
+        self::assertSame('mysql', $show_grants_dbname);
 
-        $this->assertEquals('*', $show_grants_tblname);
+        self::assertSame('*', $show_grants_tblname);
 
         // TEST CASE 3
 
@@ -78,11 +78,11 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             'GRANT SELECT, INSERT, UPDATE, DELETE ON `mysql`.`columns_priv` TO \'root\'@\'localhost\''
         );
 
-        $this->assertEquals('SELECT, INSERT, UPDATE, DELETE', $show_grants_str);
+        self::assertSame('SELECT, INSERT, UPDATE, DELETE', $show_grants_str);
 
-        $this->assertEquals('mysql', $show_grants_dbname);
+        self::assertSame('mysql', $show_grants_dbname);
 
-        $this->assertEquals('columns_priv', $show_grants_tblname);
+        self::assertSame('columns_priv', $show_grants_tblname);
 
         // TEST CASE 4
 
@@ -94,7 +94,7 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             'GRANT ALL PRIVILEGES ON `cptest\_.`.* TO \'cptest\'@\'localhost\''
         );
 
-        $this->assertEquals('cptest\_.', $show_grants_dbname);
+        self::assertSame('cptest\_.', $show_grants_dbname);
 
         [
             $show_grants_str,
@@ -105,7 +105,7 @@ class CheckUserPrivilegesTest extends AbstractTestCase
                 . 'l.m.n.o.p.q.r.s.t.u.v.w.x.y.z`.* TO \'cptest\'@\'localhost\''
         );
 
-        $this->assertEquals('cptest\_.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z', $show_grants_dbname);
+        self::assertSame('cptest\_.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z', $show_grants_dbname);
     }
 
     /**
@@ -129,13 +129,13 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             $show_grants_tblname
         );
 
-        $this->assertTrue($GLOBALS['col_priv']);
+        self::assertTrue($GLOBALS['col_priv']);
 
-        $this->assertTrue($GLOBALS['db_priv']);
+        self::assertTrue($GLOBALS['db_priv']);
 
-        $this->assertTrue($GLOBALS['proc_priv']);
+        self::assertTrue($GLOBALS['proc_priv']);
 
-        $this->assertTrue($GLOBALS['table_priv']);
+        self::assertTrue($GLOBALS['table_priv']);
 
         // re-initialise the privileges
         $this->setUp();
@@ -156,13 +156,13 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             $show_grants_tblname
         );
 
-        $this->assertTrue($GLOBALS['col_priv']);
+        self::assertTrue($GLOBALS['col_priv']);
 
-        $this->assertTrue($GLOBALS['db_priv']);
+        self::assertTrue($GLOBALS['db_priv']);
 
-        $this->assertTrue($GLOBALS['proc_priv']);
+        self::assertTrue($GLOBALS['proc_priv']);
 
-        $this->assertTrue($GLOBALS['table_priv']);
+        self::assertTrue($GLOBALS['table_priv']);
 
         // re-initialise the privileges
         $this->setUp();
@@ -183,13 +183,13 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             $show_grants_tblname
         );
 
-        $this->assertTrue($GLOBALS['col_priv']);
+        self::assertTrue($GLOBALS['col_priv']);
 
-        $this->assertTrue($GLOBALS['db_priv']);
+        self::assertTrue($GLOBALS['db_priv']);
 
-        $this->assertTrue($GLOBALS['proc_priv']);
+        self::assertTrue($GLOBALS['proc_priv']);
 
-        $this->assertTrue($GLOBALS['table_priv']);
+        self::assertTrue($GLOBALS['table_priv']);
 
         // re-initialise the privileges
         $this->setUp();
@@ -210,12 +210,12 @@ class CheckUserPrivilegesTest extends AbstractTestCase
             $show_grants_tblname
         );
 
-        $this->assertFalse($GLOBALS['col_priv']);
+        self::assertFalse($GLOBALS['col_priv']);
 
-        $this->assertTrue($GLOBALS['db_priv']);
+        self::assertTrue($GLOBALS['db_priv']);
 
-        $this->assertFalse($GLOBALS['proc_priv']);
+        self::assertFalse($GLOBALS['proc_priv']);
 
-        $this->assertFalse($GLOBALS['table_priv']);
+        self::assertFalse($GLOBALS['table_priv']);
     }
 }
diff --git a/test/classes/Command/SetVersionCommandTest.php b/test/classes/Command/SetVersionCommandTest.php
index a6c0da09d8..58e4731122 100644
--- a/test/classes/Command/SetVersionCommandTest.php
+++ b/test/classes/Command/SetVersionCommandTest.php
@@ -206,9 +206,6 @@ final class Version
 }
 
 PHP;
-        $this->assertSame(
-            sprintf($template, $content),
-            $output
-        );
+        self::assertSame(sprintf($template, $content), $output);
     }
 }
diff --git a/test/classes/Command/TwigLintCommandTest.php b/test/classes/Command/TwigLintCommandTest.php
index 326047fc3c..2d6e76d16a 100644
--- a/test/classes/Command/TwigLintCommandTest.php
+++ b/test/classes/Command/TwigLintCommandTest.php
@@ -47,7 +47,7 @@ class TwigLintCommandTest extends AbstractTestCase
             TEST_PATH . 'test/classes/_data/file_listing/subfolder/one.ini',
         ]);
 
-        $this->assertSame('key=value' . "\n", $contents);
+        self::assertSame('key=value' . "\n", $contents);
     }
 
     public function testFindFiles(): void
@@ -58,7 +58,7 @@ class TwigLintCommandTest extends AbstractTestCase
         // Sort results to avoid file system test specific failures
         sort($filesFound, SORT_NATURAL);
 
-        $this->assertEquals([
+        self::assertSame([
             $path . DIRECTORY_SEPARATOR . 'one.txt',
             $path . DIRECTORY_SEPARATOR . 'subfolder' . DIRECTORY_SEPARATOR . 'one.ini',
             $path . DIRECTORY_SEPARATOR . 'subfolder' . DIRECTORY_SEPARATOR . 'zero.txt',
@@ -74,7 +74,7 @@ class TwigLintCommandTest extends AbstractTestCase
         // Sort results to avoid file system test specific failures
         sort($filesInfos, SORT_REGULAR);
 
-        $this->assertEquals([
+        self::assertSame([
             [
                 'template' => '',
                 'file' => $path . DIRECTORY_SEPARATOR . 'one.txt',
@@ -128,7 +128,7 @@ class TwigLintCommandTest extends AbstractTestCase
             TEST_PATH . 'test/classes/_data/file_listing',
         ]);
 
-        $this->assertEquals([
+        self::assertEquals([
             [
                 'template' => '{{ file }}',
                 'file' => 'foo.twig',
@@ -154,20 +154,20 @@ class TwigLintCommandTest extends AbstractTestCase
             0,
         ]);
 
-        $this->assertEquals([1 => '{{ file }'], $context);
+        self::assertSame([1 => '{{ file }'], $context);
 
         $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', [
             '{{ file }',
             3,
         ]);
 
-        $this->assertEquals([1 => '{{ file }'], $context);
+        self::assertSame([1 => '{{ file }'], $context);
 
         $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', [
             '{{ file }',
             5,
         ]);
 
-        $this->assertEquals([], $context);
+        self::assertSame([], $context);
     }
 }
diff --git a/test/classes/Command/WriteGitRevisionCommandTest.php b/test/classes/Command/WriteGitRevisionCommandTest.php
index f3d11277d1..fd61b2d156 100644
--- a/test/classes/Command/WriteGitRevisionCommandTest.php
+++ b/test/classes/Command/WriteGitRevisionCommandTest.php
@@ -72,15 +72,12 @@ return [
 ];
 
 PHP;
-        $this->assertSame(
-            sprintf(
-                $template,
-                'RELEASE_5_1_0-638-g1c018e2a6c',
-                'https://github.com/phpmyadmin/phpmyadmin/commit/1c018e2a6c6d518c4a2dde059e49f33af67c4636',
-                'cli-rev-info',
-                'https://github.com/phpmyadmin/phpmyadmin/tree/cli-rev-info'
-            ),
-            $output
-        );
+        self::assertSame(sprintf(
+            $template,
+            'RELEASE_5_1_0-638-g1c018e2a6c',
+            'https://github.com/phpmyadmin/phpmyadmin/commit/1c018e2a6c6d518c4a2dde059e49f33af67c4636',
+            'cli-rev-info',
+            'https://github.com/phpmyadmin/phpmyadmin/tree/cli-rev-info'
+        ), $output);
     }
 }
diff --git a/test/classes/CommonTest.php b/test/classes/CommonTest.php
index e4633ccc7a..9654b16571 100644
--- a/test/classes/CommonTest.php
+++ b/test/classes/CommonTest.php
@@ -25,7 +25,7 @@ class CommonTest extends AbstractTestCase
         $_SERVER['REQUEST_URI'] = $request;
         $_SERVER['PATH_INFO'] = $path_info;
         Common::cleanupPathInfo();
-        $this->assertEquals($expected, $GLOBALS['PMA_PHP_SELF']);
+        self::assertSame($expected, $GLOBALS['PMA_PHP_SELF']);
     }
 
     public static function providerForTestCleanupPathInfo(): array
@@ -88,33 +88,33 @@ class CommonTest extends AbstractTestCase
 
         $_SERVER['REQUEST_METHOD'] = 'GET';
         Common::checkTokenRequestParam();
-        $this->assertTrue($token_mismatch);
-        $this->assertFalse($token_provided);
+        self::assertTrue($token_mismatch);
+        self::assertFalse($token_provided);
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['test'] = 'test';
         Common::checkTokenRequestParam();
-        $this->assertTrue($token_mismatch);
-        $this->assertFalse($token_provided);
-        $this->assertArrayNotHasKey('test', $_POST);
+        self::assertTrue($token_mismatch);
+        self::assertFalse($token_provided);
+        self::assertArrayNotHasKey('test', $_POST);
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['token'] = 'token';
         $_POST['test'] = 'test';
         $_SESSION[' PMA_token '] = 'mismatch';
         Common::checkTokenRequestParam();
-        $this->assertTrue($token_mismatch);
-        $this->assertTrue($token_provided);
-        $this->assertArrayNotHasKey('test', $_POST);
+        self::assertTrue($token_mismatch);
+        self::assertTrue($token_provided);
+        self::assertArrayNotHasKey('test', $_POST);
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['token'] = 'token';
         $_POST['test'] = 'test';
         $_SESSION[' PMA_token '] = 'token';
         Common::checkTokenRequestParam();
-        $this->assertFalse($token_mismatch);
-        $this->assertTrue($token_provided);
-        $this->assertArrayHasKey('test', $_POST);
-        $this->assertEquals('test', $_POST['test']);
+        self::assertFalse($token_mismatch);
+        self::assertTrue($token_provided);
+        self::assertArrayHasKey('test', $_POST);
+        self::assertSame('test', $_POST['test']);
     }
 }
diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
index 1a8af14f05..fbdfc13d99 100644
--- a/test/classes/Config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -55,20 +55,14 @@ class ConfigFileTest extends AbstractTestCase
     public function testNewObjectState(): void
     {
         // Check default dynamic values
-        $this->assertEquals(
-            [],
-            $this->object->getConfig()
-        );
+        self::assertSame([], $this->object->getConfig());
 
         // Check environment state
-        $this->assertEquals(
-            [],
-            $_SESSION['ConfigFile1']
-        );
+        self::assertSame([], $_SESSION['ConfigFile1']);
 
         // Validate default value used in tests
         $default_value = $this->object->getDefault(self::SIMPLE_KEY_WITH_DEFAULT_VALUE);
-        $this->assertNotNull($default_value);
+        self::assertNotNull($default_value);
     }
 
     /**
@@ -90,7 +84,7 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_simple_value);
         $this->object->set('Servers/1/host', $default_host);
         $this->object->set('Servers/2/host', $default_host);
-        $this->assertEmpty($this->object->getConfig());
+        self::assertEmpty($this->object->getConfig());
 
         /**
          * Case 2: persistent keys should be always present in flat array,
@@ -98,21 +92,15 @@ class ConfigFileTest extends AbstractTestCase
          */
         $this->object->setPersistKeys(array_keys($default_config));
         $this->object->resetConfigData();
-        $this->assertEmpty($this->object->getConfig());
-        $this->assertEquals(
-            $default_config,
-            $this->object->getConfigArray()
-        );
+        self::assertEmpty($this->object->getConfig());
+        self::assertSame($default_config, $this->object->getConfigArray());
 
         /**
          * Case 3: persistent keys should be always saved,
          * even if set to default values
          */
         $this->object->set('Servers/2/host', $default_host);
-        $this->assertEquals(
-            ['Servers' => [2 => ['host' => $default_host]]],
-            $this->object->getConfig()
-        );
+        self::assertSame(['Servers' => [2 => ['host' => $default_host]]], $this->object->getConfig());
     }
 
     /**
@@ -128,13 +116,10 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('b', 2);
         $this->object->set('c', 3);
 
-        $this->assertEquals(
-            [
-                'a' => 1,
-                'c' => 3,
-            ],
-            $this->object->getConfig()
-        );
+        self::assertSame([
+            'a' => 1,
+            'c' => 3,
+        ], $this->object->getConfig());
 
         /**
          * Case 2: disabling filter should allow to set b
@@ -142,14 +127,11 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->setAllowedKeys(null);
         $this->object->set('b', 2);
 
-        $this->assertEquals(
-            [
-                'a' => 1,
-                'b' => 2,
-                'c' => 3,
-            ],
-            $this->object->getConfig()
-        );
+        self::assertEquals([
+            'a' => 1,
+            'b' => 2,
+            'c' => 3,
+        ], $this->object->getConfig());
     }
 
     /**
@@ -167,22 +149,16 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('Servers/1/passthrough2', 2);
         $this->object->updateWithGlobalConfig(['Servers/value1' => 3]);
 
-        $this->assertEquals(
-            [
-                'Servers' => [
-                    1 => [
-                        'passthrough1' => 1,
-                        'passthrough2' => 2,
-                        'value1' => 3,
-                    ],
+        self::assertSame([
+            'Servers' => [
+                1 => [
+                    'passthrough1' => 1,
+                    'passthrough2' => 2,
+                    'value1' => 3,
                 ],
             ],
-            $this->object->getConfig()
-        );
-        $this->assertEquals(
-            3,
-            $this->object->get('Servers/1/value1')
-        );
+        ], $this->object->getConfig());
+        self::assertSame(3, $this->object->get('Servers/1/value1'));
     }
 
     /**
@@ -194,8 +170,8 @@ class ConfigFileTest extends AbstractTestCase
 
         $this->object->resetConfigData();
 
-        $this->assertEmpty($this->object->getConfig());
-        $this->assertEmpty($this->object->getConfigArray());
+        self::assertEmpty($this->object->getConfig());
+        self::assertEmpty($this->object->getConfigArray());
     }
 
     /**
@@ -206,14 +182,8 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('abc', 'should be deleted by setConfigData');
         $this->object->setConfigData(['a' => 'b']);
 
-        $this->assertEquals(
-            ['a' => 'b'],
-            $this->object->getConfig()
-        );
-        $this->assertEquals(
-            ['a' => 'b'],
-            $this->object->getConfigArray()
-        );
+        self::assertSame(['a' => 'b'], $this->object->getConfig());
+        self::assertSame(['a' => 'b'], $this->object->getConfigArray());
     }
 
     /**
@@ -227,32 +197,15 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('Servers/4/host', $nondefault_host);
         $this->object->set('Servers/5/host', $default_host);
         $this->object->set('Servers/6/host', $default_host, 'Servers/6/host');
-        $this->assertEquals(
-            $nondefault_host,
-            $this->object->get('Servers/4/host')
-        );
-        $this->assertEquals(
-            null,
-            $this->object->get('Servers/5/host')
-        );
-        $this->assertEquals(
-            $default_host,
-            $this->object->get('Servers/6/host')
-        );
+        self::assertSame($nondefault_host, $this->object->get('Servers/4/host'));
+        self::assertNull($this->object->get('Servers/5/host'));
+        self::assertSame($default_host, $this->object->get('Servers/6/host'));
 
         // return default value for nonexistent keys
-        $this->assertNull(
-            $this->object->get('key not excist')
-        );
-        $this->assertEquals(
-            [1],
-            $this->object->get('key not excist', [1])
-        );
+        self::assertNull($this->object->get('key not excist'));
+        self::assertSame([1], $this->object->get('key not excist', [1]));
         $default = new stdClass();
-        $this->assertInstanceOf(
-            stdClass::class,
-            $this->object->get('key not excist', $default)
-        );
+        self::assertInstanceOf(stdClass::class, $this->object->get('key not excist', $default));
     }
 
     /**
@@ -264,7 +217,7 @@ class ConfigFileTest extends AbstractTestCase
 
         // default values are not written
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
-        $this->assertEmpty($this->object->getConfig());
+        self::assertEmpty($this->object->getConfig());
     }
 
     /**
@@ -279,7 +232,7 @@ class ConfigFileTest extends AbstractTestCase
             [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value]
         );
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
-        $this->assertEmpty($this->object->getConfig());
+        self::assertEmpty($this->object->getConfig());
 
         // but if config.inc.php differs from the default values,
         // allow to overwrite with value from the default values
@@ -288,10 +241,7 @@ class ConfigFileTest extends AbstractTestCase
             [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $config_inc_php_value]
         );
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
-        $this->assertEquals(
-            [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value],
-            $this->object->getConfig()
-        );
+        self::assertSame([self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value], $this->object->getConfig());
     }
 
     /**
@@ -304,16 +254,16 @@ class ConfigFileTest extends AbstractTestCase
         $flat_default_config = $this->object->getFlatDefaultConfig();
 
         $default_value = $this->object->getDefault(self::SIMPLE_KEY_WITH_DEFAULT_VALUE);
-        $this->assertEquals($default_value, $flat_default_config[self::SIMPLE_KEY_WITH_DEFAULT_VALUE]);
+        self::assertSame($default_value, $flat_default_config[self::SIMPLE_KEY_WITH_DEFAULT_VALUE]);
 
         $localhost_value = $this->object->getDefault('Servers/1/host');
-        $this->assertEquals($localhost_value, $flat_default_config['Servers/1/host']);
+        self::assertSame($localhost_value, $flat_default_config['Servers/1/host']);
 
         $settings = new Settings([]);
         $cfg = $settings->toArray();
 
-        $this->assertGreaterThanOrEqual(100, count($cfg));
-        $this->assertGreaterThanOrEqual(count($cfg), count($flat_default_config));
+        self::assertGreaterThanOrEqual(100, count($cfg));
+        self::assertGreaterThanOrEqual(count($cfg), count($flat_default_config));
     }
 
     /**
@@ -325,13 +275,10 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('key2', 'value');
         $this->object->updateWithGlobalConfig(['key' => 'ABC']);
 
-        $this->assertEquals(
-            [
-                'key' => 'ABC',
-                'key2' => 'value',
-            ],
-            $this->object->getConfig()
-        );
+        self::assertSame([
+            'key' => 'ABC',
+            'key2' => 'value',
+        ], $this->object->getConfig());
     }
 
     /**
@@ -339,15 +286,9 @@ class ConfigFileTest extends AbstractTestCase
      */
     public function testGetCanonicalPath(): void
     {
-        $this->assertEquals(
-            'Servers/1/abcd',
-            $this->object->getCanonicalPath('Servers/2/abcd')
-        );
+        self::assertSame('Servers/1/abcd', $this->object->getCanonicalPath('Servers/2/abcd'));
 
-        $this->assertEquals(
-            'Servers/foo/bar',
-            $this->object->getCanonicalPath('Servers/foo/bar')
-        );
+        self::assertSame('Servers/foo/bar', $this->object->getCanonicalPath('Servers/foo/bar'));
     }
 
     /**
@@ -357,17 +298,11 @@ class ConfigFileTest extends AbstractTestCase
     {
         $cfg_db = include ROOT_PATH . 'libraries/config.values.php';
         // verify that $cfg_db read from config.values.php is valid
-        $this->assertGreaterThanOrEqual(20, count($cfg_db));
+        self::assertGreaterThanOrEqual(20, count($cfg_db));
 
-        $this->assertEquals(
-            $cfg_db['Servers'][1]['port'],
-            $this->object->getDbEntry('Servers/1/port')
-        );
-        $this->assertNull($this->object->getDbEntry('no such key'));
-        $this->assertEquals(
-            [1],
-            $this->object->getDbEntry('no such key', [1])
-        );
+        self::assertSame($cfg_db['Servers'][1]['port'], $this->object->getDbEntry('Servers/1/port'));
+        self::assertNull($this->object->getDbEntry('no such key'));
+        self::assertSame([1], $this->object->getDbEntry('no such key', [1]));
     }
 
     /**
@@ -381,39 +316,24 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('Servers/4/x', 4);
         $this->object->set('ServerDefault', 3);
 
-        $this->assertEquals(
-            4,
-            $this->object->getServerCount()
-        );
+        self::assertSame(4, $this->object->getServerCount());
 
         $this->object->removeServer(2);
         $this->object->removeServer(2);
 
-        $this->assertEquals(
-            2,
-            $this->object->getServerCount()
-        );
+        self::assertSame(2, $this->object->getServerCount());
 
-        $this->assertLessThanOrEqual(
-            2,
-            $this->object->get('ServerDefault')
-        );
-        $this->assertEquals(
-            [
-                'Servers' => [
-                    1 => ['x' => 1],
-                    2 => ['x' => 4],
-                ],
+        self::assertLessThanOrEqual(2, $this->object->get('ServerDefault'));
+        self::assertSame([
+            'Servers' => [
+                1 => ['x' => 1],
+                2 => ['x' => 4],
             ],
-            $this->object->getConfig()
-        );
-        $this->assertEquals(
-            [
-                'Servers/1/x' => 1,
-                'Servers/2/x' => 4,
-            ],
-            $this->object->getConfigArray()
-        );
+        ], $this->object->getConfig());
+        self::assertSame([
+            'Servers/1/x' => 1,
+            'Servers/2/x' => 4,
+        ], $this->object->getConfigArray());
     }
 
     /**
@@ -424,13 +344,10 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('Servers/1/x', 'a');
         $this->object->set('Servers/2/x', 'b');
 
-        $this->assertEquals(
-            [
-                1 => ['x' => 'a'],
-                2 => ['x' => 'b'],
-            ],
-            $this->object->getServers()
-        );
+        self::assertSame([
+            1 => ['x' => 'a'],
+            2 => ['x' => 'b'],
+        ], $this->object->getServers());
     }
 
     /**
@@ -438,10 +355,7 @@ class ConfigFileTest extends AbstractTestCase
      */
     public function testGetServerDSN(): void
     {
-        $this->assertEquals(
-            '',
-            $this->object->getServerDSN(1)
-        );
+        self::assertSame('', $this->object->getServerDSN(1));
 
         $this->object->updateWithGlobalConfig(
             [
@@ -455,10 +369,7 @@ class ConfigFileTest extends AbstractTestCase
                 ],
             ]
         );
-        $this->assertEquals(
-            'mysqli://testUser@example.com:21',
-            $this->object->getServerDSN(1)
-        );
+        self::assertSame('mysqli://testUser@example.com:21', $this->object->getServerDSN(1));
 
         $this->object->updateWithGlobalConfig(
             [
@@ -474,10 +385,7 @@ class ConfigFileTest extends AbstractTestCase
                 ],
             ]
         );
-        $this->assertEquals(
-            'mysqli://testUser@123',
-            $this->object->getServerDSN(1)
-        );
+        self::assertSame('mysqli://testUser@123', $this->object->getServerDSN(1));
 
         $this->object->updateWithGlobalConfig(
             [
@@ -492,10 +400,7 @@ class ConfigFileTest extends AbstractTestCase
                 ],
             ]
         );
-        $this->assertEquals(
-            'mysqli://testUser:***@example.com:21',
-            $this->object->getServerDSN(1)
-        );
+        self::assertSame('mysqli://testUser:***@example.com:21', $this->object->getServerDSN(1));
     }
 
     /**
@@ -503,22 +408,13 @@ class ConfigFileTest extends AbstractTestCase
      */
     public function testGetServerName(): void
     {
-        $this->assertEquals(
-            '',
-            $this->object->getServerName(1)
-        );
+        self::assertSame('', $this->object->getServerName(1));
 
         $this->object->set('Servers/1/host', 'example.com');
-        $this->assertEquals(
-            'example.com',
-            $this->object->getServerName(1)
-        );
+        self::assertSame('example.com', $this->object->getServerName(1));
 
         $this->object->set('Servers/1/verbose', 'testData');
-        $this->assertEquals(
-            'testData',
-            $this->object->getServerName(1)
-        );
+        self::assertSame('testData', $this->object->getServerName(1));
     }
 
     /**
@@ -530,15 +426,12 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('Array/test', ['x', 'y']);
         $default_value = $this->object->getDefault(self::SIMPLE_KEY_WITH_DEFAULT_VALUE);
 
-        $this->assertEquals(
-            [
-                self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value,
-                'Array/test' => [
-                    'x',
-                    'y',
-                ],
+        self::assertEquals([
+            self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value,
+            'Array/test' => [
+                'x',
+                'y',
             ],
-            $this->object->getConfigArray()
-        );
+        ], $this->object->getConfigArray());
     }
 }
diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
index 400d7a4c9a..d454f95664 100644
--- a/test/classes/Config/DescriptionTest.php
+++ b/test/classes/Config/DescriptionTest.php
@@ -34,7 +34,7 @@ class DescriptionTest extends AbstractTestCase
      */
     public function testGet(string $item, string $type, string $expected): void
     {
-        $this->assertEquals($expected, Descriptions::get($item, $type));
+        self::assertSame($expected, Descriptions::get($item, $type));
     }
 
     /**
@@ -68,9 +68,9 @@ class DescriptionTest extends AbstractTestCase
      */
     public function assertGet(string $key): void
     {
-        $this->assertNotNull(Descriptions::get($key, 'name'));
-        $this->assertNotNull(Descriptions::get($key, 'desc'));
-        $this->assertNotNull(Descriptions::get($key, 'cmt'));
+        self::assertNotNull(Descriptions::get($key, 'name'));
+        self::assertNotNull(Descriptions::get($key, 'desc'));
+        self::assertNotNull(Descriptions::get($key, 'cmt'));
     }
 
     /**
@@ -93,8 +93,8 @@ class DescriptionTest extends AbstractTestCase
         foreach ($cfg as $key => $value) {
             $this->assertGet($key);
             if ($key == 'Servers') {
-                $this->assertIsArray($value);
-                $this->assertIsArray($value[1]);
+                self::assertIsArray($value);
+                self::assertIsArray($value[1]);
                 foreach ($value[1] as $item => $val) {
                     $this->assertGet($key . '/1/' . $item);
                     if ($item != 'AllowDeny') {
@@ -102,12 +102,12 @@ class DescriptionTest extends AbstractTestCase
                     }
 
                     foreach ($val as $second => $val2) {
-                        $this->assertNotNull($val2);
+                        self::assertNotNull($val2);
                         $this->assertGet($key . '/1/' . $item . '/' . $second);
                     }
                 }
             } elseif (in_array($key, $nested)) {
-                $this->assertIsArray($value);
+                self::assertIsArray($value);
                 foreach (array_keys($value) as $item) {
                     $this->assertGet($key . '/' . $item);
                 }
diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
index 542d309759..994a8d22d2 100644
--- a/test/classes/Config/FormDisplayTemplateTest.php
+++ b/test/classes/Config/FormDisplayTemplateTest.php
@@ -53,31 +53,31 @@ class FormDisplayTemplateTest extends AbstractTestCase
             $opts
         );
 
-        $this->assertStringContainsString('<tr class="group-header-field group-header-1 disabled-field">', $result);
+        self::assertStringContainsString('<tr class="group-header-field group-header-1 disabled-field">', $result);
 
-        $this->assertStringContainsString('<label for="test/path">', $result);
+        self::assertStringContainsString('<label for="test/path">', $result);
 
-        $this->assertStringContainsString('<a href="https://example.com/" target="documentation"', $result);
+        self::assertStringContainsString('<a href="https://example.com/" target="documentation"', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"',
             $result
         );
 
-        $this->assertStringContainsString('<span class="disabled-notice"', $result);
+        self::assertStringContainsString('<span class="disabled-notice"', $result);
 
-        $this->assertStringContainsString('<small>', $result);
+        self::assertStringContainsString('<small>', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="text" name="test/path" id="test/path" value="val" class="w-75 custom field-error">',
             $result
         );
 
-        $this->assertStringContainsString('<a class="restore-default hide" href="#test/path"', $result);
+        self::assertStringContainsString('<a class="restore-default hide" href="#test/path"', $result);
 
-        $this->assertStringContainsString('<dl class="inline_errors">', $result);
-        $this->assertStringContainsString('<dd>e1</dd>', $result);
-        $this->assertStringContainsString('</dl>', $result);
+        self::assertStringContainsString('<dl class="inline_errors">', $result);
+        self::assertStringContainsString('<dd>e1</dd>', $result);
+        self::assertStringContainsString('</dl>', $result);
 
         // second case
 
@@ -100,18 +100,18 @@ class FormDisplayTemplateTest extends AbstractTestCase
             $opts
         );
 
-        $this->assertStringContainsString('<tr class="group-field group-field-1">', $result);
+        self::assertStringContainsString('<tr class="group-field group-field-1">', $result);
 
-        $this->assertStringContainsString('<input type="checkbox" name="test/path" id="test/path" checked>', $result);
+        self::assertStringContainsString('<input type="checkbox" name="test/path" id="test/path" checked>', $result);
 
-        $this->assertStringContainsString('<a class="userprefs-comment" title="userprefsComment">', $result);
+        self::assertStringContainsString('<a class="userprefs-comment" title="userprefsComment">', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<td class="userprefs-allow" title="Allow users to customize this value">',
             $result
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<a class="set-value hide" href="#test/path=setVal" title="Set value: setVal">',
             $result
         );
@@ -130,7 +130,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
             $opts
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="text" size="25" name="test/path" id="test/path" value="val" class="">',
             $result
         );
@@ -146,7 +146,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
             $opts
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="number" name="test/path" id="test/path" value="val" class="">',
             $result
         );
@@ -163,13 +163,13 @@ class FormDisplayTemplateTest extends AbstractTestCase
             'key2' => false,
         ];
         $result = $this->formDisplayTemplate->displayInput('test/path', 'testName', 'select', true, '', true, $opts);
-        $this->assertStringContainsString('<select name="test/path" id="test/path" class="w-75">', $result);
+        self::assertStringContainsString('<select name="test/path" id="test/path" class="w-75">', $result);
 
-        $this->assertStringContainsString('<option value="1" selected disabled>', $result);
+        self::assertStringContainsString('<option value="1" selected disabled>', $result);
 
-        $this->assertStringContainsString('<option value="key1">', $result);
+        self::assertStringContainsString('<option value="key1">', $result);
 
-        $this->assertStringContainsString('<option value="key2">', $result);
+        self::assertStringContainsString('<option value="key2">', $result);
 
         // select case 2
         $opts['values_escaped'] = false;
@@ -184,10 +184,10 @@ class FormDisplayTemplateTest extends AbstractTestCase
         ];
         $result = $this->formDisplayTemplate->displayInput('test/path', 'testName', 'select', false, '', true, $opts);
 
-        $this->assertStringContainsString('<select name="test/path" id="test/path" class="w-75">', $result);
+        self::assertStringContainsString('<select name="test/path" id="test/path" class="w-75">', $result);
 
         // assertContains doesn't seem to work with htmlentities
-        $this->assertStringContainsString('<option value="a&lt;b">c&amp;d</option>', $result);
+        self::assertStringContainsString('<option value="a&lt;b">c&amp;d</option>', $result);
 
         // list
         $result = $this->formDisplayTemplate->displayInput(
@@ -203,7 +203,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
             $opts
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<textarea cols="35" rows="5" name="test/path" id="test/path" class="">',
             $result
         );
@@ -214,10 +214,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
      */
     public function testDisplayGroupHeader(): void
     {
-        $this->assertEquals(
-            '',
-            $this->formDisplayTemplate->displayGroupHeader('')
-        );
+        self::assertSame('', $this->formDisplayTemplate->displayGroupHeader(''));
 
         $this->formDisplayTemplate->group = 3;
 
@@ -225,7 +222,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
 
         $result = $this->formDisplayTemplate->displayGroupHeader('headerText');
 
-        $this->assertStringContainsString('<tr class="group-header group-header-4">', $result);
+        self::assertStringContainsString('<tr class="group-header group-header-4">', $result);
 
         // without PMA_SETUP
         $this->config->set('is_setup', false);
@@ -234,7 +231,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
 
         $result = $this->formDisplayTemplate->displayGroupHeader('headerText');
 
-        $this->assertStringContainsString('<tr class="group-header group-header-4">', $result);
+        self::assertStringContainsString('<tr class="group-header group-header-4">', $result);
     }
 
     /**
@@ -244,7 +241,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
     {
         $this->formDisplayTemplate->group = 3;
         $this->formDisplayTemplate->displayGroupFooter();
-        $this->assertEquals(2, $this->formDisplayTemplate->group);
+        self::assertSame(2, $this->formDisplayTemplate->group);
     }
 
     /**
@@ -264,14 +261,11 @@ class FormDisplayTemplateTest extends AbstractTestCase
 
         $this->formDisplayTemplate->addJsValidate('testID', $validators, $js);
 
-        $this->assertEquals(
-            [
-                'registerFieldValidator(\'testID\', \'\\\';\', true, '
-                . '[\'\\\\r\\\\n\\\\\\\''
-                . '<scrIpt></\\\' + \\\'script>\'])',
-                'registerFieldValidator(\'testID\', \'\', true)',
-            ],
-            $js
-        );
+        self::assertSame([
+            'registerFieldValidator(\'testID\', \'\\\';\', true, '
+            . '[\'\\\\r\\\\n\\\\\\\''
+            . '<scrIpt></\\\' + \\\'script>\'])',
+            'registerFieldValidator(\'testID\', \'\', true)',
+        ], $js);
     }
 }
diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
index 7c0e4b2442..7dd7455a37 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -68,29 +68,23 @@ class FormDisplayTest extends AbstractTestCase
 
         $this->object->registerForm('pma_testform', $array, 2);
         $_forms = $attrForms->getValue($this->object);
-        $this->assertInstanceOf(Form::class, $_forms['pma_testform']);
+        self::assertInstanceOf(Form::class, $_forms['pma_testform']);
 
         $attrSystemPaths = $reflection->getProperty('systemPaths');
         $attrSystemPaths->setAccessible(true);
 
-        $this->assertEquals(
-            [
-                'Servers/2/test' => 'Servers/1/test',
-                'Servers/2/:group:end:0' => 'Servers/1/:group:end:0',
-            ],
-            $attrSystemPaths->getValue($this->object)
-        );
+        self::assertSame([
+            'Servers/2/test' => 'Servers/1/test',
+            'Servers/2/:group:end:0' => 'Servers/1/:group:end:0',
+        ], $attrSystemPaths->getValue($this->object));
 
         $attrTranslatedPaths = $reflection->getProperty('translatedPaths');
         $attrTranslatedPaths->setAccessible(true);
 
-        $this->assertEquals(
-            [
-                'Servers/2/test' => 'Servers-2-test',
-                'Servers/2/:group:end:0' => 'Servers-2-:group:end:0',
-            ],
-            $attrTranslatedPaths->getValue($this->object)
-        );
+        self::assertSame([
+            'Servers/2/test' => 'Servers-2-test',
+            'Servers/2/:group:end:0' => 'Servers-2-:group:end:0',
+        ], $attrTranslatedPaths->getValue($this->object));
     }
 
     /**
@@ -100,9 +94,7 @@ class FormDisplayTest extends AbstractTestCase
      */
     public function testProcess(): void
     {
-        $this->assertFalse(
-            $this->object->process(true, true)
-        );
+        self::assertFalse($this->object->process(true, true));
 
         $this->object = $this->getMockBuilder(FormDisplay::class)
             ->disableOriginalConstructor()
@@ -118,15 +110,11 @@ class FormDisplayTest extends AbstractTestCase
             ->with([0, 1, 2], false)
             ->will($this->returnValue(true));
 
-        $this->assertTrue(
-            $this->object->process(false, false)
-        );
+        self::assertTrue($this->object->process(false, false));
 
         $attrForms->setValue($this->object, []);
 
-        $this->assertFalse(
-            $this->object->process(false, false)
-        );
+        self::assertFalse($this->object->process(false, false));
     }
 
     /**
@@ -146,7 +134,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $result = $this->object->displayErrors();
 
-        $this->assertNull($result);
+        self::assertNull($result);
 
         $arr = [
             'Servers/1/test' => ['e1'],
@@ -166,12 +154,12 @@ class FormDisplayTest extends AbstractTestCase
 
         $result = $this->object->displayErrors();
 
-        $this->assertIsString($result);
-        $this->assertStringContainsString('<dt>Servers/1/test2</dt>', $result);
-        $this->assertStringContainsString('<dd>e1</dd>', $result);
-        $this->assertStringContainsString('<dt>Form_foobar</dt>', $result);
-        $this->assertStringContainsString('<dd>e2</dd>', $result);
-        $this->assertStringContainsString('<dd>e3</dd>', $result);
+        self::assertIsString($result);
+        self::assertStringContainsString('<dt>Servers/1/test2</dt>', $result);
+        self::assertStringContainsString('<dd>e1</dd>', $result);
+        self::assertStringContainsString('<dt>Form_foobar</dt>', $result);
+        self::assertStringContainsString('<dd>e2</dd>', $result);
+        self::assertStringContainsString('<dd>e3</dd>', $result);
     }
 
     /**
@@ -210,14 +198,11 @@ class FormDisplayTest extends AbstractTestCase
 
         $this->object->fixErrors();
 
-        $this->assertEquals(
-            [
-                'Servers' => [
-                    '1' => ['test' => 'localhost'],
-                ],
+        self::assertSame([
+            'Servers' => [
+                '1' => ['test' => 'localhost'],
             ],
-            $_SESSION['ConfigFile0']
-        );
+        ], $_SESSION['ConfigFile0']);
     }
 
     /**
@@ -230,55 +215,44 @@ class FormDisplayTest extends AbstractTestCase
 
         $arr = ['foo' => 'var'];
         $value = 'foo';
-        $this->assertTrue(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                [
-                    &$value,
-                    $arr,
-                ]
-            )
-        );
+        self::assertTrue($attrValidateSelect->invokeArgs(
+            $this->object,
+            [
+                &$value,
+                $arr,
+            ]
+        ));
 
         $arr = ['' => 'foobar'];
         $value = null;
-        $this->assertTrue(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                [
-                    &$value,
-                    $arr,
-                ]
-            )
-        );
-        $this->assertEquals(
-            'string',
-            gettype($value)
-        );
+        self::assertTrue($attrValidateSelect->invokeArgs(
+            $this->object,
+            [
+                &$value,
+                $arr,
+            ]
+        ));
+        self::assertSame('string', gettype($value));
 
         $arr = [0 => 'foobar'];
         $value = 0;
-        $this->assertTrue(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                [
-                    &$value,
-                    $arr,
-                ]
-            )
-        );
+        self::assertTrue($attrValidateSelect->invokeArgs(
+            $this->object,
+            [
+                &$value,
+                $arr,
+            ]
+        ));
 
         $arr = ['1' => 'foobar'];
         $value = 0;
-        $this->assertFalse(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                [
-                    &$value,
-                    $arr,
-                ]
-            )
-        );
+        self::assertFalse($attrValidateSelect->invokeArgs(
+            $this->object,
+            [
+                &$value,
+                $arr,
+            ]
+        ));
     }
 
     /**
@@ -289,9 +263,7 @@ class FormDisplayTest extends AbstractTestCase
         $attrErrors = new ReflectionProperty(FormDisplay::class, 'errors');
         $attrErrors->setAccessible(true);
 
-        $this->assertFalse(
-            $this->object->hasErrors()
-        );
+        self::assertFalse($this->object->hasErrors());
 
         $attrErrors->setValue(
             $this->object,
@@ -301,9 +273,7 @@ class FormDisplayTest extends AbstractTestCase
             ]
         );
 
-        $this->assertTrue(
-            $this->object->hasErrors()
-        );
+        self::assertTrue($this->object->hasErrors());
     }
 
     /**
@@ -311,20 +281,14 @@ class FormDisplayTest extends AbstractTestCase
      */
     public function testGetDocLink(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             './url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fconfig.html%23cfg_Servers_3_test_2_',
             $this->object->getDocLink('Servers/3/test/2/')
         );
 
-        $this->assertEquals(
-            '',
-            $this->object->getDocLink('Import')
-        );
+        self::assertSame('', $this->object->getDocLink('Import'));
 
-        $this->assertEquals(
-            '',
-            $this->object->getDocLink('Export')
-        );
+        self::assertSame('', $this->object->getDocLink('Export'));
     }
 
     /**
@@ -335,15 +299,9 @@ class FormDisplayTest extends AbstractTestCase
         $method = new ReflectionMethod(FormDisplay::class, 'getOptName');
         $method->setAccessible(true);
 
-        $this->assertEquals(
-            'Servers_',
-            $method->invoke($this->object, 'Servers/1/')
-        );
+        self::assertSame('Servers_', $method->invoke($this->object, 'Servers/1/'));
 
-        $this->assertEquals(
-            'Servers_23_',
-            $method->invoke($this->object, 'Servers/1/23/')
-        );
+        self::assertSame('Servers_23_', $method->invoke($this->object, 'Servers/1/23/'));
     }
 
     /**
@@ -358,10 +316,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $attrUserprefs->setAccessible(true);
         $method->invoke($this->object, null);
-        $this->assertEquals(
-            [],
-            $attrUserprefs->getValue($this->object)
-        );
+        self::assertSame([], $attrUserprefs->getValue($this->object));
     }
 
     /**
@@ -404,7 +359,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $expect['comment_warning'] = 1;
 
-        $this->assertEquals($expect, $opts);
+        self::assertEquals($expect, $opts);
 
         // ZipDump, GZipDump, BZipDump
         $method->invokeArgs(
@@ -425,9 +380,9 @@ class FormDisplayTest extends AbstractTestCase
             'due to missing function gzcompress.';
         }
 
-        $this->assertEquals($comment, $opts['comment']);
+        self::assertSame($comment, $opts['comment']);
 
-        $this->assertTrue($opts['comment_warning']);
+        self::assertTrue($opts['comment_warning']);
 
         $method->invokeArgs(
             $this->object,
@@ -447,9 +402,9 @@ class FormDisplayTest extends AbstractTestCase
             'due to missing function gzencode.';
         }
 
-        $this->assertEquals($comment, $opts['comment']);
+        self::assertSame($comment, $opts['comment']);
 
-        $this->assertTrue($opts['comment_warning']);
+        self::assertTrue($opts['comment_warning']);
 
         $method->invokeArgs(
             $this->object,
@@ -469,9 +424,9 @@ class FormDisplayTest extends AbstractTestCase
             'due to missing function bzcompress.';
         }
 
-        $this->assertEquals($comment, $opts['comment']);
+        self::assertSame($comment, $opts['comment']);
 
-        $this->assertTrue($opts['comment_warning']);
+        self::assertTrue($opts['comment_warning']);
 
         $GLOBALS['config']->set('is_setup', false);
 
@@ -487,7 +442,7 @@ class FormDisplayTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals('maximum 10', $opts['comment']);
+        self::assertSame('maximum 10', $opts['comment']);
 
         $method->invokeArgs(
             $this->object,
@@ -497,7 +452,7 @@ class FormDisplayTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals('maximum 10', $opts['comment']);
+        self::assertSame('maximum 10', $opts['comment']);
 
         $method->invokeArgs(
             $this->object,
@@ -507,6 +462,6 @@ class FormDisplayTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals('maximum 10', $opts['comment']);
+        self::assertSame('maximum 10', $opts['comment']);
     }
 }
diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
index b0898321ee..c6f5400f4b 100644
--- a/test/classes/Config/FormTest.php
+++ b/test/classes/Config/FormTest.php
@@ -57,9 +57,9 @@ class FormTest extends AbstractTestCase
      */
     public function testContructor(): void
     {
-        $this->assertEquals(1, $this->object->index);
-        $this->assertEquals('pma_form_name', $this->object->name);
-        $this->assertArrayHasKey('pma_form1', $this->object->fields);
+        self::assertSame(1, $this->object->index);
+        self::assertSame('pma_form_name', $this->object->name);
+        self::assertArrayHasKey('pma_form1', $this->object->fields);
     }
 
     /**
@@ -74,14 +74,9 @@ class FormTest extends AbstractTestCase
             ['7' => 'Seven']
         );
 
-        $this->assertNull(
-            $this->object->getOptionType('123/4/5/6')
-        );
+        self::assertNull($this->object->getOptionType('123/4/5/6'));
 
-        $this->assertEquals(
-            'Seven',
-            $this->object->getOptionType('123/4/5/7')
-        );
+        self::assertSame('Seven', $this->object->getOptionType('123/4/5/7'));
     }
 
     /**
@@ -89,32 +84,23 @@ class FormTest extends AbstractTestCase
      */
     public function testGetOptionValueList(): void
     {
-        $this->assertEquals(
-            [
-                'NHibernate C# DO',
-                'NHibernate XML',
-            ],
-            $this->object->getOptionValueList('Export/codegen_format')
-        );
+        self::assertSame([
+            'NHibernate C# DO',
+            'NHibernate XML',
+        ], $this->object->getOptionValueList('Export/codegen_format'));
 
-        $this->assertEquals(
-            [
-                'auto' => 'auto',
-                '1' => 1,
-                '0' => 0,
-            ],
-            $this->object->getOptionValueList('OBGzip')
-        );
+        self::assertEquals([
+            'auto' => 'auto',
+            '1' => 1,
+            '0' => 0,
+        ], $this->object->getOptionValueList('OBGzip'));
 
-        $this->assertEquals(
-            [
-                'none' => 'Nowhere',
-                'left' => 'Left',
-                'right' => 'Right',
-                'both' => 'Both',
-            ],
-            $this->object->getOptionValueList('RowActionLinks')
-        );
+        self::assertSame([
+            'none' => 'Nowhere',
+            'left' => 'Left',
+            'right' => 'Right',
+            'both' => 'Both',
+        ], $this->object->getOptionValueList('RowActionLinks'));
     }
 
     /**
@@ -139,18 +125,18 @@ class FormTest extends AbstractTestCase
 
         $result = $this->object->fields;
 
-        $this->assertCount(4, $result);
+        self::assertCount(4, $result);
 
-        $this->assertEquals('pma_form1', $result['pma_form1']);
+        self::assertSame('pma_form1', $result['pma_form1']);
 
-        $this->assertEquals('pma_form2', $result['pma_form2']);
+        self::assertSame('pma_form2', $result['pma_form2']);
 
-        $this->assertEquals('preffoo/foo/bar/test', $result[0]);
+        self::assertSame('preffoo/foo/bar/test', $result[0]);
 
-        $this->assertIsString($result[1]);
+        self::assertIsString($result[1]);
 
         // needs regexp because the counter is static
-        $this->assertMatchesRegularExpressionCompat('/^preffoo\/foo\/bar\/\:group\:end\:\d+$/', $result[1]);
+        self::assertMatchesRegularExpressionCompat('/^preffoo\/foo\/bar\/\:group\:end\:\d+$/', $result[1]);
     }
 
     /**
@@ -175,9 +161,9 @@ class FormTest extends AbstractTestCase
 
         $result = $this->object->fields;
 
-        $this->assertCount(2, $result);
+        self::assertCount(2, $result);
 
-        $this->assertEquals('foo/bar/test', $result['test']);
+        self::assertSame('foo/bar/test', $result['test']);
 
         unset($result['test']);
 
@@ -185,13 +171,13 @@ class FormTest extends AbstractTestCase
 
         $keys = array_keys($result);
         $key = $keys[0];
-        $this->assertIsString($key);
-        $this->assertMatchesRegularExpressionCompat('/^\:group\:end\:(\d+)$/', $key);
+        self::assertIsString($key);
+        self::assertMatchesRegularExpressionCompat('/^\:group\:end\:(\d+)$/', $key);
 
         preg_match('/^\:group\:end\:(\d+)$/', $key, $matches);
         $digit = $matches[1];
 
-        $this->assertEquals('foo/bar/:group:end:' . $digit, $result[':group:end:' . $digit]);
+        self::assertSame('foo/bar/:group:end:' . $digit, $result[':group:end:' . $digit]);
     }
 
     /**
@@ -215,15 +201,12 @@ class FormTest extends AbstractTestCase
 
         $method->invoke($this->object, null);
 
-        $this->assertEquals(
-            [
-                'pma_form1' => 'integer',
-                'pma_form2' => 'select',
-                ':group:end:0' => 'group',
-                '1' => 'NULL',
-            ],
-            $attrFieldsTypes->getValue($this->object)
-        );
+        self::assertSame([
+            'pma_form1' => 'integer',
+            'pma_form2' => 'select',
+            ':group:end:0' => 'group',
+            '1' => 'NULL',
+        ], $attrFieldsTypes->getValue($this->object));
     }
 
     /**
@@ -245,7 +228,7 @@ class FormTest extends AbstractTestCase
 
         $this->object->loadForm('pmaform', ['testForm']);
 
-        $this->assertEquals('pmaform', $this->object->name);
+        self::assertSame('pmaform', $this->object->name);
     }
 
     /**
diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php
index 636e71dbb5..cc06bfd5d0 100644
--- a/test/classes/Config/Forms/FormListTest.php
+++ b/test/classes/Config/Forms/FormListTest.php
@@ -42,23 +42,23 @@ class FormListTest extends AbstractTestCase
         $cf = new ConfigFile($GLOBALS['config']->baseSettings);
 
         /* Static API */
-        $this->assertTrue($class::isValid('Export'));
-        $this->assertEquals($prefix, $class::get('Export'));
+        self::assertTrue($class::isValid('Export'));
+        self::assertSame($prefix, $class::get('Export'));
         foreach ($class::getAll() as $form) {
             $form_class = $class::get($form);
-            $this->assertNotNull($form_class);
-            $this->assertNotNull($form_class::getName());
+            self::assertNotNull($form_class);
+            self::assertNotNull($form_class::getName());
         }
 
-        $this->assertContains('Export/texytext_columns', $class::getFields());
+        self::assertContains('Export/texytext_columns', $class::getFields());
 
         /* Instance handling */
         $forms = new $class($cf);
-        $this->assertInstanceOf(BaseFormList::class, $forms);
-        $this->assertFalse($forms->process());
+        self::assertInstanceOf(BaseFormList::class, $forms);
+        self::assertFalse($forms->process());
         $forms->fixErrors();
-        $this->assertFalse($forms->hasErrors());
-        $this->assertEquals('', $forms->displayErrors());
+        self::assertFalse($forms->hasErrors());
+        self::assertSame('', $forms->displayErrors());
     }
 
     /**
diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php
index 93b28ee493..e0660bd691 100644
--- a/test/classes/Config/PageSettingsTest.php
+++ b/test/classes/Config/PageSettingsTest.php
@@ -36,7 +36,7 @@ class PageSettingsTest extends AbstractTestCase
     {
         $object = new PageSettings('NonExistent');
 
-        $this->assertEquals('', $object->getHTML());
+        self::assertSame('', $object->getHTML());
     }
 
     /**
@@ -49,23 +49,17 @@ class PageSettingsTest extends AbstractTestCase
         $html = $object->getHTML();
 
         // Test some sample parts
-        $this->assertStringContainsString(
-            '<div id="page_settings_modal">'
-            . '<div class="page_settings">'
-            . '<form method="post" '
-            . 'action="index.php&#x3F;db&#x3D;db&amp;server&#x3D;1&amp;lang&#x3D;en" '
-            . 'class="config-form disableAjax">',
-            $html
-        );
+        self::assertStringContainsString('<div id="page_settings_modal">'
+        . '<div class="page_settings">'
+        . '<form method="post" '
+        . 'action="index.php&#x3F;db&#x3D;db&amp;server&#x3D;1&amp;lang&#x3D;en" '
+        . 'class="config-form disableAjax">', $html);
 
-        $this->assertStringContainsString('<input type="hidden" name="submit_save" value="Browse">', $html);
+        self::assertStringContainsString('<input type="hidden" name="submit_save" value="Browse">', $html);
 
-        $this->assertStringContainsString(
-            "registerFieldValidator('MaxRows', 'validatePositiveNumber', true);\n"
-            . "registerFieldValidator('RepeatCells', 'validateNonNegativeNumber', true);\n"
-            . "registerFieldValidator('LimitChars', 'validatePositiveNumber', true);\n",
-            $html
-        );
+        self::assertStringContainsString("registerFieldValidator('MaxRows', 'validatePositiveNumber', true);\n"
+        . "registerFieldValidator('RepeatCells', 'validateNonNegativeNumber', true);\n"
+        . "registerFieldValidator('LimitChars', 'validatePositiveNumber', true);\n", $html);
     }
 
     /**
@@ -78,8 +72,8 @@ class PageSettingsTest extends AbstractTestCase
         $html = $pageSettings->getHTML();
 
         // Test some sample parts
-        $this->assertStringContainsString('<div id="pma_navigation_settings">', $html);
+        self::assertStringContainsString('<div id="pma_navigation_settings">', $html);
 
-        $this->assertStringContainsString('<input type="hidden" name="submit_save" value="Navi">', $html);
+        self::assertStringContainsString('<input type="hidden" name="submit_save" value="Navi">', $html);
     }
 }
diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php
index 2d26e221b5..d6e429d734 100644
--- a/test/classes/Config/ServerConfigChecksTest.php
+++ b/test/classes/Config/ServerConfigChecksTest.php
@@ -79,29 +79,23 @@ class ServerConfigChecksTest extends AbstractTestCase
 
         $configChecker->performConfigChecks();
 
-        $this->assertEquals(
-            [
-                'Servers/1/ssl',
-                'Servers/1/auth_type',
-                'Servers/1/AllowNoPassword',
-                'AllowArbitraryServer',
-                'LoginCookieValidity',
-                'SaveDir',
-                'TempDir',
-            ],
-            array_keys($_SESSION['messages']['notice'])
-        );
+        self::assertSame([
+            'Servers/1/ssl',
+            'Servers/1/auth_type',
+            'Servers/1/AllowNoPassword',
+            'AllowArbitraryServer',
+            'LoginCookieValidity',
+            'SaveDir',
+            'TempDir',
+        ], array_keys($_SESSION['messages']['notice']));
 
-        $this->assertEquals(
-            [
-                'LoginCookieValidity',
-                'GZipDump',
-                'BZipDump',
-                'ZipDump_import',
-                'ZipDump_export',
-            ],
-            array_keys($_SESSION['messages']['error'])
-        );
+        self::assertSame([
+            'LoginCookieValidity',
+            'GZipDump',
+            'BZipDump',
+            'ZipDump_import',
+            'ZipDump_export',
+        ], array_keys($_SESSION['messages']['error']));
     }
 
     public function testBlowfish(): void
@@ -133,14 +127,14 @@ class ServerConfigChecksTest extends AbstractTestCase
          * @psalm-suppress TypeDoesNotContainType
          */
         $secret = $_SESSION[$this->sessionID]['blowfish_secret'] ?? '';
-        $this->assertIsString($secret);
-        $this->assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($secret, '8bit'));
+        self::assertIsString($secret);
+        self::assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($secret, '8bit'));
         $messages = $_SESSION['messages'] ?? null;
-        $this->assertIsArray($messages);
-        $this->assertArrayHasKey('notice', $messages);
-        $this->assertIsArray($messages['notice']);
-        $this->assertArrayHasKey('blowfish_secret_created', $messages['notice']);
-        $this->assertArrayNotHasKey('error', $messages);
+        self::assertIsArray($messages);
+        self::assertArrayHasKey('notice', $messages);
+        self::assertIsArray($messages['notice']);
+        self::assertArrayHasKey('blowfish_secret_created', $messages['notice']);
+        self::assertArrayNotHasKey('error', $messages);
     }
 
     public function testBlowfishWithInvalidSecret(): void
@@ -164,14 +158,14 @@ class ServerConfigChecksTest extends AbstractTestCase
          * @psalm-suppress TypeDoesNotContainType
          */
         $secret = $_SESSION[$this->sessionID]['blowfish_secret'] ?? '';
-        $this->assertIsString($secret);
-        $this->assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($secret, '8bit'));
+        self::assertIsString($secret);
+        self::assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($secret, '8bit'));
         $messages = $_SESSION['messages'] ?? null;
-        $this->assertIsArray($messages);
-        $this->assertArrayHasKey('notice', $messages);
-        $this->assertIsArray($messages['notice']);
-        $this->assertArrayHasKey('blowfish_secret_created', $messages['notice']);
-        $this->assertArrayNotHasKey('error', $messages);
+        self::assertIsArray($messages);
+        self::assertArrayHasKey('notice', $messages);
+        self::assertIsArray($messages['notice']);
+        self::assertArrayHasKey('blowfish_secret_created', $messages['notice']);
+        self::assertArrayNotHasKey('error', $messages);
     }
 
     public function testBlowfishWithValidSecret(): void
@@ -188,13 +182,13 @@ class ServerConfigChecksTest extends AbstractTestCase
          * @psalm-suppress TypeDoesNotContainType
          */
         $secret = $_SESSION[$this->sessionID]['blowfish_secret'] ?? '';
-        $this->assertIsString($secret);
-        $this->assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($secret, '8bit'));
+        self::assertIsString($secret);
+        self::assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($secret, '8bit'));
         $messages = $_SESSION['messages'] ?? null;
-        $this->assertIsArray($messages);
-        $this->assertArrayHasKey('notice', $messages);
-        $this->assertIsArray($messages['notice']);
-        $this->assertArrayNotHasKey('blowfish_secret_created', $messages['notice']);
-        $this->assertArrayNotHasKey('error', $messages);
+        self::assertIsArray($messages);
+        self::assertArrayHasKey('notice', $messages);
+        self::assertIsArray($messages['notice']);
+        self::assertArrayNotHasKey('blowfish_secret_created', $messages['notice']);
+        self::assertArrayNotHasKey('error', $messages);
     }
 }
diff --git a/test/classes/Config/Settings/ConsoleTest.php b/test/classes/Config/Settings/ConsoleTest.php
index 18950ea8c2..e339b441d6 100644
--- a/test/classes/Config/Settings/ConsoleTest.php
+++ b/test/classes/Config/Settings/ConsoleTest.php
@@ -49,7 +49,7 @@ class ConsoleTest extends TestCase
         $settings = new Console($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/DebugTest.php b/test/classes/Config/Settings/DebugTest.php
index 2d373a7c43..3200be92e9 100644
--- a/test/classes/Config/Settings/DebugTest.php
+++ b/test/classes/Config/Settings/DebugTest.php
@@ -38,7 +38,7 @@ class DebugTest extends TestCase
         $settings = new Debug($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/ExportTest.php b/test/classes/Config/Settings/ExportTest.php
index 4ab30cf08c..254f19ee18 100644
--- a/test/classes/Config/Settings/ExportTest.php
+++ b/test/classes/Config/Settings/ExportTest.php
@@ -147,7 +147,7 @@ class ExportTest extends TestCase
         $settings = new Export($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/ImportTest.php b/test/classes/Config/Settings/ImportTest.php
index 035fb687eb..c86c71f63d 100644
--- a/test/classes/Config/Settings/ImportTest.php
+++ b/test/classes/Config/Settings/ImportTest.php
@@ -66,7 +66,7 @@ class ImportTest extends TestCase
         $settings = new Import($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/SchemaTest.php b/test/classes/Config/Settings/SchemaTest.php
index c812c4f511..d95bd3035e 100644
--- a/test/classes/Config/Settings/SchemaTest.php
+++ b/test/classes/Config/Settings/SchemaTest.php
@@ -59,7 +59,7 @@ class SchemaTest extends TestCase
         $settings = new Schema($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/ServerTest.php b/test/classes/Config/Settings/ServerTest.php
index bef654ab20..06b7d6a530 100644
--- a/test/classes/Config/Settings/ServerTest.php
+++ b/test/classes/Config/Settings/ServerTest.php
@@ -100,7 +100,7 @@ class ServerTest extends TestCase
         $settings = new Server($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/SqlQueryBoxTest.php b/test/classes/Config/Settings/SqlQueryBoxTest.php
index 97438aa65c..b4cab64080 100644
--- a/test/classes/Config/Settings/SqlQueryBoxTest.php
+++ b/test/classes/Config/Settings/SqlQueryBoxTest.php
@@ -38,7 +38,7 @@ class SqlQueryBoxTest extends TestCase
         $settings = new SqlQueryBox($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/Settings/TransformationsTest.php b/test/classes/Config/Settings/TransformationsTest.php
index 7113360636..f65b3576ee 100644
--- a/test/classes/Config/Settings/TransformationsTest.php
+++ b/test/classes/Config/Settings/TransformationsTest.php
@@ -50,7 +50,7 @@ class TransformationsTest extends TestCase
         $settings = new Transformations($actualValues);
 
         foreach (array_keys($expectedValues) as $key) {
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/Config/SettingsTest.php b/test/classes/Config/SettingsTest.php
index 7a1e567ac6..636ee99fd1 100644
--- a/test/classes/Config/SettingsTest.php
+++ b/test/classes/Config/SettingsTest.php
@@ -283,22 +283,22 @@ class SettingsTest extends TestCase
         $settings = new Settings($cfg);
         $config = $settings->toArray();
         $config['Servers'][1]['SignonCookieParams'] = [];
-        $this->assertEquals($config, $cfg);
+        self::assertEquals($config, $cfg);
     }
 
     public function testToArray(): void
     {
         $settings = new Settings([]);
         $config = $settings->toArray();
-        $this->assertIsArray($config['Console']);
-        $this->assertIsArray($config['DBG']);
-        $this->assertIsArray($config['Export']);
-        $this->assertIsArray($config['Import']);
-        $this->assertIsArray($config['Schema']);
-        $this->assertIsArray($config['SQLQuery']);
-        $this->assertIsArray($config['DefaultTransformations']);
-        $this->assertIsArray($config['Servers']);
-        $this->assertIsArray($config['Servers'][1]);
+        self::assertIsArray($config['Console']);
+        self::assertIsArray($config['DBG']);
+        self::assertIsArray($config['Export']);
+        self::assertIsArray($config['Import']);
+        self::assertIsArray($config['Schema']);
+        self::assertIsArray($config['SQLQuery']);
+        self::assertIsArray($config['DefaultTransformations']);
+        self::assertIsArray($config['Servers']);
+        self::assertIsArray($config['Servers'][1]);
     }
 
     /**
@@ -321,48 +321,48 @@ class SettingsTest extends TestCase
         $settings = new Settings($actualValues);
         foreach (array_keys($expectedValues) as $key) {
             if ($key === 'Servers') {
-                $this->assertContainsOnlyInstancesOf(Server::class, $settings->Servers);
-                $this->assertIsArray($expected[$key]);
-                $this->assertSame(array_keys($expected[$key]), array_keys($settings->Servers));
+                self::assertContainsOnlyInstancesOf(Server::class, $settings->Servers);
+                self::assertIsArray($expected[$key]);
+                self::assertSame(array_keys($expected[$key]), array_keys($settings->Servers));
                 continue;
             }
 
             if ($key === 'Console') {
-                $this->assertInstanceOf(Console::class, $settings->Console);
+                self::assertInstanceOf(Console::class, $settings->Console);
                 continue;
             }
 
             if ($key === 'DBG') {
-                $this->assertInstanceOf(Debug::class, $settings->DBG);
+                self::assertInstanceOf(Debug::class, $settings->DBG);
                 continue;
             }
 
             if ($key === 'Export') {
-                $this->assertInstanceOf(Export::class, $settings->Export);
+                self::assertInstanceOf(Export::class, $settings->Export);
                 continue;
             }
 
             if ($key === 'Import') {
-                $this->assertInstanceOf(Import::class, $settings->Import);
+                self::assertInstanceOf(Import::class, $settings->Import);
                 continue;
             }
 
             if ($key === 'Schema') {
-                $this->assertInstanceOf(Schema::class, $settings->Schema);
+                self::assertInstanceOf(Schema::class, $settings->Schema);
                 continue;
             }
 
             if ($key === 'SQLQuery') {
-                $this->assertInstanceOf(SqlQueryBox::class, $settings->SQLQuery);
+                self::assertInstanceOf(SqlQueryBox::class, $settings->SQLQuery);
                 continue;
             }
 
             if ($key === 'DefaultTransformations') {
-                $this->assertInstanceOf(Transformations::class, $settings->DefaultTransformations);
+                self::assertInstanceOf(Transformations::class, $settings->DefaultTransformations);
                 continue;
             }
 
-            $this->assertSame($expected[$key], $settings->$key);
+            self::assertSame($expected[$key], $settings->$key);
         }
     }
 
diff --git a/test/classes/ConfigStorage/RelationParametersTest.php b/test/classes/ConfigStorage/RelationParametersTest.php
index a6c0ebd7aa..24d424accf 100644
--- a/test/classes/ConfigStorage/RelationParametersTest.php
+++ b/test/classes/ConfigStorage/RelationParametersTest.php
@@ -34,37 +34,37 @@ class RelationParametersTest extends TestCase
 {
     public function testFeaturesWithTwoTables(): void
     {
-        $this->assertNull(RelationParameters::fromArray([
+        self::assertNull(RelationParameters::fromArray([
             'db' => 'db',
             'pdf_pages' => 'pdf_pages',
             'table_coords' => ' invalid ',
             'pdfwork' => true,
         ])->pdfFeature);
-        $this->assertNull(RelationParameters::fromArray([
+        self::assertNull(RelationParameters::fromArray([
             'db' => 'db',
             'pdf_pages' => ' invalid ',
             'table_coords' => 'table_coords',
             'pdfwork' => true,
         ])->pdfFeature);
-        $this->assertNull(RelationParameters::fromArray([
+        self::assertNull(RelationParameters::fromArray([
             'db' => 'db',
             'relation' => 'relation',
             'table_info' => ' invalid ',
             'displaywork' => true,
         ])->displayFeature);
-        $this->assertNull(RelationParameters::fromArray([
+        self::assertNull(RelationParameters::fromArray([
             'db' => 'db',
             'relation' => ' invalid ',
             'table_info' => 'table_info',
             'displaywork' => true,
         ])->displayFeature);
-        $this->assertNull(RelationParameters::fromArray([
+        self::assertNull(RelationParameters::fromArray([
             'db' => 'db',
             'usergroups' => 'usergroups',
             'users' => ' invalid ',
             'menuwork' => true,
         ])->configurableMenusFeature);
-        $this->assertNull(RelationParameters::fromArray([
+        self::assertNull(RelationParameters::fromArray([
             'db' => 'db',
             'usergroups' => ' invalid ',
             'users' => 'users',
@@ -84,18 +84,15 @@ class RelationParametersTest extends TestCase
             'displaywork' => true,
             'relwork' => true,
         ]);
-        $this->assertNotNull($relationParameters->browserTransformationFeature);
-        $this->assertNotNull($relationParameters->columnCommentsFeature);
-        $this->assertNotNull($relationParameters->displayFeature);
-        $this->assertNotNull($relationParameters->relationFeature);
-        $this->assertSame(
+        self::assertNotNull($relationParameters->browserTransformationFeature);
+        self::assertNotNull($relationParameters->columnCommentsFeature);
+        self::assertNotNull($relationParameters->displayFeature);
+        self::assertNotNull($relationParameters->relationFeature);
+        self::assertSame(
             $relationParameters->browserTransformationFeature->columnInfo,
             $relationParameters->columnCommentsFeature->columnInfo
         );
-        $this->assertSame(
-            $relationParameters->relationFeature->relation,
-            $relationParameters->displayFeature->relation
-        );
+        self::assertSame($relationParameters->relationFeature->relation, $relationParameters->displayFeature->relation);
 
         $relationParameters = RelationParameters::fromArray([
             'db' => 'db',
@@ -107,10 +104,10 @@ class RelationParametersTest extends TestCase
             'displaywork' => true,
             'relwork' => false,
         ]);
-        $this->assertNull($relationParameters->browserTransformationFeature);
-        $this->assertNotNull($relationParameters->columnCommentsFeature);
-        $this->assertNotNull($relationParameters->displayFeature);
-        $this->assertNull($relationParameters->relationFeature);
+        self::assertNull($relationParameters->browserTransformationFeature);
+        self::assertNotNull($relationParameters->columnCommentsFeature);
+        self::assertNotNull($relationParameters->displayFeature);
+        self::assertNull($relationParameters->relationFeature);
     }
 
     public function testFeaturesHaveSameDatabase(): void
@@ -155,44 +152,44 @@ class RelationParametersTest extends TestCase
             'uiprefswork' => true,
             'userconfigwork' => true,
         ]);
-        $this->assertInstanceOf(DatabaseName::class, $relationParameters->db);
-        $this->assertEquals('db', $relationParameters->db->getName());
-        $this->assertNotNull($relationParameters->bookmarkFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->bookmarkFeature->database);
-        $this->assertNotNull($relationParameters->browserTransformationFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->browserTransformationFeature->database);
-        $this->assertNotNull($relationParameters->centralColumnsFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->centralColumnsFeature->database);
-        $this->assertNotNull($relationParameters->columnCommentsFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->columnCommentsFeature->database);
-        $this->assertNotNull($relationParameters->configurableMenusFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->configurableMenusFeature->database);
-        $this->assertNotNull($relationParameters->databaseDesignerSettingsFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->databaseDesignerSettingsFeature->database);
-        $this->assertNotNull($relationParameters->displayFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->displayFeature->database);
-        $this->assertNotNull($relationParameters->exportTemplatesFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->exportTemplatesFeature->database);
-        $this->assertNotNull($relationParameters->favoriteTablesFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->favoriteTablesFeature->database);
-        $this->assertNotNull($relationParameters->navigationItemsHidingFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->navigationItemsHidingFeature->database);
-        $this->assertNotNull($relationParameters->pdfFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->pdfFeature->database);
-        $this->assertNotNull($relationParameters->recentlyUsedTablesFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->recentlyUsedTablesFeature->database);
-        $this->assertNotNull($relationParameters->relationFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->relationFeature->database);
-        $this->assertNotNull($relationParameters->savedQueryByExampleSearchesFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->savedQueryByExampleSearchesFeature->database);
-        $this->assertNotNull($relationParameters->sqlHistoryFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->sqlHistoryFeature->database);
-        $this->assertNotNull($relationParameters->trackingFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->trackingFeature->database);
-        $this->assertNotNull($relationParameters->uiPreferencesFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->uiPreferencesFeature->database);
-        $this->assertNotNull($relationParameters->userPreferencesFeature);
-        $this->assertSame($relationParameters->db, $relationParameters->userPreferencesFeature->database);
+        self::assertInstanceOf(DatabaseName::class, $relationParameters->db);
+        self::assertSame('db', $relationParameters->db->getName());
+        self::assertNotNull($relationParameters->bookmarkFeature);
+        self::assertSame($relationParameters->db, $relationParameters->bookmarkFeature->database);
+        self::assertNotNull($relationParameters->browserTransformationFeature);
+        self::assertSame($relationParameters->db, $relationParameters->browserTransformationFeature->database);
+        self::assertNotNull($relationParameters->centralColumnsFeature);
+        self::assertSame($relationParameters->db, $relationParameters->centralColumnsFeature->database);
+        self::assertNotNull($relationParameters->columnCommentsFeature);
+        self::assertSame($relationParameters->db, $relationParameters->columnCommentsFeature->database);
+        self::assertNotNull($relationParameters->configurableMenusFeature);
+        self::assertSame($relationParameters->db, $relationParameters->configurableMenusFeature->database);
+        self::assertNotNull($relationParameters->databaseDesignerSettingsFeature);
+        self::assertSame($relationParameters->db, $relationParameters->databaseDesignerSettingsFeature->database);
+        self::assertNotNull($relationParameters->displayFeature);
+        self::assertSame($relationParameters->db, $relationParameters->displayFeature->database);
+        self::assertNotNull($relationParameters->exportTemplatesFeature);
+        self::assertSame($relationParameters->db, $relationParameters->exportTemplatesFeature->database);
+        self::assertNotNull($relationParameters->favoriteTablesFeature);
+        self::assertSame($relationParameters->db, $relationParameters->favoriteTablesFeature->database);
+        self::assertNotNull($relationParameters->navigationItemsHidingFeature);
+        self::assertSame($relationParameters->db, $relationParameters->navigationItemsHidingFeature->database);
+        self::assertNotNull($relationParameters->pdfFeature);
+        self::assertSame($relationParameters->db, $relationParameters->pdfFeature->database);
+        self::assertNotNull($relationParameters->recentlyUsedTablesFeature);
+        self::assertSame($relationParameters->db, $relationParameters->recentlyUsedTablesFeature->database);
+        self::assertNotNull($relationParameters->relationFeature);
+        self::assertSame($relationParameters->db, $relationParameters->relationFeature->database);
+        self::assertNotNull($relationParameters->savedQueryByExampleSearchesFeature);
+        self::assertSame($relationParameters->db, $relationParameters->savedQueryByExampleSearchesFeature->database);
+        self::assertNotNull($relationParameters->sqlHistoryFeature);
+        self::assertSame($relationParameters->db, $relationParameters->sqlHistoryFeature->database);
+        self::assertNotNull($relationParameters->trackingFeature);
+        self::assertSame($relationParameters->db, $relationParameters->trackingFeature->database);
+        self::assertNotNull($relationParameters->uiPreferencesFeature);
+        self::assertSame($relationParameters->db, $relationParameters->uiPreferencesFeature->database);
+        self::assertNotNull($relationParameters->userPreferencesFeature);
+        self::assertSame($relationParameters->db, $relationParameters->userPreferencesFeature->database);
     }
 
     public function testHasAllFeatures(): void
@@ -237,10 +234,10 @@ class RelationParametersTest extends TestCase
             'uiprefswork' => true,
             'userconfigwork' => true,
         ];
-        $this->assertFalse(RelationParameters::fromArray([])->hasAllFeatures());
-        $this->assertTrue(RelationParameters::fromArray($params)->hasAllFeatures());
+        self::assertFalse(RelationParameters::fromArray([])->hasAllFeatures());
+        self::assertTrue(RelationParameters::fromArray($params)->hasAllFeatures());
         $params['bookmarkwork'] = false;
-        $this->assertFalse(RelationParameters::fromArray($params)->hasAllFeatures());
+        self::assertFalse(RelationParameters::fromArray($params)->hasAllFeatures());
     }
 
     /**
@@ -251,7 +248,7 @@ class RelationParametersTest extends TestCase
      */
     public function testToArray(array $params, array $expected): void
     {
-        $this->assertSame($expected, RelationParameters::fromArray($params)->toArray());
+        self::assertSame($expected, RelationParameters::fromArray($params)->toArray());
     }
 
     /**
diff --git a/test/classes/ConfigStorage/RelationTest.php b/test/classes/ConfigStorage/RelationTest.php
index d7e4bb15dd..429a1f74cb 100644
--- a/test/classes/ConfigStorage/RelationTest.php
+++ b/test/classes/ConfigStorage/RelationTest.php
@@ -51,24 +51,16 @@ class RelationTest extends AbstractTestCase
         $this->dummyDbi->addSelectDb('phpmyadmin');
         $db = 'information_schema';
         $table = 'CHARACTER_SETS';
-        $this->assertEquals(
-            'DESCRIPTION',
-            $this->relation->getDisplayField($db, $table)
-        );
+        self::assertSame('DESCRIPTION', $this->relation->getDisplayField($db, $table));
         $this->assertAllSelectsConsumed();
 
         $db = 'information_schema';
         $table = 'TABLES';
-        $this->assertEquals(
-            'TABLE_COMMENT',
-            $this->relation->getDisplayField($db, $table)
-        );
+        self::assertSame('TABLE_COMMENT', $this->relation->getDisplayField($db, $table));
 
         $db = 'information_schema';
         $table = 'PMA';
-        $this->assertFalse(
-            $this->relation->getDisplayField($db, $table)
-        );
+        self::assertFalse($this->relation->getDisplayField($db, $table));
     }
 
     /**
@@ -101,20 +93,14 @@ class RelationTest extends AbstractTestCase
         $this->relation->dbi = $GLOBALS['dbi'];
 
         $db = 'information_schema';
-        $this->assertEquals(
-            [''],
-            $this->relation->getComments($db)
-        );
+        self::assertSame([''], $this->relation->getComments($db));
 
         $db = 'information_schema';
         $table = 'TABLES';
-        $this->assertEquals(
-            [
-                'field1' => 'Comment1',
-                'field2' => 'Comment1',
-            ],
-            $this->relation->getComments($db, $table)
-        );
+        self::assertSame([
+            'field1' => 'Comment1',
+            'field2' => 'Comment1',
+        ], $this->relation->getComments($db, $table));
     }
 
     /**
@@ -144,16 +130,16 @@ class RelationTest extends AbstractTestCase
 
         // Case 1
         $actual = $this->relation->tryUpgradeTransformations();
-        $this->assertFalse($actual);
+        self::assertFalse($actual);
 
         // Case 2
         $actual = $this->relation->tryUpgradeTransformations();
-        $this->assertTrue($actual);
+        self::assertTrue($actual);
     }
 
     public function testSearchColumnInForeignersError(): void
     {
-        $this->assertFalse($this->relation->searchColumnInForeigners([], 'id'));
+        self::assertFalse($this->relation->searchColumnInForeigners([], 'id'));
     }
 
     /**
@@ -196,7 +182,7 @@ class RelationTest extends AbstractTestCase
         $expected['on_delete'] = 'CASCADE';
         $expected['on_update'] = 'CASCADE';
 
-        $this->assertEquals($expected, $foreigner);
+        self::assertEquals($expected, $foreigner);
     }
 
     public function testFixPmaTablesNothingWorks(): void
@@ -269,16 +255,16 @@ class RelationTest extends AbstractTestCase
 
         $this->relation->fixPmaTables('db_pma', false);
 
-        $this->assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
+        self::assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
         /** @psalm-suppress EmptyArrayAccess */
-        $this->assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
+        self::assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
 
         $relationParameters = RelationParameters::fromArray([
             'db' => 'db_pma',
             'userconfigwork' => true,
             'userconfig' => 'pma__userconfig',
         ]);
-        $this->assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllSelectsConsumed();
@@ -543,23 +529,23 @@ class RelationTest extends AbstractTestCase
             []
         );
 
-        $this->assertSame('', $GLOBALS['cfg']['Server']['pmadb']);
+        self::assertSame('', $GLOBALS['cfg']['Server']['pmadb']);
 
         $_SESSION['relation'] = [];
 
         $this->relation->fixPmaTables('db_pma', true);
-        $this->assertArrayNotHasKey('message', $GLOBALS);
-        $this->assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
+        self::assertArrayNotHasKey('message', $GLOBALS);
+        self::assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
         /** @psalm-suppress EmptyArrayAccess */
-        $this->assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
-        $this->assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
+        self::assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
 
         $relationParameters = RelationParameters::fromArray([
             'db' => 'db_pma',
             'userconfigwork' => true,
             'userconfig' => 'pma__userconfig',
         ]);
-        $this->assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllSelectsConsumed();
@@ -828,25 +814,25 @@ class RelationTest extends AbstractTestCase
             []
         );
 
-        $this->assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
+        self::assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
 
         $_SESSION['relation'] = [];
 
         $this->dummyDbi->addSelectDb('db_pma');
         $this->dummyDbi->addSelectDb('db_pma');
         $this->relation->fixPmaTables('db_pma', true);
-        $this->assertArrayNotHasKey('message', $GLOBALS);
-        $this->assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
+        self::assertArrayNotHasKey('message', $GLOBALS);
+        self::assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
         /** @psalm-suppress EmptyArrayAccess */
-        $this->assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
-        $this->assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
+        self::assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
 
         $relationParameters = RelationParameters::fromArray([
             'db' => 'db_pma',
             'userconfigwork' => true,
             'userconfig' => 'pma__userconfig',
         ]);
-        $this->assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllSelectsConsumed();
@@ -907,17 +893,17 @@ class RelationTest extends AbstractTestCase
         );
         $this->dummyDbi->addSelectDb('db_pma');
 
-        $this->assertSame('', $GLOBALS['cfg']['Server']['pmadb']);
+        self::assertSame('', $GLOBALS['cfg']['Server']['pmadb']);
 
         $_SESSION['relation'] = [];
 
         $this->relation->fixPmaTables('db_pma', true);
 
-        $this->assertArrayHasKey('message', $GLOBALS);
-        $this->assertSame('MYSQL_ERROR', $GLOBALS['message']);
-        $this->assertSame('', $GLOBALS['cfg']['Server']['pmadb']);
+        self::assertArrayHasKey('message', $GLOBALS);
+        self::assertSame('MYSQL_ERROR', $GLOBALS['message']);
+        self::assertSame('', $GLOBALS['cfg']['Server']['pmadb']);
 
-        $this->assertSame([], $_SESSION['relation']);
+        self::assertSame([], $_SESSION['relation']);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllErrorCodesConsumed();
@@ -941,13 +927,11 @@ class RelationTest extends AbstractTestCase
         );
         $this->dummyDbi->addSelectDb('phpmyadmin');
 
-        $this->assertArrayNotHasKey('errno', $GLOBALS);
+        self::assertArrayNotHasKey('errno', $GLOBALS);
 
-        $this->assertTrue(
-            $this->relation->createPmaDatabase('phpmyadmin')
-        );
+        self::assertTrue($this->relation->createPmaDatabase('phpmyadmin'));
 
-        $this->assertArrayNotHasKey('message', $GLOBALS);
+        self::assertArrayNotHasKey('message', $GLOBALS);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllErrorCodesConsumed();
@@ -965,17 +949,12 @@ class RelationTest extends AbstractTestCase
 
         $GLOBALS['errno'] = 1044;// ER_DBACCESS_DENIED_ERROR
 
-        $this->assertFalse(
-            $this->relation->createPmaDatabase('phpmyadmin')
-        );
+        self::assertFalse($this->relation->createPmaDatabase('phpmyadmin'));
 
-        $this->assertArrayHasKey('message', $GLOBALS);
-        $this->assertSame(
-            'You do not have necessary privileges to create a database named'
-            . ' \'phpmyadmin\'. You may go to \'Operations\' tab of any'
-            . ' database to set up the phpMyAdmin configuration storage there.',
-            $GLOBALS['message']
-        );
+        self::assertArrayHasKey('message', $GLOBALS);
+        self::assertSame('You do not have necessary privileges to create a database named'
+        . ' \'phpmyadmin\'. You may go to \'Operations\' tab of any'
+        . ' database to set up the phpMyAdmin configuration storage there.', $GLOBALS['message']);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllErrorCodesConsumed();
@@ -992,12 +971,10 @@ class RelationTest extends AbstractTestCase
 
         $GLOBALS['errno'] = 1040;
 
-        $this->assertFalse(
-            $this->relation->createPmaDatabase('pma_1040')
-        );
+        self::assertFalse($this->relation->createPmaDatabase('pma_1040'));
 
-        $this->assertArrayHasKey('message', $GLOBALS);
-        $this->assertSame('Too many connections', $GLOBALS['message']);
+        self::assertArrayHasKey('message', $GLOBALS);
+        self::assertSame('Too many connections', $GLOBALS['message']);
 
         $this->assertAllQueriesConsumed();
         $this->assertAllErrorCodesConsumed();
@@ -1395,10 +1372,7 @@ class RelationTest extends AbstractTestCase
             ]),
         ];
 
-        $this->assertSame(
-            $data,
-            $this->relation->getDefaultPmaTableNames([])
-        );
+        self::assertSame($data, $this->relation->getDefaultPmaTableNames([]));
 
         $data['pma__export_templates'] = implode("\n", [
             '',
@@ -1422,7 +1396,7 @@ class RelationTest extends AbstractTestCase
             '  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
         ]);
 
-        $this->assertSame(
+        self::assertSame(
             $data,
             $this->relation->getDefaultPmaTableNames(['pma__export_templates' => 'db_exporttemplates_pma'])
         );
@@ -1466,15 +1440,15 @@ class RelationTest extends AbstractTestCase
         $relation = new Relation($this->dbi);
         $relation->initRelationParamsCache();
 
-        $this->assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
+        self::assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
         /** @psalm-suppress EmptyArrayAccess */
-        $this->assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
+        self::assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
 
         // Should all be false for server = 0
         $relationParameters = RelationParameters::fromArray([]);
-        $this->assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
 
-        $this->assertEquals([
+        self::assertSame([
             'userconfig' => 'pma__userconfig',
             'pmadb' => false,// This is the expected value for server = 0
         ], $GLOBALS['cfg']['Server']);
@@ -1542,9 +1516,9 @@ class RelationTest extends AbstractTestCase
         $relation->initRelationParamsCache();
         $this->assertAllSelectsConsumed();
 
-        $this->assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
+        self::assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
         /** @psalm-suppress EmptyArrayAccess */
-        $this->assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
+        self::assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
 
         // Should all be false for server = 0
         $relationParameters = RelationParameters::fromArray([
@@ -1552,9 +1526,9 @@ class RelationTest extends AbstractTestCase
             'userconfigwork' => true,
             'userconfig' => 'pma__userconfig',
         ]);
-        $this->assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
 
-        $this->assertSame([
+        self::assertSame([
             'user' => '',
             'pmadb' => 'phpmyadmin',
             'bookmarktable' => '',
@@ -1636,18 +1610,18 @@ class RelationTest extends AbstractTestCase
         $relation->initRelationParamsCache();
         $this->assertAllSelectsConsumed();
 
-        $this->assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
+        self::assertArrayHasKey($GLOBALS['server'], $_SESSION['relation'], 'The cache is expected to be filled');
         /** @psalm-suppress EmptyArrayAccess */
-        $this->assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
+        self::assertIsArray($_SESSION['relation'][$GLOBALS['server']]);
 
         $relationParameters = RelationParameters::fromArray([
             'db' => 'phpmyadmin',
             'userconfigwork' => false,
             'userconfig' => 'pma__userconfig',
         ]);
-        $this->assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
+        self::assertSame($relationParameters->toArray(), $_SESSION['relation'][$GLOBALS['server']]);
 
-        $this->assertSame([
+        self::assertSame([
             'user' => '',
             'pmadb' => 'phpmyadmin',
             'bookmarktable' => '',
@@ -1741,12 +1715,8 @@ class RelationTest extends AbstractTestCase
         $relation = new Relation($this->dbi);
         $relation->initRelationParamsCache();
 
-        $this->assertArrayHasKey(
-            'relation',
-            $_SESSION,
-            'The cache is expected to be filled because the custom override'
-            . 'was understood (pma__userconfig vs pma__userconfig_custom)'
-        );
+        self::assertArrayHasKey('relation', $_SESSION, 'The cache is expected to be filled because the custom override'
+        . 'was understood (pma__userconfig vs pma__userconfig_custom)');
 
         $this->assertAllQueriesConsumed();
         $this->assertAllSelectsConsumed();
@@ -1781,9 +1751,9 @@ class RelationTest extends AbstractTestCase
             'userconfigwork' => true,
             'userconfig' => 'pma__userconfig_custom',
         ]);
-        $this->assertSame($relationParameters->toArray(), $relationData->toArray());
+        self::assertSame($relationParameters->toArray(), $relationData->toArray());
 
-        $this->assertSame([
+        self::assertSame([
             'user' => '',
             'pmadb' => 'PMA-storage',
             'bookmarktable' => '',
@@ -1853,12 +1823,8 @@ class RelationTest extends AbstractTestCase
         $relation = new Relation($this->dbi);
         $relation->initRelationParamsCache();
 
-        $this->assertArrayHasKey(
-            'relation',
-            $_SESSION,
-            'The cache is expected to be filled because the custom override'
-            . 'was understood'
-        );
+        self::assertArrayHasKey('relation', $_SESSION, 'The cache is expected to be filled because the custom override'
+        . 'was understood');
 
         $this->assertAllQueriesConsumed();
         $this->assertAllSelectsConsumed();
@@ -1885,10 +1851,10 @@ class RelationTest extends AbstractTestCase
             'trackingwork' => false,
             'tracking' => false,
         ]);
-        $this->assertSame($relationParameters->toArray(), $relationData->toArray());
-        $this->assertNull($relationParameters->trackingFeature, 'The feature should not be enabled');
+        self::assertSame($relationParameters->toArray(), $relationData->toArray());
+        self::assertNull($relationParameters->trackingFeature, 'The feature should not be enabled');
 
-        $this->assertSame([
+        self::assertSame([
             'user' => '',
             'pmadb' => 'PMA-storage',
             'bookmarktable' => '',
@@ -1979,12 +1945,8 @@ class RelationTest extends AbstractTestCase
         $relation = new Relation($this->dbi);
         $relation->initRelationParamsCache();
 
-        $this->assertArrayHasKey(
-            'relation',
-            $_SESSION,
-            'The cache is expected to be filled because the custom override'
-            . 'was understood'
-        );
+        self::assertArrayHasKey('relation', $_SESSION, 'The cache is expected to be filled because the custom override'
+        . 'was understood');
 
         $this->assertAllQueriesConsumed();
         $this->assertAllSelectsConsumed();
@@ -2019,10 +1981,10 @@ class RelationTest extends AbstractTestCase
             'favorite' => 'pma__favorite_custom',
             'favoritework' => true,
         ]);
-        $this->assertSame($relationParameters->toArray(), $relationData->toArray());
-        $this->assertNull($relationParameters->trackingFeature, 'The feature should not be enabled');
+        self::assertSame($relationParameters->toArray(), $relationData->toArray());
+        self::assertNull($relationParameters->trackingFeature, 'The feature should not be enabled');
 
-        $this->assertSame([
+        self::assertSame([
             'user' => '',
             'pmadb' => 'PMA-storage',
             'bookmarktable' => '',
@@ -2073,8 +2035,8 @@ class RelationTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['designer_settings'] = '';
         $GLOBALS['cfg']['Server']['export_templates'] = '';
 
-        $this->assertFalse($this->relation->arePmadbTablesDefined());
-        $this->assertFalse($this->relation->arePmadbTablesAllDisabled());
+        self::assertFalse($this->relation->arePmadbTablesDefined());
+        self::assertFalse($this->relation->arePmadbTablesAllDisabled());
 
         $GLOBALS['cfg']['Server']['bookmarktable'] = '';
         $GLOBALS['cfg']['Server']['relation'] = '';
@@ -2096,8 +2058,8 @@ class RelationTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['designer_settings'] = '';
         $GLOBALS['cfg']['Server']['export_templates'] = '';
 
-        $this->assertFalse($this->relation->arePmadbTablesDefined());
-        $this->assertFalse($this->relation->arePmadbTablesAllDisabled());
+        self::assertFalse($this->relation->arePmadbTablesDefined());
+        self::assertFalse($this->relation->arePmadbTablesAllDisabled());
 
         $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma__bookmark';
         $GLOBALS['cfg']['Server']['relation'] = 'pma__relation';
@@ -2119,8 +2081,8 @@ class RelationTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['designer_settings'] = 'pma__designer_settings';
         $GLOBALS['cfg']['Server']['export_templates'] = 'pma__export_templates';
 
-        $this->assertTrue($this->relation->arePmadbTablesDefined());
-        $this->assertFalse($this->relation->arePmadbTablesAllDisabled());
+        self::assertTrue($this->relation->arePmadbTablesDefined());
+        self::assertFalse($this->relation->arePmadbTablesAllDisabled());
 
         $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma__bookmark';
         $GLOBALS['cfg']['Server']['relation'] = 'pma__relation';
@@ -2142,8 +2104,8 @@ class RelationTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['designer_settings'] = 'pma__designer_settings';
         $GLOBALS['cfg']['Server']['export_templates'] = 'pma__export_templates';
 
-        $this->assertTrue($this->relation->arePmadbTablesDefined());
-        $this->assertFalse($this->relation->arePmadbTablesAllDisabled());
+        self::assertTrue($this->relation->arePmadbTablesDefined());
+        self::assertFalse($this->relation->arePmadbTablesAllDisabled());
 
         $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma__bookmark';
         $GLOBALS['cfg']['Server']['relation'] = 'pma__relation';
@@ -2165,8 +2127,8 @@ class RelationTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['designer_settings'] = 'pma__designer_settings';
         $GLOBALS['cfg']['Server']['export_templates'] = 'pma__export_templates';
 
-        $this->assertFalse($this->relation->arePmadbTablesDefined());
-        $this->assertFalse($this->relation->arePmadbTablesAllDisabled());
+        self::assertFalse($this->relation->arePmadbTablesDefined());
+        self::assertFalse($this->relation->arePmadbTablesAllDisabled());
 
         $GLOBALS['cfg']['Server']['bookmarktable'] = false; //'pma__bookmark';
         $GLOBALS['cfg']['Server']['relation'] = false; //'pma__relation';
@@ -2188,8 +2150,8 @@ class RelationTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['designer_settings'] = false; //'pma__designer_settings';
         $GLOBALS['cfg']['Server']['export_templates'] = false; //'pma__export_templates';
 
-        $this->assertFalse($this->relation->arePmadbTablesDefined());
-        $this->assertTrue($this->relation->arePmadbTablesAllDisabled());
+        self::assertFalse($this->relation->arePmadbTablesDefined());
+        self::assertTrue($this->relation->arePmadbTablesAllDisabled());
     }
 
     /**
diff --git a/test/classes/ConfigStorage/UserGroupsTest.php b/test/classes/ConfigStorage/UserGroupsTest.php
index 5b6432c94f..44354e1be0 100644
--- a/test/classes/ConfigStorage/UserGroupsTest.php
+++ b/test/classes/ConfigStorage/UserGroupsTest.php
@@ -63,9 +63,9 @@ class UserGroupsTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         $html = UserGroups::getHtmlForUserGroupsTable($this->configurableMenusFeature);
-        $this->assertStringNotContainsString('<table id="userGroupsTable">', $html);
+        self::assertStringNotContainsString('<table id="userGroupsTable">', $html);
         $url_tag = '<a href="' . Url::getFromRoute('/server/user-groups', ['addUserGroup' => 1]);
-        $this->assertStringContainsString($url_tag, $html);
+        self::assertStringContainsString($url_tag, $html);
     }
 
     /**
@@ -74,18 +74,15 @@ class UserGroupsTest extends AbstractTestCase
     public function testGetHtmlForUserGroupsTableWithUserGroups(): void
     {
         $html = UserGroups::getHtmlForUserGroupsTable($this->configurableMenusFeature);
-        $this->assertStringContainsString('<td>user&lt;br&gt;group</td>', $html);
+        self::assertStringContainsString('<td>user&lt;br&gt;group</td>', $html);
         $urlTag = '<a class="" href="' . Url::getFromRoute('/server/user-groups') . '" data-post="'
             . Url::getCommon(['viewUsers' => 1, 'userGroup' => 'user<br>group'], '');
-        $this->assertStringContainsString($urlTag, $html);
+        self::assertStringContainsString($urlTag, $html);
         $urlTag = '<a class="" href="' . Url::getFromRoute('/server/user-groups') . '" data-post="'
             . Url::getCommon(['editUserGroup' => 1, 'userGroup' => 'user<br>group'], '');
-        $this->assertStringContainsString($urlTag, $html);
-        $this->assertStringContainsString(
-            '<button type="button" class="btn btn-link" data-bs-toggle="modal"'
-            . ' data-bs-target="#deleteUserGroupModal" data-user-group="user&lt;br&gt;group">',
-            $html
-        );
+        self::assertStringContainsString($urlTag, $html);
+        self::assertStringContainsString('<button type="button" class="btn btn-link" data-bs-toggle="modal"'
+        . ' data-bs-target="#deleteUserGroupModal" data-user-group="user&lt;br&gt;group">', $html);
     }
 
     /**
@@ -120,8 +117,8 @@ class UserGroupsTest extends AbstractTestCase
     {
         // adding a user group
         $html = UserGroups::getHtmlToEditUserGroup($this->configurableMenusFeature);
-        $this->assertStringContainsString('<input type="hidden" name="addUserGroupSubmit" value="1"', $html);
-        $this->assertStringContainsString('<input type="text" name="userGroup"', $html);
+        self::assertStringContainsString('<input type="hidden" name="addUserGroupSubmit" value="1"', $html);
+        self::assertStringContainsString('<input type="text" name="userGroup"', $html);
 
         $resultStub = $this->createMock(DummyResult::class);
 
@@ -152,15 +149,15 @@ class UserGroupsTest extends AbstractTestCase
 
         // editing a user group
         $html = UserGroups::getHtmlToEditUserGroup($this->configurableMenusFeature, 'user<br>group');
-        $this->assertStringContainsString('Edit user group: \'user&lt;br&gt;group\'', $html);
-        $this->assertStringContainsString('<input type="hidden" name="userGroup" value="user&lt;br&gt;group"', $html);
-        $this->assertStringContainsString('<input type="hidden" name="editUserGroupSubmit" value="1"', $html);
-        $this->assertStringContainsString('<input type="hidden" name="editUserGroupSubmit" value="1"', $html);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('Edit user group: \'user&lt;br&gt;group\'', $html);
+        self::assertStringContainsString('<input type="hidden" name="userGroup" value="user&lt;br&gt;group"', $html);
+        self::assertStringContainsString('<input type="hidden" name="editUserGroupSubmit" value="1"', $html);
+        self::assertStringContainsString('<input type="hidden" name="editUserGroupSubmit" value="1"', $html);
+        self::assertStringContainsString(
             '<input type="checkbox" class="checkall" checked="checked" name="server_sql" value="Y">',
             $html
         );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="checkbox" class="checkall" name="server_databases" value="Y">',
             $html
         );
@@ -175,8 +172,8 @@ class UserGroupsTest extends AbstractTestCase
         $dummyDbi->addResult('SELECT `username` FROM `pmadb`.`users` WHERE `usergroup`=\'user<br>group\'', []);
 
         $output = UserGroups::getHtmlForListingUsersofAGroup($this->configurableMenusFeature, 'user<br>group');
-        $this->assertStringContainsString('Users of \'user&lt;br&gt;group\' user group', $output);
-        $this->assertStringContainsString('No users were found belonging to this user group.', $output);
+        self::assertStringContainsString('Users of \'user&lt;br&gt;group\' user group', $output);
+        self::assertStringContainsString('No users were found belonging to this user group.', $output);
     }
 
     public function testGetHtmlForListingUsersOfAGroupWithUsers(): void
@@ -192,11 +189,11 @@ class UserGroupsTest extends AbstractTestCase
         );
 
         $output = UserGroups::getHtmlForListingUsersofAGroup($this->configurableMenusFeature, 'user<br>group');
-        $this->assertStringContainsString('Users of \'user&lt;br&gt;group\' user group', $output);
-        $this->assertStringContainsString('<td>1</td>', $output);
-        $this->assertStringContainsString('<td>user&lt;br&gt;one</td>', $output);
-        $this->assertStringContainsString('<td>2</td>', $output);
-        $this->assertStringContainsString('<td>user&lt;br&gt;two</td>', $output);
-        $this->assertStringNotContainsString('No users were found belonging to this user group.', $output);
+        self::assertStringContainsString('Users of \'user&lt;br&gt;group\' user group', $output);
+        self::assertStringContainsString('<td>1</td>', $output);
+        self::assertStringContainsString('<td>user&lt;br&gt;one</td>', $output);
+        self::assertStringContainsString('<td>2</td>', $output);
+        self::assertStringContainsString('<td>user&lt;br&gt;two</td>', $output);
+        self::assertStringNotContainsString('No users were found belonging to this user group.', $output);
     }
 }
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index fe2e31d2c5..acfd4ccc0d 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -89,13 +89,13 @@ class ConfigTest extends AbstractTestCase
             $this->markTestSkipped('Creating a temporary file does not work');
         }
 
-        $this->assertFileExists($tmpConfig);
+        self::assertFileExists($tmpConfig);
 
         // end of setup
 
         // Test loading an empty file does not change the default config
         $config = new Config($tmpConfig);
-        $this->assertSame($defaultConfig->settings, $config->settings);
+        self::assertSame($defaultConfig->settings, $config->settings);
 
         $contents = '<?php' . PHP_EOL
                     . '$cfg[\'ProtectBinary\'] = true;';
@@ -104,12 +104,12 @@ class ConfigTest extends AbstractTestCase
         // Test loading a config changes the setup
         $config = new Config($tmpConfig);
         $defaultConfig->settings['ProtectBinary'] = true;
-        $this->assertSame($defaultConfig->settings, $config->settings);
+        self::assertSame($defaultConfig->settings, $config->settings);
         $defaultConfig->settings['ProtectBinary'] = 'blob';
 
         // Teardown
         unlink($tmpConfig);
-        $this->assertFalse(file_exists($tmpConfig));
+        self::assertFalse(file_exists($tmpConfig));
     }
 
     /**
@@ -123,13 +123,13 @@ class ConfigTest extends AbstractTestCase
             $this->markTestSkipped('Creating a temporary file does not work');
         }
 
-        $this->assertFileExists($tmpConfig);
+        self::assertFileExists($tmpConfig);
 
         // end of setup
 
         // Test loading an empty file does not change the default config
         $config = new Config($tmpConfig);
-        $this->assertSame($defaultConfig->settings, $config->settings);
+        self::assertSame($defaultConfig->settings, $config->settings);
 
         $contents = '<?php' . PHP_EOL
                     . '$cfg[\'fooBar\'] = true;';
@@ -139,7 +139,7 @@ class ConfigTest extends AbstractTestCase
         $config = new Config($tmpConfig);
         $defaultConfig->settings['fooBar'] = true;
         // Equals because of the key sorting
-        $this->assertEquals($defaultConfig->settings, $config->settings);
+        self::assertEquals($defaultConfig->settings, $config->settings);
         unset($defaultConfig->settings['fooBar']);
 
         $contents = '<?php' . PHP_EOL
@@ -154,12 +154,12 @@ class ConfigTest extends AbstractTestCase
         $config = new Config($tmpConfig);
         $defaultConfig->settings['ValidKey'] = true;
         // Equals because of the key sorting
-        $this->assertEquals($defaultConfig->settings, $config->settings);
+        self::assertEquals($defaultConfig->settings, $config->settings);
         unset($defaultConfig->settings['ValidKey']);
 
         // Teardown
         unlink($tmpConfig);
-        $this->assertFalse(file_exists($tmpConfig));
+        self::assertFalse(file_exists($tmpConfig));
     }
 
     /**
@@ -171,7 +171,7 @@ class ConfigTest extends AbstractTestCase
     {
         $this->object->checkSystem();
 
-        $this->assertIsBool($this->object->get('PMA_IS_WINDOWS'));
+        self::assertIsBool($this->object->get('PMA_IS_WINDOWS'));
     }
 
     /**
@@ -184,13 +184,13 @@ class ConfigTest extends AbstractTestCase
         $this->object->set('PMA_USR_BROWSER_AGENT', 'IE');
         $this->object->set('PMA_USR_BROWSER_VER', 6);
         $this->object->checkOutputCompression();
-        $this->assertTrue($this->object->get('OBGzip'));
+        self::assertTrue($this->object->get('OBGzip'));
 
         $this->object->set('OBGzip', 'auto');
         $this->object->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');
         $this->object->set('PMA_USR_BROWSER_VER', 5);
         $this->object->checkOutputCompression();
-        $this->assertTrue($this->object->get('OBGzip'));
+        self::assertTrue($this->object->get('OBGzip'));
     }
 
     /**
@@ -207,22 +207,16 @@ class ConfigTest extends AbstractTestCase
     {
         $_SERVER['HTTP_USER_AGENT'] = $agent;
         $this->object->checkClient();
-        $this->assertEquals($os, $this->object->get('PMA_USR_OS'));
+        self::assertSame($os, $this->object->get('PMA_USR_OS'));
         if ($os != null) {
-            $this->assertEquals(
-                $browser,
-                $this->object->get('PMA_USR_BROWSER_AGENT')
-            );
+            self::assertSame($browser, $this->object->get('PMA_USR_BROWSER_AGENT'));
         }
 
         if ($version == null) {
             return;
         }
 
-        $this->assertEquals(
-            $version,
-            $this->object->get('PMA_USR_BROWSER_VER')
-        );
+        self::assertEquals($version, $this->object->get('PMA_USR_BROWSER_VER'));
     }
 
     /**
@@ -334,17 +328,17 @@ class ConfigTest extends AbstractTestCase
     {
         $this->object->set('GD2Available', 'yes');
         $this->object->checkGd2();
-        $this->assertEquals(1, $this->object->get('PMA_IS_GD2'));
+        self::assertSame(1, $this->object->get('PMA_IS_GD2'));
 
         $this->object->set('GD2Available', 'no');
         $this->object->checkGd2();
-        $this->assertEquals(0, $this->object->get('PMA_IS_GD2'));
+        self::assertSame(0, $this->object->get('PMA_IS_GD2'));
 
         $this->object->set('GD2Available', 'auto');
 
         if (! function_exists('imagecreatetruecolor')) {
             $this->object->checkGd2();
-            $this->assertEquals(
+            self::assertSame(
                 0,
                 $this->object->get('PMA_IS_GD2'),
                 'imagecreatetruecolor does not exist, PMA_IS_GD2 should be 0'
@@ -355,17 +349,9 @@ class ConfigTest extends AbstractTestCase
             $this->object->checkGd2();
             $gd_nfo = gd_info();
             if (mb_strstr($gd_nfo['GD Version'], '2.')) {
-                $this->assertEquals(
-                    1,
-                    $this->object->get('PMA_IS_GD2'),
-                    'GD Version >= 2, PMA_IS_GD2 should be 1'
-                );
+                self::assertSame(1, $this->object->get('PMA_IS_GD2'), 'GD Version >= 2, PMA_IS_GD2 should be 1');
             } else {
-                $this->assertEquals(
-                    0,
-                    $this->object->get('PMA_IS_GD2'),
-                    'GD Version < 2, PMA_IS_GD2 should be 0'
-                );
+                self::assertSame(0, $this->object->get('PMA_IS_GD2'), 'GD Version < 2, PMA_IS_GD2 should be 0');
             }
         }
 
@@ -380,17 +366,9 @@ class ConfigTest extends AbstractTestCase
         }
 
         if (mb_strstr($v, '2.')) {
-            $this->assertEquals(
-                1,
-                $this->object->get('PMA_IS_GD2'),
-                'PMA_IS_GD2 should be 1'
-            );
+            self::assertSame(1, $this->object->get('PMA_IS_GD2'), 'PMA_IS_GD2 should be 1');
         } else {
-            $this->assertEquals(
-                0,
-                $this->object->get('PMA_IS_GD2'),
-                'PMA_IS_GD2 should be 0'
-            );
+            self::assertSame(0, $this->object->get('PMA_IS_GD2'), 'PMA_IS_GD2 should be 0');
         }
     }
 
@@ -406,7 +384,7 @@ class ConfigTest extends AbstractTestCase
     {
         $_SERVER['SERVER_SOFTWARE'] = $server;
         $this->object->checkWebServer();
-        $this->assertEquals($iis, $this->object->get('PMA_IS_IIS'));
+        self::assertSame($iis, $this->object->get('PMA_IS_IIS'));
         unset($_SERVER['SERVER_SOFTWARE']);
     }
 
@@ -438,21 +416,21 @@ class ConfigTest extends AbstractTestCase
 
         if (defined('PHP_OS')) {
             if (stristr(PHP_OS, 'darwin')) {
-                $this->assertFalse($this->object->get('PMA_IS_WINDOWS'));
+                self::assertFalse($this->object->get('PMA_IS_WINDOWS'));
             } elseif (stristr(PHP_OS, 'win')) {
-                $this->assertTrue($this->object->get('PMA_IS_WINDOWS'));
+                self::assertTrue($this->object->get('PMA_IS_WINDOWS'));
             } elseif (stristr(PHP_OS, 'OS/2')) {
-                $this->assertTrue($this->object->get('PMA_IS_WINDOWS'));
+                self::assertTrue($this->object->get('PMA_IS_WINDOWS'));
             } elseif (stristr(PHP_OS, 'Linux')) {
-                $this->assertFalse($this->object->get('PMA_IS_WINDOWS'));
+                self::assertFalse($this->object->get('PMA_IS_WINDOWS'));
             } else {
                 $this->markTestIncomplete('Not known PHP_OS: ' . PHP_OS);
             }
         } else {
-            $this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'));
+            self::assertSame(0, $this->object->get('PMA_IS_WINDOWS'));
 
             define('PHP_OS', 'Windows');
-            $this->assertTrue($this->object->get('PMA_IS_WINDOWS'));
+            self::assertTrue($this->object->get('PMA_IS_WINDOWS'));
         }
     }
 
@@ -472,11 +450,11 @@ class ConfigTest extends AbstractTestCase
         $settings = new Settings([]);
         $config = $settings->toArray();
 
-        $this->assertIsArray($config['Servers']);
-        $this->assertEquals($config['Servers'][1], $this->object->defaultServer);
+        self::assertIsArray($config['Servers']);
+        self::assertSame($config['Servers'][1], $this->object->defaultServer);
         unset($config['Servers']);
-        $this->assertEquals($config, $this->object->default);
-        $this->assertEquals(
+        self::assertSame($config, $this->object->default);
+        self::assertSame(
             array_replace_recursive(['is_setup' => false, 'AvailableCharsets' => ['test']], $config),
             $this->object->settings
         );
@@ -488,13 +466,13 @@ class ConfigTest extends AbstractTestCase
     public function testCheckConfigSource(): void
     {
         $this->object->setSource('unexisted.config.php');
-        $this->assertFalse($this->object->checkConfigSource());
-        $this->assertEquals(0, $this->object->sourceMtime);
+        self::assertFalse($this->object->checkConfigSource());
+        self::assertSame(0, $this->object->sourceMtime);
 
         $this->object->setSource(TEST_PATH . 'test/test_data/config.inc.php');
 
-        $this->assertNotEmpty($this->object->getSource());
-        $this->assertTrue($this->object->checkConfigSource());
+        self::assertNotEmpty($this->object->getSource());
+        self::assertTrue($this->object->checkConfigSource());
     }
 
     /**
@@ -502,11 +480,11 @@ class ConfigTest extends AbstractTestCase
      */
     public function testGetAndSet(): void
     {
-        $this->assertNull($this->object->get('unresisting_setting'));
+        self::assertNull($this->object->get('unresisting_setting'));
 
         $this->object->set('test_setting', 'test_value');
 
-        $this->assertEquals('test_value', $this->object->get('test_setting'));
+        self::assertSame('test_value', $this->object->get('test_setting'));
     }
 
     /**
@@ -516,15 +494,11 @@ class ConfigTest extends AbstractTestCase
     {
         echo $this->object->getSource();
 
-        $this->assertEmpty($this->object->getSource(), 'Source is null by default');
+        self::assertEmpty($this->object->getSource(), 'Source is null by default');
 
         $this->object->setSource(ROOT_PATH . 'config.sample.inc.php');
 
-        $this->assertEquals(
-            ROOT_PATH . 'config.sample.inc.php',
-            $this->object->getSource(),
-            'Cant set new source'
-        );
+        self::assertSame(ROOT_PATH . 'config.sample.inc.php', $this->object->getSource(), 'Cant set new source');
     }
 
     /**
@@ -569,7 +543,7 @@ class ConfigTest extends AbstractTestCase
 
         $this->object->set('is_https', null);
         $this->object->set('PmaAbsoluteUri', $pmaAbsoluteUri);
-        $this->assertEquals($expected, $this->object->isHttps());
+        self::assertSame($expected, $this->object->isHttps());
     }
 
     /**
@@ -804,7 +778,7 @@ class ConfigTest extends AbstractTestCase
     {
         $GLOBALS['PMA_PHP_SELF'] = $request;
         $this->object->set('PmaAbsoluteUri', $absolute);
-        $this->assertEquals($expected, $this->object->getRootPath());
+        self::assertSame($expected, $this->object->getRootPath());
     }
 
     /**
@@ -909,9 +883,9 @@ class ConfigTest extends AbstractTestCase
     public function testLoad(string $source, bool $result): void
     {
         if ($result) {
-            $this->assertTrue($this->object->load($source));
+            self::assertTrue($this->object->load($source));
         } else {
-            $this->assertFalse($this->object->load($source));
+            self::assertFalse($this->object->load($source));
         }
     }
 
@@ -952,10 +926,7 @@ class ConfigTest extends AbstractTestCase
     {
         $this->object->setUserValue(null, 'lang', 'cs', 'en');
         $this->object->setUserValue('TEST_COOKIE_USER_VAL', '', 'cfg_val_1');
-        $this->assertEquals(
-            $this->object->getUserValue('TEST_COOKIE_USER_VAL', 'fail'),
-            'cfg_val_1'
-        );
+        self::assertSame($this->object->getUserValue('TEST_COOKIE_USER_VAL', 'fail'), 'cfg_val_1');
     }
 
     /**
@@ -963,7 +934,7 @@ class ConfigTest extends AbstractTestCase
      */
     public function testGetUserValue(): void
     {
-        $this->assertEquals($this->object->getUserValue('test_val', 'val'), 'val');
+        self::assertSame($this->object->getUserValue('test_val', 'val'), 'val');
     }
 
     /**
@@ -974,15 +945,15 @@ class ConfigTest extends AbstractTestCase
         //load file permissions for the current permissions file
         $perms = @fileperms($this->object->getSource());
         //testing for permissions for no configuration file
-        $this->assertFalse(! ($perms === false) && ($perms & 2));
+        self::assertFalse(! ($perms === false) && ($perms & 2));
 
         //load file permissions for the current permissions file
         $perms = @fileperms($this->permTestObj->getSource());
 
         if (! ($perms === false) && ($perms & 2)) {
-            $this->assertTrue((bool) $this->permTestObj->get('PMA_IS_WINDOWS'));
+            self::assertTrue((bool) $this->permTestObj->get('PMA_IS_WINDOWS'));
         } else {
-            $this->assertFalse((bool) $this->permTestObj->get('PMA_IS_WINDOWS'));
+            self::assertFalse((bool) $this->permTestObj->get('PMA_IS_WINDOWS'));
         }
     }
 
@@ -992,39 +963,31 @@ class ConfigTest extends AbstractTestCase
     public function testSetCookie(): void
     {
         $this->object->set('is_https', false);
-        $this->assertFalse(
-            $this->object->setCookie(
-                'TEST_DEF_COOKIE',
-                'test_def_123',
-                'test_def_123'
-            )
-        );
+        self::assertFalse($this->object->setCookie(
+            'TEST_DEF_COOKIE',
+            'test_def_123',
+            'test_def_123'
+        ));
 
-        $this->assertTrue(
-            $this->object->setCookie(
-                'TEST_CONFIG_COOKIE',
-                'test_val_123',
-                null,
-                3600
-            )
-        );
+        self::assertTrue($this->object->setCookie(
+            'TEST_CONFIG_COOKIE',
+            'test_val_123',
+            null,
+            3600
+        ));
 
-        $this->assertTrue(
-            $this->object->setCookie(
-                'TEST_CONFIG_COOKIE',
-                '',
-                'default_val'
-            )
-        );
+        self::assertTrue($this->object->setCookie(
+            'TEST_CONFIG_COOKIE',
+            '',
+            'default_val'
+        ));
 
         $_COOKIE['TEST_MANUAL_COOKIE'] = 'some_test_val';
-        $this->assertTrue(
-            $this->object->setCookie(
-                'TEST_MANUAL_COOKIE',
-                'other',
-                'other'
-            )
-        );
+        self::assertTrue($this->object->setCookie(
+            'TEST_MANUAL_COOKIE',
+            'other',
+            'other'
+        ));
     }
 
     /**
@@ -1035,16 +998,13 @@ class ConfigTest extends AbstractTestCase
     public function testGetTempDir(): void
     {
         $dir = realpath(sys_get_temp_dir());
-        $this->assertNotFalse($dir);
-        $this->assertDirectoryExists($dir);
-        $this->assertDirectoryIsWritable($dir);
+        self::assertNotFalse($dir);
+        self::assertDirectoryExists($dir);
+        self::assertDirectoryIsWritable($dir);
 
         $this->object->set('TempDir', $dir . DIRECTORY_SEPARATOR);
         // Check no double slash is here
-        $this->assertEquals(
-            $dir . DIRECTORY_SEPARATOR . 'upload',
-            $this->object->getTempDir('upload')
-        );
+        self::assertSame($dir . DIRECTORY_SEPARATOR . 'upload', $this->object->getTempDir('upload'));
     }
 
     /**
@@ -1056,16 +1016,13 @@ class ConfigTest extends AbstractTestCase
     public function testGetUploadTempDir(): void
     {
         $dir = realpath(sys_get_temp_dir());
-        $this->assertNotFalse($dir);
-        $this->assertDirectoryExists($dir);
-        $this->assertDirectoryIsWritable($dir);
+        self::assertNotFalse($dir);
+        self::assertDirectoryExists($dir);
+        self::assertDirectoryIsWritable($dir);
 
         $this->object->set('TempDir', $dir . DIRECTORY_SEPARATOR);
 
-        $this->assertEquals(
-            $this->object->getTempDir('upload'),
-            $this->object->getUploadTempDir()
-        );
+        self::assertSame($this->object->getTempDir('upload'), $this->object->getUploadTempDir());
     }
 
     /**
@@ -1082,7 +1039,7 @@ class ConfigTest extends AbstractTestCase
         $this->object->checkServers();
         $expected = array_merge($this->object->defaultServer, $expected);
 
-        $this->assertEquals($expected, $this->object->settings['Servers'][1]);
+        self::assertSame($expected, $this->object->settings['Servers'][1]);
     }
 
     /**
@@ -1124,7 +1081,7 @@ class ConfigTest extends AbstractTestCase
         $this->object->checkServers();
         $expected = array_merge($this->object->defaultServer, ['host' => '127.0.0.1']);
 
-        $this->assertEquals($expected, $this->object->settings['Servers'][1]);
+        self::assertSame($expected, $this->object->settings['Servers'][1]);
     }
 
     /**
@@ -1142,7 +1099,7 @@ class ConfigTest extends AbstractTestCase
         $this->object->settings['Servers'] = $settings;
         $this->object->checkServers();
         $_REQUEST['server'] = $request;
-        $this->assertEquals($expected, $this->object->selectServer());
+        self::assertSame($expected, $this->object->selectServer());
     }
 
     /**
@@ -1215,7 +1172,7 @@ class ConfigTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['Server'] = $server_cfg;
         $result = Config::getConnectionParams($mode, $server);
-        $this->assertEquals($expected, $result);
+        self::assertEquals($expected, $result);
     }
 
     /**
diff --git a/test/classes/ConsoleTest.php b/test/classes/ConsoleTest.php
index 7aeaecceea..cd5967835d 100644
--- a/test/classes/ConsoleTest.php
+++ b/test/classes/ConsoleTest.php
@@ -15,7 +15,7 @@ class ConsoleTest extends AbstractTestCase
     public function testGetScripts(): void
     {
         $console = new Console();
-        $this->assertEquals(['console.js'], $console->getScripts());
+        self::assertSame(['console.js'], $console->getScripts());
     }
 
     public function testSetAjax(): void
@@ -24,10 +24,10 @@ class ConsoleTest extends AbstractTestCase
         $isAjax->setAccessible(true);
         $console = new Console();
 
-        $this->assertFalse($isAjax->getValue($console));
+        self::assertFalse($isAjax->getValue($console));
         $console->setAjax(true);
-        $this->assertTrue($isAjax->getValue($console));
+        self::assertTrue($isAjax->getValue($console));
         $console->setAjax(false);
-        $this->assertFalse($isAjax->getValue($console));
+        self::assertFalse($isAjax->getValue($console));
     }
 }
diff --git a/test/classes/Controllers/CheckRelationsControllerTest.php b/test/classes/Controllers/CheckRelationsControllerTest.php
index 590d6ba3e6..fec3f1d97b 100644
--- a/test/classes/Controllers/CheckRelationsControllerTest.php
+++ b/test/classes/Controllers/CheckRelationsControllerTest.php
@@ -35,12 +35,12 @@ class CheckRelationsControllerTest extends AbstractTestCase
 
         $actual = $response->getHTMLResult();
 
-        $this->assertStringContainsString('phpMyAdmin configuration storage', $actual);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('phpMyAdmin configuration storage', $actual);
+        self::assertStringContainsString(
             'Configuration of pmadb…      <span class="text-danger"><strong>not OK</strong></span>',
             $actual
         );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'Create</a> a database named \'phpmyadmin\' and setup the phpMyAdmin configuration storage there.',
             $actual
         );
diff --git a/test/classes/Controllers/Database/EventsControllerTest.php b/test/classes/Controllers/Database/EventsControllerTest.php
index 7d5b2d7893..09dbb50ad2 100644
--- a/test/classes/Controllers/Database/EventsControllerTest.php
+++ b/test/classes/Controllers/Database/EventsControllerTest.php
@@ -183,7 +183,7 @@ final class EventsControllerTest extends AbstractTestCase
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testWithoutEvents(): void
@@ -308,6 +308,6 @@ HTML;
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 }
diff --git a/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php b/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
index 0d74f7be9f..9bd98e2128 100644
--- a/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
+++ b/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
@@ -36,18 +36,15 @@ class TablesControllerTest extends AbstractTestCase
         /** @var TablesController $multiTableQueryController */
         $multiTableQueryController = $containerBuilder->get(TablesController::class);
         $multiTableQueryController();
-        $this->assertSame(
-            [
-                'foreignKeyConstrains' => [
-                    [
-                        'TABLE_NAME' => 'table2',
-                        'COLUMN_NAME' => 'idtable2',
-                        'REFERENCED_TABLE_NAME' => 'table1',
-                        'REFERENCED_COLUMN_NAME' => 'idtable1',
-                    ],
+        self::assertSame([
+            'foreignKeyConstrains' => [
+                [
+                    'TABLE_NAME' => 'table2',
+                    'COLUMN_NAME' => 'idtable2',
+                    'REFERENCED_TABLE_NAME' => 'table1',
+                    'REFERENCED_COLUMN_NAME' => 'idtable1',
                 ],
             ],
-            $this->getResponseJsonResult()
-        );
+        ], $this->getResponseJsonResult());
     }
 }
diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php
index c5cb8fe205..e7fbb34114 100644
--- a/test/classes/Controllers/Database/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Database/PrivilegesControllerTest.php
@@ -52,46 +52,19 @@ class PrivilegesControllerTest extends AbstractTestCase
             $dbi
         ))(['checkprivsdb' => $db]);
 
-        $this->assertStringContainsString(
-            Url::getCommon(['db' => $db], ''),
-            $actual
-        );
+        self::assertStringContainsString(Url::getCommon(['db' => $db], ''), $actual);
 
-        $this->assertStringContainsString($db, $actual);
+        self::assertStringContainsString($db, $actual);
 
-        $this->assertStringContainsString(
-            __('User'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Host'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Type'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Privileges'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Grant'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Action'),
-            $actual
-        );
+        self::assertStringContainsString(__('User'), $actual);
+        self::assertStringContainsString(__('Host'), $actual);
+        self::assertStringContainsString(__('Type'), $actual);
+        self::assertStringContainsString(__('Privileges'), $actual);
+        self::assertStringContainsString(__('Grant'), $actual);
+        self::assertStringContainsString(__('Action'), $actual);
 
         //_pgettext('Create new user', 'New')
-        $this->assertStringContainsString(
-            _pgettext('Create new user', 'New'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            Url::getCommon(['checkprivsdb' => $db]),
-            $actual
-        );
+        self::assertStringContainsString(_pgettext('Create new user', 'New'), $actual);
+        self::assertStringContainsString(Url::getCommon(['checkprivsdb' => $db]), $actual);
     }
 }
diff --git a/test/classes/Controllers/Database/RoutinesControllerTest.php b/test/classes/Controllers/Database/RoutinesControllerTest.php
index 382df39827..39bb6a5e0d 100644
--- a/test/classes/Controllers/Database/RoutinesControllerTest.php
+++ b/test/classes/Controllers/Database/RoutinesControllerTest.php
@@ -233,7 +233,7 @@ final class RoutinesControllerTest extends AbstractTestCase
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testWithoutRoutines(): void
@@ -322,6 +322,6 @@ HTML;
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 }
diff --git a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
index 738bd4d077..c3d0277e08 100644
--- a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
+++ b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
@@ -56,7 +56,7 @@ class FavoriteTableControllerTest extends AbstractTestCase
 
         $json = $method->invokeArgs($controller, [$favoriteInstance, $user, $favoriteTable]);
 
-        $this->assertEquals(json_encode($favoriteTable), $json['favoriteTables'] ?? '');
-        $this->assertArrayHasKey('list', $json);
+        self::assertSame(json_encode($favoriteTable), $json['favoriteTables'] ?? '');
+        self::assertArrayHasKey('list', $json);
     }
 }
diff --git a/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php b/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
index 3b56c5b2ad..aec766d5f0 100644
--- a/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
+++ b/test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
@@ -31,7 +31,7 @@ class RealRowCountControllerTest extends AbstractTestCase
         (new RealRowCountController($response, new Template(), 'world', $this->dbi))();
 
         $json = $response->getJSONResult();
-        $this->assertEquals('4,079', $json['real_row_count']);
+        self::assertSame('4,079', $json['real_row_count']);
 
         $_REQUEST['real_row_count_all'] = 'on';
 
@@ -43,6 +43,6 @@ class RealRowCountControllerTest extends AbstractTestCase
             ['table' => 'Country', 'row_count' => '239'],
             ['table' => 'CountryLanguage', 'row_count' => '984'],
         ];
-        $this->assertEquals($expected, $json['real_row_count_all']);
+        self::assertSame($expected, $json['real_row_count_all']);
     }
 }
diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
index 7d9ab43ad8..ea72bfa1df 100644
--- a/test/classes/Controllers/Database/StructureControllerTest.php
+++ b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -125,9 +125,9 @@ class StructureControllerTest extends AbstractTestCase
             ]
         );
 
-        $this->assertTrue($currentTable['COUNTED']);
-        $this->assertEquals(6, $currentTable['TABLE_ROWS']);
-        $this->assertEquals(16394, $sumSize);
+        self::assertTrue($currentTable['COUNTED']);
+        self::assertSame(6, $currentTable['TABLE_ROWS']);
+        self::assertSame(16394, $sumSize);
 
         $currentTable['ENGINE'] = 'MYISAM';
         [$currentTable, , , $sumSize] = $method->invokeArgs(
@@ -138,8 +138,8 @@ class StructureControllerTest extends AbstractTestCase
             ]
         );
 
-        $this->assertFalse($currentTable['COUNTED']);
-        $this->assertEquals(16394, $sumSize);
+        self::assertFalse($currentTable['COUNTED']);
+        self::assertSame(16394, $sumSize);
 
         $controller = new StructureController(
             $this->response,
@@ -155,13 +155,13 @@ class StructureControllerTest extends AbstractTestCase
 
         $currentTable['ENGINE'] = 'InnoDB';
         [$currentTable, , , $sumSize] = $method->invokeArgs($controller, [$currentTable, 10]);
-        $this->assertTrue($currentTable['COUNTED']);
-        $this->assertEquals(10, $sumSize);
+        self::assertTrue($currentTable['COUNTED']);
+        self::assertSame(10, $sumSize);
 
         $currentTable['ENGINE'] = 'MYISAM';
         [$currentTable, , , $sumSize] = $method->invokeArgs($controller, [$currentTable, 10]);
-        $this->assertFalse($currentTable['COUNTED']);
-        $this->assertEquals(10, $sumSize);
+        self::assertFalse($currentTable['COUNTED']);
+        self::assertSame(10, $sumSize);
     }
 
     /**
@@ -210,9 +210,9 @@ class StructureControllerTest extends AbstractTestCase
                 0,
             ]
         );
-        $this->assertEquals(6, $currentTable['Rows']);
-        $this->assertEquals(16384, $sumSize);
-        $this->assertEquals(300, $overheadSize);
+        self::assertSame(6, $currentTable['Rows']);
+        self::assertSame(16384, $sumSize);
+        self::assertSame(300, $overheadSize);
 
         unset($currentTable['Data_free']);
         [$currentTable, , , , , $overheadSize] = $method->invokeArgs(
@@ -227,7 +227,7 @@ class StructureControllerTest extends AbstractTestCase
                 0,
             ]
         );
-        $this->assertEquals(0, $overheadSize);
+        self::assertSame(0, $overheadSize);
 
         $controller = new StructureController(
             $this->response,
@@ -252,7 +252,7 @@ class StructureControllerTest extends AbstractTestCase
                 0,
             ]
         );
-        $this->assertEquals(0, $sumSize);
+        self::assertSame(0, $sumSize);
 
         $controller = new StructureController(
             $this->response,
@@ -277,7 +277,7 @@ class StructureControllerTest extends AbstractTestCase
                 0,
             ]
         );
-        $this->assertArrayNotHasKey('Row', $currentTable);
+        self::assertArrayNotHasKey('Row', $currentTable);
     }
 
     /**
@@ -302,21 +302,15 @@ class StructureControllerTest extends AbstractTestCase
         );
 
         // When parameter $db is empty
-        $this->assertFalse(
-            $method->invokeArgs($controller, [[], 'table'])
-        );
+        self::assertFalse($method->invokeArgs($controller, [[], 'table']));
 
         // Correct parameter
         $tables = ['db.table'];
-        $this->assertTrue(
-            $method->invokeArgs($controller, [$tables, 'table'])
-        );
+        self::assertTrue($method->invokeArgs($controller, [$tables, 'table']));
 
         // Table not in database
         $tables = ['db.tab1e'];
-        $this->assertFalse(
-            $method->invokeArgs($controller, [$tables, 'table'])
-        );
+        self::assertFalse($method->invokeArgs($controller, [$tables, 'table']));
     }
 
     /**
@@ -358,23 +352,19 @@ class StructureControllerTest extends AbstractTestCase
         );
 
         $recentFavoriteTables = RecentFavoriteTable::getInstance('favorite');
-        $this->assertSame([], $recentFavoriteTables->getTables());
+        self::assertSame([], $recentFavoriteTables->getTables());
         $recentFavoriteTables->remove('sakila', 'country');
         $recentFavoriteTables->add('sakila', 'country');
-        $this->assertSame([
+        self::assertSame([
             [
                 'db' => 'sakila',
                 'table' => 'country',
             ],
         ], $recentFavoriteTables->getTables());
 
-        $this->assertFalse(
-            $method->invokeArgs($controller, [''])
-        );
+        self::assertFalse($method->invokeArgs($controller, ['']));
 
-        $this->assertTrue(
-            $method->invokeArgs($controller, ['country'])
-        );
+        self::assertTrue($method->invokeArgs($controller, ['country']));
     }
 
     /**
@@ -414,8 +404,8 @@ class StructureControllerTest extends AbstractTestCase
         $_REQUEST['db'] = 'my_unique_test_db';
         $tablesProperty->setValue($controller, []);
         $result = $method->invoke($controller, ['status' => false]);
-        $this->assertStringContainsString($_REQUEST['db'], $result);
-        $this->assertStringNotContainsString('id="overhead"', $result);
+        self::assertStringContainsString($_REQUEST['db'], $result);
+        self::assertStringNotContainsString('id="overhead"', $result);
 
         //with table
         $_REQUEST['db'] = 'my_unique_test_db';
@@ -433,9 +423,9 @@ class StructureControllerTest extends AbstractTestCase
         ]);
         $result = $method->invoke($controller, ['status' => false]);
 
-        $this->assertStringContainsString($_REQUEST['db'], $result);
-        $this->assertStringContainsString('id="overhead"', $result);
-        $this->assertStringContainsString('9.8', $result);
+        self::assertStringContainsString($_REQUEST['db'], $result);
+        self::assertStringContainsString('id="overhead"', $result);
+        self::assertStringContainsString('9.8', $result);
     }
 
     /**
@@ -455,23 +445,20 @@ class StructureControllerTest extends AbstractTestCase
         /** @var StructureController $structureController */
         $structureController = $containerBuilder->get(StructureController::class);
 
-        $this->assertSame(
+        self::assertSame([
+            [],
+            '',
+            '',
+            0,
+        ], $this->callFunction(
+            $structureController,
+            StructureController::class,
+            'getValuesForMroongaTable',
             [
                 [],
-                '',
-                '',
                 0,
-            ],
-            $this->callFunction(
-                $structureController,
-                StructureController::class,
-                'getValuesForMroongaTable',
-                [
-                    [],
-                    0,
-                ]
-            )
-        );
+            ]
+        ));
 
         // Enable stats
         $GLOBALS['cfg']['ShowStats'] = true;
@@ -482,52 +469,46 @@ class StructureControllerTest extends AbstractTestCase
             ['']
         );
 
-        $this->assertSame(
+        self::assertSame([
+            [
+                'Data_length' => 45,
+                'Index_length' => 60,
+            ],
+            '105',
+            'B',
+            105,
+        ], $this->callFunction(
+            $structureController,
+            StructureController::class,
+            'getValuesForMroongaTable',
             [
                 [
                     'Data_length' => 45,
                     'Index_length' => 60,
                 ],
-                '105',
-                'B',
-                105,
-            ],
-            $this->callFunction(
-                $structureController,
-                StructureController::class,
-                'getValuesForMroongaTable',
-                [
-                    [
-                        'Data_length' => 45,
-                        'Index_length' => 60,
-                    ],
-                    0,
-                ]
-            )
-        );
+                0,
+            ]
+        ));
 
-        $this->assertSame(
+        self::assertSame([
+            [
+                'Data_length' => 45,
+                'Index_length' => 60,
+            ],
+            '105',
+            'B',
+            180, //105 + 75
+        ], $this->callFunction(
+            $structureController,
+            StructureController::class,
+            'getValuesForMroongaTable',
             [
                 [
                     'Data_length' => 45,
                     'Index_length' => 60,
                 ],
-                '105',
-                'B',
-                180, //105 + 75
-            ],
-            $this->callFunction(
-                $structureController,
-                StructureController::class,
-                'getValuesForMroongaTable',
-                [
-                    [
-                        'Data_length' => 45,
-                        'Index_length' => 60,
-                    ],
-                    75,
-                ]
-            )
-        );
+                75,
+            ]
+        ));
     }
 }
diff --git a/test/classes/Controllers/Database/TriggersControllerTest.php b/test/classes/Controllers/Database/TriggersControllerTest.php
index 8f93227b04..a58ae8d47e 100644
--- a/test/classes/Controllers/Database/TriggersControllerTest.php
+++ b/test/classes/Controllers/Database/TriggersControllerTest.php
@@ -146,7 +146,7 @@ final class TriggersControllerTest extends AbstractTestCase
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testWithoutTriggers(): void
@@ -232,6 +232,6 @@ HTML;
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 }
diff --git a/test/classes/Controllers/Export/ExportControllerTest.php b/test/classes/Controllers/Export/ExportControllerTest.php
index d4888daad1..5d0b24c155 100644
--- a/test/classes/Controllers/Export/ExportControllerTest.php
+++ b/test/classes/Controllers/Export/ExportControllerTest.php
@@ -169,7 +169,7 @@ SQL;
         $exportController = new ExportController(new ResponseRenderer(), new Template(), new Export($this->dbi));
         $exportController($request);
         $output = $this->getActualOutputForAssertion();
-        $this->assertStringContainsString(htmlspecialchars($expectedOutput, ENT_COMPAT), $output);
+        self::assertStringContainsString(htmlspecialchars($expectedOutput, ENT_COMPAT), $output);
     }
 
     /** @see https://github.com/phpmyadmin/phpmyadmin/issues/19213 */
@@ -315,6 +315,6 @@ SQL;
         $exportController = new ExportController(new ResponseRenderer(), new Template(), new Export($this->dbi));
         $exportController($request);
         $output = $this->getActualOutputForAssertion();
-        $this->assertStringContainsString(htmlspecialchars($expectedOutput, ENT_COMPAT), $output);
+        self::assertStringContainsString(htmlspecialchars($expectedOutput, ENT_COMPAT), $output);
     }
 }
diff --git a/test/classes/Controllers/Export/Template/CreateControllerTest.php b/test/classes/Controllers/Export/Template/CreateControllerTest.php
index ca43f31784..2a241c52d2 100644
--- a/test/classes/Controllers/Export/Template/CreateControllerTest.php
+++ b/test/classes/Controllers/Export/Template/CreateControllerTest.php
@@ -75,7 +75,7 @@ class CreateControllerTest extends AbstractTestCase
             'selected_template' => null,
         ]);
 
-        $this->assertTrue($response->hasSuccessState());
-        $this->assertEquals(['data' => $options], $response->getJSONResult());
+        self::assertTrue($response->hasSuccessState());
+        self::assertSame(['data' => $options], $response->getJSONResult());
     }
 }
diff --git a/test/classes/Controllers/Export/Template/DeleteControllerTest.php b/test/classes/Controllers/Export/Template/DeleteControllerTest.php
index eac9eca9e3..70eede1803 100644
--- a/test/classes/Controllers/Export/Template/DeleteControllerTest.php
+++ b/test/classes/Controllers/Export/Template/DeleteControllerTest.php
@@ -38,6 +38,6 @@ class DeleteControllerTest extends AbstractTestCase
             new Relation($this->dbi)
         ))($request);
 
-        $this->assertTrue($response->hasSuccessState());
+        self::assertTrue($response->hasSuccessState());
     }
 }
diff --git a/test/classes/Controllers/Export/Template/LoadControllerTest.php b/test/classes/Controllers/Export/Template/LoadControllerTest.php
index 51ab552e03..db12837fbe 100644
--- a/test/classes/Controllers/Export/Template/LoadControllerTest.php
+++ b/test/classes/Controllers/Export/Template/LoadControllerTest.php
@@ -46,7 +46,7 @@ class LoadControllerTest extends AbstractTestCase
             new Relation($this->dbi)
         ))($request);
 
-        $this->assertTrue($response->hasSuccessState());
-        $this->assertEquals(['data' => 'data1'], $response->getJSONResult());
+        self::assertTrue($response->hasSuccessState());
+        self::assertSame(['data' => 'data1'], $response->getJSONResult());
     }
 }
diff --git a/test/classes/Controllers/Export/Template/UpdateControllerTest.php b/test/classes/Controllers/Export/Template/UpdateControllerTest.php
index c7b04d7028..19f7a6d9ea 100644
--- a/test/classes/Controllers/Export/Template/UpdateControllerTest.php
+++ b/test/classes/Controllers/Export/Template/UpdateControllerTest.php
@@ -41,6 +41,6 @@ class UpdateControllerTest extends AbstractTestCase
             new Relation($this->dbi)
         ))($request);
 
-        $this->assertTrue($response->hasSuccessState());
+        self::assertTrue($response->hasSuccessState());
     }
 }
diff --git a/test/classes/Controllers/GisDataEditorControllerTest.php b/test/classes/Controllers/GisDataEditorControllerTest.php
index 9c273b1b9d..69cd9401af 100644
--- a/test/classes/Controllers/GisDataEditorControllerTest.php
+++ b/test/classes/Controllers/GisDataEditorControllerTest.php
@@ -50,7 +50,7 @@ class GisDataEditorControllerTest extends AbstractTestCase
                 $value,
             ]
         );
-        $this->assertEquals($expected, $gisData);
+        self::assertSame($expected, $gisData);
     }
 
     /**
diff --git a/test/classes/Controllers/Import/ImportControllerTest.php b/test/classes/Controllers/Import/ImportControllerTest.php
index 34a0559172..00792ac3cb 100644
--- a/test/classes/Controllers/Import/ImportControllerTest.php
+++ b/test/classes/Controllers/Import/ImportControllerTest.php
@@ -63,12 +63,12 @@ class ImportControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $this->assertResponseWasSuccessfull();
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'MySQL returned an empty result set (i.e. zero rows).',
             $this->getResponseHtmlResult()
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'SELECT A.*' . "\n" . 'FROM table1 A' . "\n"
                 . 'WHERE A.nomEtablissement = \'Saint-Louis - Châteaulin\' AND foo = 4 AND `:a` IS NULL',
             $this->getResponseHtmlResult()
diff --git a/test/classes/Controllers/Import/SimulateDmlControllerTest.php b/test/classes/Controllers/Import/SimulateDmlControllerTest.php
index ac73c64e7c..cdeba0193c 100644
--- a/test/classes/Controllers/Import/SimulateDmlControllerTest.php
+++ b/test/classes/Controllers/Import/SimulateDmlControllerTest.php
@@ -51,7 +51,7 @@ class SimulateDmlControllerTest extends AbstractTestCase
         );
         /** @var Parser $parser */
         $parser = $this->callFunction($controller, SimulateDmlController::class, 'createParser', [$sqlQuery, ';']);
-        $this->assertCount(count($expectedPerQuery), $parser->statements);
+        self::assertCount(count($expectedPerQuery), $parser->statements);
 
         $this->callFunction($controller, SimulateDmlController::class, 'process', [$parser]);
 
@@ -60,7 +60,7 @@ class SimulateDmlControllerTest extends AbstractTestCase
 
         /** @var string $error */
         $error = $this->getProperty($controller, SimulateDmlController::class, 'error');
-        $this->assertSame('', $error);
+        self::assertSame('', $error);
 
         /** @var list<array<mixed>> $result */
         $result = $this->getProperty($controller, SimulateDmlController::class, 'data');
@@ -78,7 +78,7 @@ class SimulateDmlControllerTest extends AbstractTestCase
                 ]),
             ];
 
-            $this->assertEquals($expected, $result[$idx]);
+            self::assertSame($expected, $result[$idx]);
         }
     }
 
diff --git a/test/classes/Controllers/JavaScriptMessagesControllerTest.php b/test/classes/Controllers/JavaScriptMessagesControllerTest.php
index 0c84d4ea7c..41ab0cfd8b 100644
--- a/test/classes/Controllers/JavaScriptMessagesControllerTest.php
+++ b/test/classes/Controllers/JavaScriptMessagesControllerTest.php
@@ -31,15 +31,15 @@ class JavaScriptMessagesControllerTest extends TestCase
         $actual = ob_get_contents();
         ob_end_clean();
 
-        $this->assertIsString($actual);
-        $this->assertStringStartsWith('var Messages = {', $actual);
-        $this->assertStringEndsWith('};', $actual);
+        self::assertIsString($actual);
+        self::assertStringStartsWith('var Messages = {', $actual);
+        self::assertStringEndsWith('};', $actual);
 
         $json = substr($actual, strlen('var Messages = '), -1);
         $array = json_decode($json, true);
 
-        $this->assertIsArray($array);
-        $this->assertArrayHasKey('strConfirm', $array);
-        $this->assertEquals(__('Confirm'), $array['strConfirm']);
+        self::assertIsArray($array);
+        self::assertArrayHasKey('strConfirm', $array);
+        self::assertSame(__('Confirm'), $array['strConfirm']);
     }
 }
diff --git a/test/classes/Controllers/NavigationControllerTest.php b/test/classes/Controllers/NavigationControllerTest.php
index f3515ab042..d860b42dfc 100644
--- a/test/classes/Controllers/NavigationControllerTest.php
+++ b/test/classes/Controllers/NavigationControllerTest.php
@@ -119,49 +119,46 @@ class NavigationControllerTest extends AbstractTestCase
 
         $responseMessage = $this->getResponseJsonResult()['message'];
 
-        $this->assertStringContainsString('<div id=\'pma_navigation_tree_content\'>', $responseMessage);
+        self::assertStringContainsString('<div id=\'pma_navigation_tree_content\'>', $responseMessage);
 
         // root.air-balloon_burner_dev2
         // cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI=
-        $this->assertStringContainsString(
-            '<div id=\'pma_navigation_tree_content\'>' . "\n"
-            . '  <ul>' . "\n"
-            . '      <li class="first database">' . "\n"
-            . '    <div class="block">' . "\n"
-            . '      <i class="first"></i>' . "\n"
-            . '              <b></b>' . "\n"
-            . '        <a class="expander" href="#">' . "\n"
-            . '          <span class="hide paths_nav" data-apath="cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI="'
-                        . ' data-vpath="cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI="'
-                        . ' data-pos="0"></span>' . "\n"
-            . '                    <img src="themes/dot.gif" title="Expand/Collapse"'
-                                . ' alt="Expand/Collapse" class="icon ic_b_plus">' . "\n"
-            . '        </a>' . "\n"
-            . '          </div>' . "\n"
-            . '    ' . "\n"
-            . '          <div class="block second">' . "\n"
-            . '                  <a href="index.php?route=/database/operations'
-                                . '&db=air-balloon_burner_dev2&lang=en">'
-                                . '<img src="themes/dot.gif" title="Database operations"'
-                                . ' alt="Database operations" class="icon ic_s_db"></a>' . "\n"
-            . '              </div>' . "\n"
-            . "\n"
-            . '              <a class="hover_show_full"'
-                    . ' href="index.php?route=/database/structure&db=air-balloon_burner_dev2&lang=en"'
-                    . ' title="Structure">air-balloon_burner_dev2</a>' . "\n"
-            . '          ' . "\n"
-            . '    ' . "\n"
-            . "\n"
-            . '    ' . "\n"
-            . '    <div class="clearfloat"></div>' . "\n"
-            . "\n"
-            . "\n"
-            . "\n"
-            . "\n"
-            . '  </ul>' . "\n"
-            . '</div>',
-            $responseMessage
-        );
+        self::assertStringContainsString('<div id=\'pma_navigation_tree_content\'>' . "\n"
+        . '  <ul>' . "\n"
+        . '      <li class="first database">' . "\n"
+        . '    <div class="block">' . "\n"
+        . '      <i class="first"></i>' . "\n"
+        . '              <b></b>' . "\n"
+        . '        <a class="expander" href="#">' . "\n"
+        . '          <span class="hide paths_nav" data-apath="cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI="'
+                    . ' data-vpath="cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI="'
+                    . ' data-pos="0"></span>' . "\n"
+        . '                    <img src="themes/dot.gif" title="Expand/Collapse"'
+                            . ' alt="Expand/Collapse" class="icon ic_b_plus">' . "\n"
+        . '        </a>' . "\n"
+        . '          </div>' . "\n"
+        . '    ' . "\n"
+        . '          <div class="block second">' . "\n"
+        . '                  <a href="index.php?route=/database/operations'
+                            . '&db=air-balloon_burner_dev2&lang=en">'
+                            . '<img src="themes/dot.gif" title="Database operations"'
+                            . ' alt="Database operations" class="icon ic_s_db"></a>' . "\n"
+        . '              </div>' . "\n"
+        . "\n"
+        . '              <a class="hover_show_full"'
+                . ' href="index.php?route=/database/structure&db=air-balloon_burner_dev2&lang=en"'
+                . ' title="Structure">air-balloon_burner_dev2</a>' . "\n"
+        . '          ' . "\n"
+        . '    ' . "\n"
+        . "\n"
+        . '    ' . "\n"
+        . '    <div class="clearfloat"></div>' . "\n"
+        . "\n"
+        . "\n"
+        . "\n"
+        . "\n"
+        . '  </ul>' . "\n"
+        . '</div>', $responseMessage);
         $this->assertAllQueriesConsumed();
     }
 
@@ -275,7 +272,7 @@ class NavigationControllerTest extends AbstractTestCase
 
         $responseMessage = $this->getResponseJsonResult()['message'];
 
-        $this->assertStringContainsString('<div id=\'pma_navigation_tree_content\'>', $responseMessage);
+        self::assertStringContainsString('<div id=\'pma_navigation_tree_content\'>', $responseMessage);
 
         $dbTemplate =
             '  <li class="database database">' . "\n"
@@ -368,68 +365,65 @@ class NavigationControllerTest extends AbstractTestCase
 
         // root.air-balloon_burner_dev2
         // cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI=
-        $this->assertStringContainsString(
-            '<div id=\'pma_navigation_tree_content\'>' . "\n"
-            . '  <ul>' . "\n"
-            . '      <li class="first navGroup">' . "\n"
-            . '    <div class="block">' . "\n"
-            . '      <i class="first"></i>' . "\n"
-            . '              <b></b>' . "\n"
-            . '        <a class="expander loaded container" href="#">' . "\n"
-            . '          <span class="hide paths_nav" data-apath="cm9vdA=="'
-                        . ' data-vpath="cm9vdA==.YWlyLWJhbGxvb24="'
-                        . ' data-pos="0"></span>' . "\n"
-            . '                    <img src="themes/dot.gif" title="" alt="" class="icon ic_b_minus">' . "\n"
-            . '        </a>' . "\n"
-            . '          </div>' . "\n"
-            . '          <div class="fst-italic">' . "\n"
-            . '    ' . "\n"
-            . '          <div class="block second">' . "\n"
-            . '        <u><img src="themes/dot.gif" title="Groups" alt="Groups" class="icon ic_b_group"></u>' . "\n"
-            . '      </div>' . "\n"
-            . '      &nbsp;air-balloon' . "\n"
-            . '    ' . "\n"
-            . '    ' . "\n"
-            . "\n"
-            . '          </div>' . "\n"
-            . '    ' . "\n"
-            . '    <div class="clearfloat"></div>' . "\n"
-            . "\n"
-            . '  <div class="list_container">' . "\n"
-            . '    <ul>' . "\n"
-                    . sprintf(
-                        $dbTemplate,
-                        'cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2Rldg==',
-                        'cm9vdA==.YWlyLWJhbGxvb24=.YnVybmVyX2Rldg==',
-                        'air-balloon_burner_dev',
-                        'air-balloon_burner_dev',
-                        'air-balloon_burner_dev'
-                    ) . "\n"
-                    . sprintf(
-                        $dbTemplateExpanded,
-                        'cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI=',
-                        'cm9vdA==.YWlyLWJhbGxvb24=.YnVybmVyX2RldjI=',
-                        'air-balloon_burner_dev2',
-                        'air-balloon_burner_dev2',
-                        'air-balloon_burner_dev2'
-                    ) . "\n"
-                    . sprintf(
-                        $dbTemplateLast,
-                        'cm9vdA==.YWlyLWJhbGxvb25fZGV2',
-                        'cm9vdA==.YWlyLWJhbGxvb24=.ZGV2',
-                        'air-balloon_dev',
-                        'air-balloon_dev',
-                        'air-balloon_dev'
-                    ) . "\n"
-            . "\n"
-            . '    </ul>' . "\n"
-            . '  </div>' . "\n"
-            . "\n"
-            . "\n"
-            . '  </ul>' . "\n"
-            . '</div>' . "\n",
-            $responseMessage
-        );
+        self::assertStringContainsString('<div id=\'pma_navigation_tree_content\'>' . "\n"
+        . '  <ul>' . "\n"
+        . '      <li class="first navGroup">' . "\n"
+        . '    <div class="block">' . "\n"
+        . '      <i class="first"></i>' . "\n"
+        . '              <b></b>' . "\n"
+        . '        <a class="expander loaded container" href="#">' . "\n"
+        . '          <span class="hide paths_nav" data-apath="cm9vdA=="'
+                    . ' data-vpath="cm9vdA==.YWlyLWJhbGxvb24="'
+                    . ' data-pos="0"></span>' . "\n"
+        . '                    <img src="themes/dot.gif" title="" alt="" class="icon ic_b_minus">' . "\n"
+        . '        </a>' . "\n"
+        . '          </div>' . "\n"
+        . '          <div class="fst-italic">' . "\n"
+        . '    ' . "\n"
+        . '          <div class="block second">' . "\n"
+        . '        <u><img src="themes/dot.gif" title="Groups" alt="Groups" class="icon ic_b_group"></u>' . "\n"
+        . '      </div>' . "\n"
+        . '      &nbsp;air-balloon' . "\n"
+        . '    ' . "\n"
+        . '    ' . "\n"
+        . "\n"
+        . '          </div>' . "\n"
+        . '    ' . "\n"
+        . '    <div class="clearfloat"></div>' . "\n"
+        . "\n"
+        . '  <div class="list_container">' . "\n"
+        . '    <ul>' . "\n"
+                . sprintf(
+                    $dbTemplate,
+                    'cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2Rldg==',
+                    'cm9vdA==.YWlyLWJhbGxvb24=.YnVybmVyX2Rldg==',
+                    'air-balloon_burner_dev',
+                    'air-balloon_burner_dev',
+                    'air-balloon_burner_dev'
+                ) . "\n"
+                . sprintf(
+                    $dbTemplateExpanded,
+                    'cm9vdA==.YWlyLWJhbGxvb25fYnVybmVyX2RldjI=',
+                    'cm9vdA==.YWlyLWJhbGxvb24=.YnVybmVyX2RldjI=',
+                    'air-balloon_burner_dev2',
+                    'air-balloon_burner_dev2',
+                    'air-balloon_burner_dev2'
+                ) . "\n"
+                . sprintf(
+                    $dbTemplateLast,
+                    'cm9vdA==.YWlyLWJhbGxvb25fZGV2',
+                    'cm9vdA==.YWlyLWJhbGxvb24=.ZGV2',
+                    'air-balloon_dev',
+                    'air-balloon_dev',
+                    'air-balloon_dev'
+                ) . "\n"
+        . "\n"
+        . '    </ul>' . "\n"
+        . '  </div>' . "\n"
+        . "\n"
+        . "\n"
+        . '  </ul>' . "\n"
+        . '</div>' . "\n", $responseMessage);
         $this->assertAllQueriesConsumed();
     }
 }
diff --git a/test/classes/Controllers/NormalizationControllerTest.php b/test/classes/Controllers/NormalizationControllerTest.php
index 0d556e55eb..7471be1d09 100644
--- a/test/classes/Controllers/NormalizationControllerTest.php
+++ b/test/classes/Controllers/NormalizationControllerTest.php
@@ -151,15 +151,12 @@ class NormalizationControllerTest extends AbstractTestCase
 
         $this->assertResponseWasSuccessfull();
 
-        $this->assertSame(
-            [
-                'legendText' => 'End of step',
-                'headText' => '<h3>The second step of normalization is complete for table \'test_tbl\'.</h3>',
-                'queryError' => false,
-                'extra' => '',
-            ],
-            $this->getResponseJsonResult()
-        );
+        self::assertSame([
+            'legendText' => 'End of step',
+            'headText' => '<h3>The second step of normalization is complete for table \'test_tbl\'.</h3>',
+            'queryError' => false,
+            'extra' => '',
+        ], $this->getResponseJsonResult());
     }
 
     public function testCreateNewTables3NF(): void
@@ -191,14 +188,11 @@ class NormalizationControllerTest extends AbstractTestCase
 
         $this->assertResponseWasSuccessfull();
 
-        $this->assertSame(
-            [
-                'legendText' => 'End of step',
-                'headText' => '<h3>The third step of normalization is complete.</h3>',
-                'queryError' => false,
-                'extra' => '',
-            ],
-            $this->getResponseJsonResult()
-        );
+        self::assertSame([
+            'legendText' => 'End of step',
+            'headText' => '<h3>The third step of normalization is complete.</h3>',
+            'queryError' => false,
+            'extra' => '',
+        ], $this->getResponseJsonResult());
     }
 }
diff --git a/test/classes/Controllers/Server/BinlogControllerTest.php b/test/classes/Controllers/Server/BinlogControllerTest.php
index e87e429def..157ebf6014 100644
--- a/test/classes/Controllers/Server/BinlogControllerTest.php
+++ b/test/classes/Controllers/Server/BinlogControllerTest.php
@@ -51,35 +51,35 @@ class BinlogControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $actual = $response->getHTMLResult();
 
-        $this->assertStringContainsString('Select binary log to view', $actual);
-        $this->assertStringContainsString('<option value="index1" selected>', $actual);
-        $this->assertStringContainsString('<option value="index2">', $actual);
+        self::assertStringContainsString('Select binary log to view', $actual);
+        self::assertStringContainsString('<option value="index1" selected>', $actual);
+        self::assertStringContainsString('<option value="index2">', $actual);
 
-        $this->assertStringContainsString('Your SQL query has been executed successfully', $actual);
+        self::assertStringContainsString('Your SQL query has been executed successfully', $actual);
 
-        $this->assertStringContainsString("SHOW BINLOG EVENTS IN 'index1' LIMIT 3, 10", $actual);
+        self::assertStringContainsString("SHOW BINLOG EVENTS IN 'index1' LIMIT 3, 10", $actual);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table class="table table-striped table-hover align-middle" id="binlogTable">',
             $actual
         );
 
         $urlNavigation = Url::getFromRoute('/server/binlog') . '" data-post="log=index1&pos=3&'
             . 'is_full_query=1&server=1&';
-        $this->assertStringContainsString($urlNavigation, $actual);
-        $this->assertStringContainsString('title="Previous"', $actual);
+        self::assertStringContainsString($urlNavigation, $actual);
+        self::assertStringContainsString('title="Previous"', $actual);
 
-        $this->assertStringContainsString('Log name', $actual);
-        $this->assertStringContainsString('Position', $actual);
-        $this->assertStringContainsString('Event type', $actual);
-        $this->assertStringContainsString('Server ID', $actual);
-        $this->assertStringContainsString('Original position', $actual);
+        self::assertStringContainsString('Log name', $actual);
+        self::assertStringContainsString('Position', $actual);
+        self::assertStringContainsString('Event type', $actual);
+        self::assertStringContainsString('Server ID', $actual);
+        self::assertStringContainsString('Original position', $actual);
 
-        $this->assertStringContainsString('index1_Log_name', $actual);
-        $this->assertStringContainsString('index1_Pos', $actual);
-        $this->assertStringContainsString('index1_Event_type', $actual);
-        $this->assertStringContainsString('index1_Server_id', $actual);
-        $this->assertStringContainsString('index1_Orig_log_pos', $actual);
-        $this->assertStringContainsString('index1_Info', $actual);
+        self::assertStringContainsString('index1_Log_name', $actual);
+        self::assertStringContainsString('index1_Pos', $actual);
+        self::assertStringContainsString('index1_Event_type', $actual);
+        self::assertStringContainsString('index1_Server_id', $actual);
+        self::assertStringContainsString('index1_Orig_log_pos', $actual);
+        self::assertStringContainsString('index1_Info', $actual);
     }
 }
diff --git a/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php
index 7b872d85ec..e718eaaa53 100644
--- a/test/classes/Controllers/Server/CollationsControllerTest.php
+++ b/test/classes/Controllers/Server/CollationsControllerTest.php
@@ -42,16 +42,16 @@ class CollationsControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $actual = $response->getHTMLResult();
 
-        $this->assertStringContainsString('<div><strong>latin1</strong></div>', $actual);
-        $this->assertStringContainsString('<div>cp1252 West European</div>', $actual);
-        $this->assertStringContainsString('<div><strong>latin1_swedish_ci</strong></div>', $actual);
-        $this->assertStringContainsString('<div>Swedish, case-insensitive</div>', $actual);
-        $this->assertStringContainsString('<span class="badge bg-secondary text-dark">default</span>', $actual);
-        $this->assertStringContainsString('<div><strong>utf8</strong></div>', $actual);
-        $this->assertStringContainsString('<div>UTF-8 Unicode</div>', $actual);
-        $this->assertStringContainsString('<div><strong>utf8_bin</strong></div>', $actual);
-        $this->assertStringContainsString('<div>Unicode, binary</div>', $actual);
-        $this->assertStringContainsString('<div><strong>utf8_general_ci</strong></div>', $actual);
-        $this->assertStringContainsString('<div>Unicode, case-insensitive</div>', $actual);
+        self::assertStringContainsString('<div><strong>latin1</strong></div>', $actual);
+        self::assertStringContainsString('<div>cp1252 West European</div>', $actual);
+        self::assertStringContainsString('<div><strong>latin1_swedish_ci</strong></div>', $actual);
+        self::assertStringContainsString('<div>Swedish, case-insensitive</div>', $actual);
+        self::assertStringContainsString('<span class="badge bg-secondary text-dark">default</span>', $actual);
+        self::assertStringContainsString('<div><strong>utf8</strong></div>', $actual);
+        self::assertStringContainsString('<div>UTF-8 Unicode</div>', $actual);
+        self::assertStringContainsString('<div><strong>utf8_bin</strong></div>', $actual);
+        self::assertStringContainsString('<div>Unicode, binary</div>', $actual);
+        self::assertStringContainsString('<div><strong>utf8_general_ci</strong></div>', $actual);
+        self::assertStringContainsString('<div>Unicode, case-insensitive</div>', $actual);
     }
 }
diff --git a/test/classes/Controllers/Server/Databases/CreateControllerTest.php b/test/classes/Controllers/Server/Databases/CreateControllerTest.php
index 53116cfa6a..1772c88fe4 100644
--- a/test/classes/Controllers/Server/Databases/CreateControllerTest.php
+++ b/test/classes/Controllers/Server/Databases/CreateControllerTest.php
@@ -37,8 +37,8 @@ final class CreateControllerTest extends AbstractTestCase
         $controller();
         $actual = $response->getJSONResult();
 
-        $this->assertArrayHasKey('message', $actual);
-        $this->assertStringContainsString('<div class="alert alert-danger" role="alert">', $actual['message']);
+        self::assertArrayHasKey('message', $actual);
+        self::assertStringContainsString('<div class="alert alert-danger" role="alert">', $actual['message']);
 
         $response = new ResponseRenderer();
         $response->setAjax(true);
@@ -51,11 +51,8 @@ final class CreateControllerTest extends AbstractTestCase
         $controller();
         $actual = $response->getJSONResult();
 
-        $this->assertArrayHasKey('message', $actual);
-        $this->assertStringContainsString('<div class="alert alert-success" role="alert">', $actual['message']);
-        $this->assertStringContainsString(
-            sprintf(__('Database %1$s has been created.'), 'test_db'),
-            $actual['message']
-        );
+        self::assertArrayHasKey('message', $actual);
+        self::assertStringContainsString('<div class="alert alert-success" role="alert">', $actual['message']);
+        self::assertStringContainsString(sprintf(__('Database %1$s has been created.'), 'test_db'), $actual['message']);
     }
 }
diff --git a/test/classes/Controllers/Server/Databases/DestroyControllerTest.php b/test/classes/Controllers/Server/Databases/DestroyControllerTest.php
index 472fee3c5a..05a4025a23 100644
--- a/test/classes/Controllers/Server/Databases/DestroyControllerTest.php
+++ b/test/classes/Controllers/Server/Databases/DestroyControllerTest.php
@@ -48,8 +48,8 @@ class DestroyControllerTest extends AbstractTestCase
         $controller();
         $actual = $response->getJSONResult();
 
-        $this->assertArrayHasKey('message', $actual);
-        $this->assertStringContainsString('<div class="alert alert-danger" role="alert">', $actual['message']);
-        $this->assertStringContainsString(__('No databases selected.'), $actual['message']);
+        self::assertArrayHasKey('message', $actual);
+        self::assertStringContainsString('<div class="alert alert-danger" role="alert">', $actual['message']);
+        self::assertStringContainsString(__('No databases selected.'), $actual['message']);
     }
 }
diff --git a/test/classes/Controllers/Server/DatabasesControllerTest.php b/test/classes/Controllers/Server/DatabasesControllerTest.php
index 4136f3bab2..1dd784955b 100644
--- a/test/classes/Controllers/Server/DatabasesControllerTest.php
+++ b/test/classes/Controllers/Server/DatabasesControllerTest.php
@@ -66,21 +66,21 @@ class DatabasesControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $actual = $response->getHTMLResult();
 
-        $this->assertStringContainsString('data-filter-row="SAKILA"', $actual);
-        $this->assertStringContainsString('sakila', $actual);
-        $this->assertStringContainsString('utf8_general_ci', $actual);
-        $this->assertStringContainsString('title="Unicode, case-insensitive"', $actual);
-        $this->assertStringContainsString('data-filter-row="SAKILA"', $actual);
-        $this->assertStringContainsString('employees', $actual);
-        $this->assertStringContainsString('latin1_swedish_ci', $actual);
-        $this->assertStringContainsString('title="Swedish, case-insensitive"', $actual);
-        $this->assertStringContainsString('<span id="filter-rows-count">2</span>', $actual);
-        $this->assertStringContainsString('name="pos" value="0"', $actual);
-        $this->assertStringContainsString('name="sort_by" value="SCHEMA_NAME"', $actual);
-        $this->assertStringContainsString('name="sort_order" value="asc"', $actual);
-        $this->assertStringContainsString(__('Enable statistics'), $actual);
-        $this->assertStringContainsString(__('No privileges to create databases'), $actual);
-        $this->assertStringNotContainsString(__('Indexes'), $actual);
+        self::assertStringContainsString('data-filter-row="SAKILA"', $actual);
+        self::assertStringContainsString('sakila', $actual);
+        self::assertStringContainsString('utf8_general_ci', $actual);
+        self::assertStringContainsString('title="Unicode, case-insensitive"', $actual);
+        self::assertStringContainsString('data-filter-row="SAKILA"', $actual);
+        self::assertStringContainsString('employees', $actual);
+        self::assertStringContainsString('latin1_swedish_ci', $actual);
+        self::assertStringContainsString('title="Swedish, case-insensitive"', $actual);
+        self::assertStringContainsString('<span id="filter-rows-count">2</span>', $actual);
+        self::assertStringContainsString('name="pos" value="0"', $actual);
+        self::assertStringContainsString('name="sort_by" value="SCHEMA_NAME"', $actual);
+        self::assertStringContainsString('name="sort_order" value="asc"', $actual);
+        self::assertStringContainsString(__('Enable statistics'), $actual);
+        self::assertStringContainsString(__('No privileges to create databases'), $actual);
+        self::assertStringNotContainsString(__('Indexes'), $actual);
 
         $response = new ResponseRenderer();
 
@@ -103,16 +103,16 @@ class DatabasesControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $actual = $response->getHTMLResult();
 
-        $this->assertStringNotContainsString(__('Enable statistics'), $actual);
-        $this->assertStringContainsString(__('Indexes'), $actual);
-        $this->assertStringContainsString('name="sort_by" value="SCHEMA_TABLES"', $actual);
-        $this->assertStringContainsString('name="sort_order" value="desc"', $actual);
-        $this->assertStringContainsString('name="statistics" value="1"', $actual);
-        $this->assertStringContainsString('title="3912174"', $actual);
-        $this->assertStringContainsString('3,912,174', $actual);
-        $this->assertStringContainsString('title="4358144"', $actual);
-        $this->assertStringContainsString('4.2', $actual);
-        $this->assertStringContainsString('MiB', $actual);
-        $this->assertStringContainsString('name="db_collation"', $actual);
+        self::assertStringNotContainsString(__('Enable statistics'), $actual);
+        self::assertStringContainsString(__('Indexes'), $actual);
+        self::assertStringContainsString('name="sort_by" value="SCHEMA_TABLES"', $actual);
+        self::assertStringContainsString('name="sort_order" value="desc"', $actual);
+        self::assertStringContainsString('name="statistics" value="1"', $actual);
+        self::assertStringContainsString('title="3912174"', $actual);
+        self::assertStringContainsString('3,912,174', $actual);
+        self::assertStringContainsString('title="4358144"', $actual);
+        self::assertStringContainsString('4.2', $actual);
+        self::assertStringContainsString('MiB', $actual);
+        self::assertStringContainsString('name="db_collation"', $actual);
     }
 }
diff --git a/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php
index cc411ab489..a0ff021650 100644
--- a/test/classes/Controllers/Server/EnginesControllerTest.php
+++ b/test/classes/Controllers/Server/EnginesControllerTest.php
@@ -45,15 +45,15 @@ class EnginesControllerTest extends AbstractTestCase
 
         $actual = $response->getHTMLResult();
 
-        $this->assertStringContainsString('<th scope="col">Storage Engine</th>', $actual);
-        $this->assertStringContainsString('<th scope="col">Description</th>', $actual);
+        self::assertStringContainsString('<th scope="col">Storage Engine</th>', $actual);
+        self::assertStringContainsString('<th scope="col">Description</th>', $actual);
 
-        $this->assertStringContainsString('<td>Federated MySQL storage engine</td>', $actual);
-        $this->assertStringContainsString('FEDERATED', $actual);
-        $this->assertStringContainsString('index.php?route=/server/engines/FEDERATED', $actual);
+        self::assertStringContainsString('<td>Federated MySQL storage engine</td>', $actual);
+        self::assertStringContainsString('FEDERATED', $actual);
+        self::assertStringContainsString('index.php?route=/server/engines/FEDERATED', $actual);
 
-        $this->assertStringContainsString('<td>dummy comment</td>', $actual);
-        $this->assertStringContainsString('dummy', $actual);
-        $this->assertStringContainsString('index.php?route=/server/engines/dummy', $actual);
+        self::assertStringContainsString('<td>dummy comment</td>', $actual);
+        self::assertStringContainsString('dummy', $actual);
+        self::assertStringContainsString('index.php?route=/server/engines/dummy', $actual);
     }
 }
diff --git a/test/classes/Controllers/Server/PluginsControllerTest.php b/test/classes/Controllers/Server/PluginsControllerTest.php
index a14480558c..a0482e4566 100644
--- a/test/classes/Controllers/Server/PluginsControllerTest.php
+++ b/test/classes/Controllers/Server/PluginsControllerTest.php
@@ -73,17 +73,17 @@ class PluginsControllerTest extends AbstractTestCase
         $actual = $response->getHTMLResult();
 
         //validate 1:Items
-        $this->assertStringContainsString('<th scope="col">Plugin</th>', $actual);
-        $this->assertStringContainsString('<th scope="col">Description</th>', $actual);
-        $this->assertStringContainsString('<th scope="col">Version</th>', $actual);
-        $this->assertStringContainsString('<th scope="col">Author</th>', $actual);
-        $this->assertStringContainsString('<th scope="col">License</th>', $actual);
+        self::assertStringContainsString('<th scope="col">Plugin</th>', $actual);
+        self::assertStringContainsString('<th scope="col">Description</th>', $actual);
+        self::assertStringContainsString('<th scope="col">Version</th>', $actual);
+        self::assertStringContainsString('<th scope="col">Author</th>', $actual);
+        self::assertStringContainsString('<th scope="col">License</th>', $actual);
 
         //validate 2: one Item HTML
-        $this->assertStringContainsString('plugin_name1', $actual);
-        $this->assertStringContainsString('<td>plugin_description1</td>', $actual);
-        $this->assertStringContainsString('<td>plugin_version1</td>', $actual);
-        $this->assertStringContainsString('<td>plugin_author1</td>', $actual);
-        $this->assertStringContainsString('<td>plugin_license1</td>', $actual);
+        self::assertStringContainsString('plugin_name1', $actual);
+        self::assertStringContainsString('<td>plugin_description1</td>', $actual);
+        self::assertStringContainsString('<td>plugin_version1</td>', $actual);
+        self::assertStringContainsString('<td>plugin_author1</td>', $actual);
+        self::assertStringContainsString('<td>plugin_license1</td>', $actual);
     }
 }
diff --git a/test/classes/Controllers/Server/Privileges/AccountLockControllerTest.php b/test/classes/Controllers/Server/Privileges/AccountLockControllerTest.php
index aeaccc83df..7b04727fed 100644
--- a/test/classes/Controllers/Server/Privileges/AccountLockControllerTest.php
+++ b/test/classes/Controllers/Server/Privileges/AccountLockControllerTest.php
@@ -64,10 +64,10 @@ class AccountLockControllerTest extends AbstractTestCase
         ($this->controller)($this->requestStub);
 
         $message = Message::success('The account test.user@test.host has been successfully locked.');
-        $this->assertTrue($this->responseRendererStub->isAjax());
-        $this->assertEquals(200, $this->responseRendererStub->getHttpResponseCode());
-        $this->assertTrue($this->responseRendererStub->hasSuccessState());
-        $this->assertEquals(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
+        self::assertTrue($this->responseRendererStub->isAjax());
+        self::assertSame(200, $this->responseRendererStub->getHttpResponseCode());
+        self::assertTrue($this->responseRendererStub->hasSuccessState());
+        self::assertSame(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
     }
 
     public function testWithInvalidAccount(): void
@@ -79,10 +79,10 @@ class AccountLockControllerTest extends AbstractTestCase
         ($this->controller)($this->requestStub);
 
         $message = Message::error('Invalid account.');
-        $this->assertTrue($this->responseRendererStub->isAjax());
-        $this->assertEquals(400, $this->responseRendererStub->getHttpResponseCode());
-        $this->assertFalse($this->responseRendererStub->hasSuccessState());
-        $this->assertEquals(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
+        self::assertTrue($this->responseRendererStub->isAjax());
+        self::assertSame(400, $this->responseRendererStub->getHttpResponseCode());
+        self::assertFalse($this->responseRendererStub->hasSuccessState());
+        self::assertSame(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
     }
 
     public function testWithUnsupportedServer(): void
@@ -92,9 +92,9 @@ class AccountLockControllerTest extends AbstractTestCase
         ($this->controller)($this->requestStub);
 
         $message = Message::error('Account locking is not supported.');
-        $this->assertTrue($this->responseRendererStub->isAjax());
-        $this->assertEquals(400, $this->responseRendererStub->getHttpResponseCode());
-        $this->assertFalse($this->responseRendererStub->hasSuccessState());
-        $this->assertEquals(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
+        self::assertTrue($this->responseRendererStub->isAjax());
+        self::assertSame(400, $this->responseRendererStub->getHttpResponseCode());
+        self::assertFalse($this->responseRendererStub->hasSuccessState());
+        self::assertSame(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
     }
 }
diff --git a/test/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php b/test/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php
index 036ac87d0b..db006ea447 100644
--- a/test/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php
+++ b/test/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php
@@ -64,10 +64,10 @@ class AccountUnlockControllerTest extends AbstractTestCase
         ($this->controller)($this->requestStub);
 
         $message = Message::success('The account test.user@test.host has been successfully unlocked.');
-        $this->assertTrue($this->responseRendererStub->isAjax());
-        $this->assertEquals(200, $this->responseRendererStub->getHttpResponseCode());
-        $this->assertTrue($this->responseRendererStub->hasSuccessState());
-        $this->assertEquals(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
+        self::assertTrue($this->responseRendererStub->isAjax());
+        self::assertSame(200, $this->responseRendererStub->getHttpResponseCode());
+        self::assertTrue($this->responseRendererStub->hasSuccessState());
+        self::assertSame(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
     }
 
     public function testWithInvalidAccount(): void
@@ -79,10 +79,10 @@ class AccountUnlockControllerTest extends AbstractTestCase
         ($this->controller)($this->requestStub);
 
         $message = Message::error('Invalid account.');
-        $this->assertTrue($this->responseRendererStub->isAjax());
-        $this->assertEquals(400, $this->responseRendererStub->getHttpResponseCode());
-        $this->assertFalse($this->responseRendererStub->hasSuccessState());
-        $this->assertEquals(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
+        self::assertTrue($this->responseRendererStub->isAjax());
+        self::assertSame(400, $this->responseRendererStub->getHttpResponseCode());
+        self::assertFalse($this->responseRendererStub->hasSuccessState());
+        self::assertSame(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
     }
 
     public function testWithUnsupportedServer(): void
@@ -92,9 +92,9 @@ class AccountUnlockControllerTest extends AbstractTestCase
         ($this->controller)($this->requestStub);
 
         $message = Message::error('Account locking is not supported.');
-        $this->assertTrue($this->responseRendererStub->isAjax());
-        $this->assertEquals(400, $this->responseRendererStub->getHttpResponseCode());
-        $this->assertFalse($this->responseRendererStub->hasSuccessState());
-        $this->assertEquals(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
+        self::assertTrue($this->responseRendererStub->isAjax());
+        self::assertSame(400, $this->responseRendererStub->getHttpResponseCode());
+        self::assertFalse($this->responseRendererStub->hasSuccessState());
+        self::assertSame(['message' => $message->getDisplay()], $this->responseRendererStub->getJSONResult());
     }
 }
diff --git a/test/classes/Controllers/Server/ShowEngineControllerTest.php b/test/classes/Controllers/Server/ShowEngineControllerTest.php
index 2b2d04ce2d..df654841e4 100644
--- a/test/classes/Controllers/Server/ShowEngineControllerTest.php
+++ b/test/classes/Controllers/Server/ShowEngineControllerTest.php
@@ -49,31 +49,16 @@ class ShowEngineControllerTest extends AbstractTestCase
 
         $enginePlugin = StorageEngine::getEngine('Pbxt');
 
-        $this->assertStringContainsString(
-            htmlspecialchars($enginePlugin->getTitle()),
-            $actual
-        );
+        self::assertStringContainsString(htmlspecialchars($enginePlugin->getTitle()), $actual);
 
-        $this->assertStringContainsString(
-            MySQLDocumentation::show($enginePlugin->getMysqlHelpPage()),
-            $actual
-        );
+        self::assertStringContainsString(MySQLDocumentation::show($enginePlugin->getMysqlHelpPage()), $actual);
 
-        $this->assertStringContainsString(
-            htmlspecialchars($enginePlugin->getComment()),
-            $actual
-        );
+        self::assertStringContainsString(htmlspecialchars($enginePlugin->getComment()), $actual);
 
-        $this->assertStringContainsString(
-            __('Variables'),
-            $actual
-        );
-        $this->assertStringContainsString('index.php?route=/server/engines/Pbxt/Documentation', $actual);
-        $this->assertStringContainsString(
-            $enginePlugin->getSupportInformationMessage(),
-            $actual
-        );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(__('Variables'), $actual);
+        self::assertStringContainsString('index.php?route=/server/engines/Pbxt/Documentation', $actual);
+        self::assertStringContainsString($enginePlugin->getSupportInformationMessage(), $actual);
+        self::assertStringContainsString(
             'There is no detailed status information available for this storage engine.',
             $actual
         );
diff --git a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
index 2b4e496be3..17a21a8f58 100644
--- a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
+++ b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
@@ -60,10 +60,7 @@ class AdvisorControllerTest extends AbstractTestCase
             'data' => [],
         ]);
 
-        $this->assertSame(
-            $expected,
-            $this->response->getHTMLResult()
-        );
+        self::assertSame($expected, $this->response->getHTMLResult());
     }
 
     public function testIndexWithData(): void
@@ -102,9 +99,6 @@ class AdvisorControllerTest extends AbstractTestCase
 
         $expected = $this->template->render('server/status/advisor/index', ['data' => $advisorData]);
 
-        $this->assertSame(
-            $expected,
-            $this->response->getHTMLResult()
-        );
+        self::assertSame($expected, $this->response->getHTMLResult());
     }
 }
diff --git a/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
index f1394a3021..65662d16f9 100644
--- a/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
@@ -80,8 +80,8 @@ class GeneralLogControllerTest extends AbstractTestCase
             'argument3' => 11,
         ];
 
-        $this->assertEquals(2, $ret['message']['numRows']);
-        $this->assertEquals($resultRows, $ret['message']['rows']);
-        $this->assertEquals($resultSum, $ret['message']['sum']);
+        self::assertSame(2, $ret['message']['numRows']);
+        self::assertSame($resultRows, $ret['message']['rows']);
+        self::assertEquals($resultSum, $ret['message']['sum']);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
index 13c217d78c..c2573187aa 100644
--- a/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
@@ -63,6 +63,6 @@ class LogVarsControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $ret = $response->getJSONResult();
 
-        $this->assertEquals($value, $ret['message']);
+        self::assertSame($value, $ret['message']);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
index 783a1a2374..22c3bd2506 100644
--- a/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
@@ -70,14 +70,8 @@ class QueryAnalyzerControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $ret = $response->getJSONResult();
 
-        $this->assertEquals('cached_affected_rows', $ret['message']['affectedRows']);
-        $this->assertEquals(
-            [],
-            $ret['message']['profiling']
-        );
-        $this->assertEquals(
-            [$value],
-            $ret['message']['explain']
-        );
+        self::assertSame('cached_affected_rows', $ret['message']['affectedRows']);
+        self::assertSame([], $ret['message']['profiling']);
+        self::assertSame([$value], $ret['message']['explain']);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
index 9ac2380439..7fe3e784aa 100644
--- a/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
@@ -72,8 +72,8 @@ class SlowLogControllerTest extends AbstractTestCase
             'TOTAL' => 21,
             'update' => 10,
         ];
-        $this->assertEquals(2, $ret['message']['numRows']);
-        $this->assertEquals($resultRows, $ret['message']['rows']);
-        $this->assertEquals($resultSum, $ret['message']['sum']);
+        self::assertSame(2, $ret['message']['numRows']);
+        self::assertSame($resultRows, $ret['message']['rows']);
+        self::assertEquals($resultSum, $ret['message']['sum']);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/MonitorControllerTest.php b/test/classes/Controllers/Server/Status/MonitorControllerTest.php
index f6dbf39dd7..0fc90ea64d 100644
--- a/test/classes/Controllers/Server/Status/MonitorControllerTest.php
+++ b/test/classes/Controllers/Server/Status/MonitorControllerTest.php
@@ -53,44 +53,29 @@ class MonitorControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString('<div class="tabLinks row">', $html);
-        $this->assertStringContainsString(
-            __('Start Monitor'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Settings'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Done dragging (rearranging) charts'),
-            $html
-        );
+        self::assertStringContainsString('<div class="tabLinks row">', $html);
+        self::assertStringContainsString(__('Start Monitor'), $html);
+        self::assertStringContainsString(__('Settings'), $html);
+        self::assertStringContainsString(__('Done dragging (rearranging) charts'), $html);
 
-        $this->assertStringContainsString('<div class="popupContent settingsPopup">', $html);
-        $this->assertStringContainsString('<a href="#settingsPopup" class="popupLink">', $html);
-        $this->assertStringContainsString(
-            __('Enable charts dragging'),
-            $html
-        );
-        $this->assertStringContainsString('<option>3</option>', $html);
+        self::assertStringContainsString('<div class="popupContent settingsPopup">', $html);
+        self::assertStringContainsString('<a href="#settingsPopup" class="popupLink">', $html);
+        self::assertStringContainsString(__('Enable charts dragging'), $html);
+        self::assertStringContainsString('<option>3</option>', $html);
 
-        $this->assertStringContainsString(
-            __('Monitor Instructions'),
-            $html
-        );
-        $this->assertStringContainsString('monitorInstructionsDialog', $html);
+        self::assertStringContainsString(__('Monitor Instructions'), $html);
+        self::assertStringContainsString('monitorInstructionsDialog', $html);
 
-        $this->assertStringContainsString('<div class="modal fade" id="addChartModal"', $html);
-        $this->assertStringContainsString('<div id="chartVariableSettings">', $html);
-        $this->assertStringContainsString('<option>Processes</option>', $html);
-        $this->assertStringContainsString('<option>Connections</option>', $html);
+        self::assertStringContainsString('<div class="modal fade" id="addChartModal"', $html);
+        self::assertStringContainsString('<div id="chartVariableSettings">', $html);
+        self::assertStringContainsString('<option>Processes</option>', $html);
+        self::assertStringContainsString('<option>Connections</option>', $html);
 
-        $this->assertStringContainsString('<form id="js_data" class="hide">', $html);
-        $this->assertStringContainsString('<input type="hidden" name="server_time"', $html);
+        self::assertStringContainsString('<form id="js_data" class="hide">', $html);
+        self::assertStringContainsString('<input type="hidden" name="server_time"', $html);
         //validate 2: inputs
-        $this->assertStringContainsString('<input type="hidden" name="is_superuser"', $html);
-        $this->assertStringContainsString('<input type="hidden" name="server_db_isLocal"', $html);
-        $this->assertStringContainsString('<div id="explain_docu" class="hide">', $html);
+        self::assertStringContainsString('<input type="hidden" name="is_superuser"', $html);
+        self::assertStringContainsString('<input type="hidden" name="server_db_isLocal"', $html);
+        self::assertStringContainsString('<div id="explain_docu" class="hide">', $html);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
index f4ac71e9f9..10113aea61 100644
--- a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
@@ -71,47 +71,32 @@ class RefreshControllerTest extends AbstractTestCase
         $controller();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString('index.php?route=/server/status/processes', $html);
+        self::assertStringContainsString('index.php?route=/server/status/processes', $html);
         $killProcess = 'data-post="'
             . Url::getCommon(['kill' => $process['Id']], '') . '"';
-        $this->assertStringContainsString($killProcess, $html);
-        $this->assertStringContainsString('ajax kill_process', $html);
-        $this->assertStringContainsString(
-            __('Kill'),
-            $html
-        );
+        self::assertStringContainsString($killProcess, $html);
+        self::assertStringContainsString('ajax kill_process', $html);
+        self::assertStringContainsString(__('Kill'), $html);
 
         //validate 2: $process['User']
-        $this->assertStringContainsString(
-            htmlspecialchars($process['User']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($process['User']), $html);
 
         //validate 3: $process['Host']
-        $this->assertStringContainsString(
-            htmlspecialchars($process['Host']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($process['Host']), $html);
 
         //validate 4: $process['db']
-        $this->assertStringContainsString(
-            $process['Db'],
-            $html
-        );
+        self::assertStringContainsString($process['Db'], $html);
 
         //validate 5: $process['Command']
-        $this->assertStringContainsString(
-            htmlspecialchars($process['Command']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($process['Command']), $html);
 
         //validate 6: $process['Time']
-        $this->assertStringContainsString($process['Time'], $html);
+        self::assertStringContainsString($process['Time'], $html);
 
         //validate 7: $process['state']
-        $this->assertStringContainsString($process['State'], $html);
+        self::assertStringContainsString($process['State'], $html);
 
         //validate 8: $process['info']
-        $this->assertStringContainsString($process['Info'], $html);
+        self::assertStringContainsString($process['Info'], $html);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
index 2102ba3bce..5d6143d654 100644
--- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
+++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
@@ -53,27 +53,24 @@ class ProcessesControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString(
-            'Note: Enabling the auto refresh here might cause '
-            . 'heavy traffic between the web server and the MySQL server.',
-            $html
-        );
+        self::assertStringContainsString('Note: Enabling the auto refresh here might cause '
+        . 'heavy traffic between the web server and the MySQL server.', $html);
         // Test tab links
-        $this->assertStringContainsString('<div class="tabLinks row">', $html);
-        $this->assertStringContainsString('<a id="toggleRefresh" href="#">', $html);
-        $this->assertStringContainsString('play', $html);
-        $this->assertStringContainsString('Start auto refresh', $html);
-        $this->assertStringContainsString('<select id="id_refreshRate"', $html);
-        $this->assertStringContainsString('<option value="5" selected>', $html);
-        $this->assertStringContainsString('5 seconds', $html);
+        self::assertStringContainsString('<div class="tabLinks row">', $html);
+        self::assertStringContainsString('<a id="toggleRefresh" href="#">', $html);
+        self::assertStringContainsString('play', $html);
+        self::assertStringContainsString('Start auto refresh', $html);
+        self::assertStringContainsString('<select id="id_refreshRate"', $html);
+        self::assertStringContainsString('<option value="5" selected>', $html);
+        self::assertStringContainsString('5 seconds', $html);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table id="tableprocesslist" class="table table-striped table-hover sortable w-auto">',
             $html
         );
-        $this->assertStringContainsString('<th>Processes</th>', $html);
-        $this->assertStringContainsString('Show full queries', $html);
-        $this->assertStringContainsString('index.php?route=/server/status/processes', $html);
+        self::assertStringContainsString('<th>Processes</th>', $html);
+        self::assertStringContainsString('Show full queries', $html);
+        self::assertStringContainsString('index.php?route=/server/status/processes', $html);
 
         $_POST['full'] = '1';
         $_POST['column_name'] = 'Database';
@@ -85,9 +82,9 @@ class ProcessesControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString('Truncate shown queries', $html);
-        $this->assertStringContainsString('Database', $html);
-        $this->assertStringContainsString('DESC', $html);
+        self::assertStringContainsString('Truncate shown queries', $html);
+        self::assertStringContainsString('Database', $html);
+        self::assertStringContainsString('DESC', $html);
 
         $_POST['column_name'] = 'Host';
         $_POST['order_by_field'] = 'Host';
@@ -98,7 +95,7 @@ class ProcessesControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString('Host', $html);
-        $this->assertStringContainsString('ASC', $html);
+        self::assertStringContainsString('Host', $html);
+        self::assertStringContainsString('ASC', $html);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/QueriesControllerTest.php b/test/classes/Controllers/Server/Status/QueriesControllerTest.php
index 2856d27278..36d37a2cee 100644
--- a/test/classes/Controllers/Server/Status/QueriesControllerTest.php
+++ b/test/classes/Controllers/Server/Status/QueriesControllerTest.php
@@ -69,60 +69,27 @@ class QueriesControllerTest extends AbstractTestCase
         $questionsFromStart = __('Questions since startup:')
             . '    ' . Util::formatNumber($totalQueries, 0);
 
-        $this->assertStringContainsString('<h3 id="serverstatusqueries">', $html);
-        $this->assertStringContainsString($questionsFromStart, $html);
+        self::assertStringContainsString('<h3 id="serverstatusqueries">', $html);
+        self::assertStringContainsString($questionsFromStart, $html);
 
-        $this->assertStringContainsString(
-            __('per hour:'),
-            $html
-        );
-        $this->assertStringContainsString(
-            Util::formatNumber($totalQueries * $hourFactor, 0),
-            $html
-        );
+        self::assertStringContainsString(__('per hour:'), $html);
+        self::assertStringContainsString(Util::formatNumber($totalQueries * $hourFactor, 0), $html);
 
         $valuePerMinute = Util::formatNumber($totalQueries * 60 / $this->data->status['Uptime'], 0);
-        $this->assertStringContainsString(
-            __('per minute:'),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($valuePerMinute),
-            $html
-        );
+        self::assertStringContainsString(__('per minute:'), $html);
+        self::assertStringContainsString(htmlspecialchars($valuePerMinute), $html);
 
-        $this->assertStringContainsString(
-            __('Statements'),
-            $html
-        );
+        self::assertStringContainsString(__('Statements'), $html);
 
-        $this->assertStringContainsString(
-            htmlspecialchars('change db'),
-            $html
-        );
-        $this->assertStringContainsString('54', $html);
-        $this->assertStringContainsString(
-            htmlspecialchars('select'),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars('set option'),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars('show databases'),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars('show status'),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars('show tables'),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars('change db'), $html);
+        self::assertStringContainsString('54', $html);
+        self::assertStringContainsString(htmlspecialchars('select'), $html);
+        self::assertStringContainsString(htmlspecialchars('set option'), $html);
+        self::assertStringContainsString(htmlspecialchars('show databases'), $html);
+        self::assertStringContainsString(htmlspecialchars('show status'), $html);
+        self::assertStringContainsString(htmlspecialchars('show tables'), $html);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<div id="serverstatusquerieschart" class="w-100 col-12 col-md-6" data-chart="',
             $html
         );
diff --git a/test/classes/Controllers/Server/Status/StatusControllerTest.php b/test/classes/Controllers/Server/Status/StatusControllerTest.php
index 07812a4c75..a4b8878c54 100644
--- a/test/classes/Controllers/Server/Status/StatusControllerTest.php
+++ b/test/classes/Controllers/Server/Status/StatusControllerTest.php
@@ -70,38 +70,38 @@ class StatusControllerTest extends AbstractTestCase
 
         $traffic = $bytesReceived + $bytesSent;
         $trafficHtml = 'Network traffic since startup: ' . $traffic . ' B';
-        $this->assertStringContainsString($trafficHtml, $html);
+        self::assertStringContainsString($trafficHtml, $html);
         //updatetime
         $upTimeHtml = 'This MySQL server has been running for 0 days, 10 hours, 0 minutes and 0 seconds';
-        $this->assertStringContainsString($upTimeHtml, $html);
+        self::assertStringContainsString($upTimeHtml, $html);
         //primary state
         $primaryHtml = 'This MySQL server works as <b>primary</b>';
-        $this->assertStringContainsString($primaryHtml, $html);
+        self::assertStringContainsString($primaryHtml, $html);
 
         //validate 2: Status::getHtmlForServerStateTraffic
         $trafficHtml = '<table class="table table-striped table-hover col-12 col-md-5 w-auto">';
-        $this->assertStringContainsString($trafficHtml, $html);
+        self::assertStringContainsString($trafficHtml, $html);
         //traffic hint
         $trafficHtml = 'On a busy server, the byte counters may overrun';
-        $this->assertStringContainsString($trafficHtml, $html);
+        self::assertStringContainsString($trafficHtml, $html);
         //$bytes_received
-        $this->assertStringContainsString('<td class="font-monospace text-end">' . $bytesReceived . ' B', $html);
+        self::assertStringContainsString('<td class="font-monospace text-end">' . $bytesReceived . ' B', $html);
         //$bytes_sent
-        $this->assertStringContainsString('<td class="font-monospace text-end">' . $bytesSent . ' B', $html);
+        self::assertStringContainsString('<td class="font-monospace text-end">' . $bytesSent . ' B', $html);
 
         //validate 3: Status::getHtmlForServerStateConnections
-        $this->assertStringContainsString('<th scope="col">Connections</th>', $html);
-        $this->assertStringContainsString('<th class="text-end" scope="col">ø per hour</th>', $html);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('<th scope="col">Connections</th>', $html);
+        self::assertStringContainsString('<th class="text-end" scope="col">ø per hour</th>', $html);
+        self::assertStringContainsString(
             '<table class="table table-striped table-hover col-12 col-md-6 w-auto">',
             $html
         );
-        $this->assertStringContainsString('<th>Max. concurrent connections</th>', $html);
+        self::assertStringContainsString('<th>Max. concurrent connections</th>', $html);
         //Max_used_connections
-        $this->assertStringContainsString('<td class="font-monospace text-end">' . $maxUsedConnections, $html);
-        $this->assertStringContainsString('<th>Failed attempts</th>', $html);
+        self::assertStringContainsString('<td class="font-monospace text-end">' . $maxUsedConnections, $html);
+        self::assertStringContainsString('<th>Failed attempts</th>', $html);
         //Aborted_connects
-        $this->assertStringContainsString('<td class="font-monospace text-end">' . $abortedConnections, $html);
-        $this->assertStringContainsString('<th>Aborted</th>', $html);
+        self::assertStringContainsString('<td class="font-monospace text-end">' . $abortedConnections, $html);
+        self::assertStringContainsString('<th>Aborted</th>', $html);
     }
 }
diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php
index 3c6a9271f6..36d6040a0b 100644
--- a/test/classes/Controllers/Server/Status/VariablesControllerTest.php
+++ b/test/classes/Controllers/Server/Status/VariablesControllerTest.php
@@ -46,38 +46,38 @@ class VariablesControllerTest extends AbstractTestCase
         $this->assertAllSelectsConsumed();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString('<div class="card mb-3" id="tableFilter">', $html);
-        $this->assertStringContainsString('index.php?route=/server/status/variables', $html);
+        self::assertStringContainsString('<div class="card mb-3" id="tableFilter">', $html);
+        self::assertStringContainsString('index.php?route=/server/status/variables', $html);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<label class="col-12 col-form-label" for="filterText">Containing the word:</label>',
             $html
         );
 
-        $this->assertStringContainsString('<label class="form-check-label" for="filterAlert">', $html);
-        $this->assertStringContainsString('Show only alert values', $html);
-        $this->assertStringContainsString('Filter by category', $html);
-        $this->assertStringContainsString('Show unformatted values', $html);
+        self::assertStringContainsString('<label class="form-check-label" for="filterAlert">', $html);
+        self::assertStringContainsString('Show only alert values', $html);
+        self::assertStringContainsString('Filter by category', $html);
+        self::assertStringContainsString('Show unformatted values', $html);
 
-        $this->assertStringContainsString('<div id="linkSuggestions" class="defaultLinks hide"', $html);
+        self::assertStringContainsString('<div id="linkSuggestions" class="defaultLinks hide"', $html);
 
-        $this->assertStringContainsString('Related links:', $html);
-        $this->assertStringContainsString('Flush (close) all tables', $html);
-        $this->assertStringContainsString('<span class="status_binlog_cache">', $html);
+        self::assertStringContainsString('Related links:', $html);
+        self::assertStringContainsString('Flush (close) all tables', $html);
+        self::assertStringContainsString('<span class="status_binlog_cache">', $html);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table class="table table-striped table-hover table-sm" id="serverStatusVariables">',
             $html
         );
-        $this->assertStringContainsString('<th scope="col">Variable</th>', $html);
-        $this->assertStringContainsString('<th scope="col">Value</th>', $html);
-        $this->assertStringContainsString('<th scope="col">Description</th>', $html);
+        self::assertStringContainsString('<th scope="col">Variable</th>', $html);
+        self::assertStringContainsString('<th scope="col">Value</th>', $html);
+        self::assertStringContainsString('<th scope="col">Description</th>', $html);
 
-        $this->assertStringContainsString('Aborted clients', $html);
-        $this->assertStringContainsString('<span class="text-success">', $html);
-        $this->assertStringContainsString('Aborted connects', $html);
-        $this->assertStringContainsString('Com delete multi', $html);
-        $this->assertStringContainsString('Com create function', $html);
-        $this->assertStringContainsString('Com empty query', $html);
+        self::assertStringContainsString('Aborted clients', $html);
+        self::assertStringContainsString('<span class="text-success">', $html);
+        self::assertStringContainsString('Aborted connects', $html);
+        self::assertStringContainsString('Com delete multi', $html);
+        self::assertStringContainsString('Com create function', $html);
+        self::assertStringContainsString('Com empty query', $html);
     }
 }
diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php
index 0347eb3da7..565ddd17ee 100644
--- a/test/classes/Controllers/Server/VariablesControllerTest.php
+++ b/test/classes/Controllers/Server/VariablesControllerTest.php
@@ -99,34 +99,19 @@ class VariablesControllerTest extends AbstractTestCase
         $controller();
         $html = $response->getHTMLResult();
 
-        $this->assertStringContainsString(
-            Generator::getIcon('b_save', __('Save')),
-            $html
-        );
-        $this->assertStringContainsString(
-            Generator::getIcon('b_close', __('Cancel')),
-            $html
-        );
-        $this->assertStringContainsString('<div class="card-header">' . __('Filters') . '</div>', $html);
-        $this->assertStringContainsString(
-            __('Containing the word:'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Variable'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Value'),
-            $html
-        );
+        self::assertStringContainsString(Generator::getIcon('b_save', __('Save')), $html);
+        self::assertStringContainsString(Generator::getIcon('b_close', __('Cancel')), $html);
+        self::assertStringContainsString('<div class="card-header">' . __('Filters') . '</div>', $html);
+        self::assertStringContainsString(__('Containing the word:'), $html);
+        self::assertStringContainsString(__('Variable'), $html);
+        self::assertStringContainsString(__('Value'), $html);
 
         $name = 'auto_increment_increment';
         $value = htmlspecialchars(str_replace('_', ' ', $name));
-        $this->assertStringContainsString($value, $html);
+        self::assertStringContainsString($value, $html);
         $name = 'auto_increment_offset';
         $value = htmlspecialchars(str_replace('_', ' ', $name));
-        $this->assertStringContainsString($value, $html);
+        self::assertStringContainsString($value, $html);
     }
 
     /**
@@ -162,8 +147,8 @@ class VariablesControllerTest extends AbstractTestCase
             $args
         );
 
-        $this->assertEquals('<abbr title="3">3 B</abbr>', $formattedValue);
-        $this->assertTrue($isHtmlFormatted);
+        self::assertSame('<abbr title="3">3 B</abbr>', $formattedValue);
+        self::assertTrue($isHtmlFormatted);
 
         //name is_numeric and the value type is not byte
         $args = [
@@ -176,8 +161,8 @@ class VariablesControllerTest extends AbstractTestCase
             'formatVariable',
             $args
         );
-        $this->assertEquals('3', $formattedValue);
-        $this->assertFalse($isHtmlFormatted);
+        self::assertSame('3', $formattedValue);
+        self::assertFalse($isHtmlFormatted);
 
         //value is not a number
         $args = [
@@ -190,8 +175,8 @@ class VariablesControllerTest extends AbstractTestCase
             'formatVariable',
             $args
         );
-        $this->assertEquals('value', $formattedValue);
-        $this->assertFalse($isHtmlFormatted);
+        self::assertSame('value', $formattedValue);
+        self::assertFalse($isHtmlFormatted);
     }
 
     /**
@@ -225,8 +210,8 @@ class VariablesControllerTest extends AbstractTestCase
             $args
         );
 
-        $this->assertEquals('<abbr title="3">3 B</abbr>', $formattedValue);
-        $this->assertTrue($isHtmlFormatted);
+        self::assertSame('<abbr title="3">3 B</abbr>', $formattedValue);
+        self::assertTrue($isHtmlFormatted);
 
         //name is_numeric and the value type is not byte
         $args = [
@@ -239,8 +224,8 @@ class VariablesControllerTest extends AbstractTestCase
             'formatVariable',
             $args
         );
-        $this->assertEquals('3', $formattedValue);
-        $this->assertFalse($isHtmlFormatted);
+        self::assertSame('3', $formattedValue);
+        self::assertFalse($isHtmlFormatted);
 
         //value is not a number
         $args = [
@@ -253,8 +238,8 @@ class VariablesControllerTest extends AbstractTestCase
             'formatVariable',
             $args
         );
-        $this->assertEquals('value', $formattedValue);
-        $this->assertFalse($isHtmlFormatted);
+        self::assertSame('value', $formattedValue);
+        self::assertFalse($isHtmlFormatted);
     }
 
     /**
@@ -283,7 +268,7 @@ class VariablesControllerTest extends AbstractTestCase
             $args
         );
 
-        $this->assertEquals('3', $formattedValue);
-        $this->assertFalse($isHtmlFormatted);
+        self::assertSame('3', $formattedValue);
+        self::assertFalse($isHtmlFormatted);
     }
 }
diff --git a/test/classes/Controllers/Sql/EnumValuesControllerTest.php b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
index 57a373e838..fe38c7d9a0 100644
--- a/test/classes/Controllers/Sql/EnumValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
@@ -48,10 +48,7 @@ class EnumValuesControllerTest extends AbstractTestCase
 
         $this->assertResponseWasNotSuccessfull();
 
-        $this->assertSame(
-            ['message' => 'Error in processing request'],
-            $this->getResponseJsonResult()
-        );
+        self::assertSame(['message' => 'Error in processing request'], $this->getResponseJsonResult());
     }
 
     public function testGetEnumValuesSuccess(): void
@@ -98,22 +95,19 @@ class EnumValuesControllerTest extends AbstractTestCase
 
         $this->assertResponseWasSuccessfull();
 
-        $this->assertSame(
-            [
-                'dropdown' => '<select>' . "\n"
-                    . '      <option value="&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;">'
-                    . '&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;</option>' . "\n"
-                    . '      <option value="a&amp;b">a&amp;b</option>' . "\n"
-                    . '      <option value="b&amp;c" selected>b&amp;c</option>' . "\n"
-                    . '      <option value="vrai&amp;amp">vrai&amp;amp</option>' . "\n"
-                    . '      <option value=""></option>' . "\n"
-                    . '      <option value="漢字">漢字</option>' . "\n"
-                    . '      <option value="&#039;">&#039;</option>' . "\n"
-                    . '      <option value="\">\</option>' . "\n"
-                    . '      <option value="&quot;\&#039;">&quot;\&#039;</option>' . "\n"
-                    . '  </select>' . "\n",
-            ],
-            $this->getResponseJsonResult()
-        );
+        self::assertSame([
+            'dropdown' => '<select>' . "\n"
+                . '      <option value="&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;">'
+                . '&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;</option>' . "\n"
+                . '      <option value="a&amp;b">a&amp;b</option>' . "\n"
+                . '      <option value="b&amp;c" selected>b&amp;c</option>' . "\n"
+                . '      <option value="vrai&amp;amp">vrai&amp;amp</option>' . "\n"
+                . '      <option value=""></option>' . "\n"
+                . '      <option value="漢字">漢字</option>' . "\n"
+                . '      <option value="&#039;">&#039;</option>' . "\n"
+                . '      <option value="\">\</option>' . "\n"
+                . '      <option value="&quot;\&#039;">&quot;\&#039;</option>' . "\n"
+                . '  </select>' . "\n",
+        ], $this->getResponseJsonResult());
     }
 }
diff --git a/test/classes/Controllers/Sql/SetValuesControllerTest.php b/test/classes/Controllers/Sql/SetValuesControllerTest.php
index 7c7570209b..7f528e9d14 100644
--- a/test/classes/Controllers/Sql/SetValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/SetValuesControllerTest.php
@@ -48,10 +48,7 @@ class SetValuesControllerTest extends AbstractTestCase
 
         $this->assertResponseWasNotSuccessfull();
 
-        $this->assertSame(
-            ['message' => 'Error in processing request'],
-            $this->getResponseJsonResult()
-        );
+        self::assertSame(['message' => 'Error in processing request'], $this->getResponseJsonResult());
     }
 
     public function testSuccess(): void
@@ -98,18 +95,15 @@ class SetValuesControllerTest extends AbstractTestCase
 
         $this->assertResponseWasSuccessfull();
 
-        $this->assertSame(
-            [
-                'select' => '<select class="resize-vertical" size="5" multiple>' . "\n"
-                    . '      <option value="&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;">'
-                    . '&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;</option>' . "\n"
-                    . '      <option value="a&amp;b">a&amp;b</option>' . "\n"
-                    . '      <option value="b&amp;c" selected>b&amp;c</option>' . "\n"
-                    . '      <option value="vrai&amp;amp">vrai&amp;amp</option>' . "\n"
-                    . '      <option value=""></option>' . "\n"
-                    . '  </select>' . "\n",
-            ],
-            $this->getResponseJsonResult()
-        );
+        self::assertSame([
+            'select' => '<select class="resize-vertical" size="5" multiple>' . "\n"
+                . '      <option value="&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;">'
+                . '&lt;script&gt;alert(&quot;ok&quot;)&lt;/script&gt;</option>' . "\n"
+                . '      <option value="a&amp;b">a&amp;b</option>' . "\n"
+                . '      <option value="b&amp;c" selected>b&amp;c</option>' . "\n"
+                . '      <option value="vrai&amp;amp">vrai&amp;amp</option>' . "\n"
+                . '      <option value=""></option>' . "\n"
+                . '  </select>' . "\n",
+        ], $this->getResponseJsonResult());
     }
 }
diff --git a/test/classes/Controllers/Table/FindReplaceControllerTest.php b/test/classes/Controllers/Table/FindReplaceControllerTest.php
index 8f9ff0bc47..b1de32d569 100644
--- a/test/classes/Controllers/Table/FindReplaceControllerTest.php
+++ b/test/classes/Controllers/Table/FindReplaceControllerTest.php
@@ -90,7 +90,7 @@ class FindReplaceControllerTest extends AbstractTestCase
         $result = 'UPDATE `table` SET `Field1` = '
             . "REPLACE(`Field1`, 'Field', 'Column') "
             . "WHERE `Field1` LIKE '%Field%' COLLATE UTF-8_bin";
-        $this->assertEquals($result, $sql_query);
+        self::assertSame($result, $sql_query);
     }
 
     public function testReplaceWithRegex(): void
@@ -116,6 +116,6 @@ class FindReplaceControllerTest extends AbstractTestCase
         $result = 'UPDATE `table` SET `Field1` = `Field1`'
             . " WHERE `Field1` RLIKE 'Field' COLLATE UTF-8_bin";
 
-        $this->assertEquals($result, $sql_query);
+        self::assertSame($result, $sql_query);
     }
 }
diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
index 8cd1da9ffa..74cac49b7e 100644
--- a/test/classes/Controllers/Table/IndexesControllerTest.php
+++ b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -119,16 +119,13 @@ class IndexesControllerTest extends AbstractTestCase
         $html = $response->getHTMLResult();
 
         //Url::getHiddenInputs
-        $this->assertStringContainsString(
-            Url::getHiddenInputs(
-                [
-                    'db' => 'db',
-                    'table' => 'table',
-                    'create_index' => 1,
-                ]
-            ),
-            $html
-        );
+        self::assertStringContainsString(Url::getHiddenInputs(
+            [
+                'db' => 'db',
+                'table' => 'table',
+                'create_index' => 1,
+            ]
+        ), $html);
 
         $doc_html = Generator::showHint(
             Message::notice(
@@ -137,20 +134,14 @@ class IndexesControllerTest extends AbstractTestCase
                 )
             )->getMessage()
         );
-        $this->assertStringContainsString($doc_html, $html);
+        self::assertStringContainsString($doc_html, $html);
 
-        $this->assertStringContainsString(
-            MySQLDocumentation::show('ALTER_TABLE'),
-            $html
-        );
+        self::assertStringContainsString(MySQLDocumentation::show('ALTER_TABLE'), $html);
 
-        $this->assertStringContainsString(
-            sprintf(__('Add %s column(s) to index'), 1),
-            $html
-        );
+        self::assertStringContainsString(sprintf(__('Add %s column(s) to index'), 1), $html);
 
         //$field_name & $field_type
-        $this->assertStringContainsString('field_name', $html);
-        $this->assertStringContainsString('field_type', $html);
+        self::assertStringContainsString('field_name', $html);
+        self::assertStringContainsString('field_type', $html);
     }
 }
diff --git a/test/classes/Controllers/Table/OperationsControllerTest.php b/test/classes/Controllers/Table/OperationsControllerTest.php
index 2116a642ec..4acc0ae917 100644
--- a/test/classes/Controllers/Table/OperationsControllerTest.php
+++ b/test/classes/Controllers/Table/OperationsControllerTest.php
@@ -106,6 +106,6 @@ class OperationsControllerTest extends AbstractTestCase
         $controller = $containerBuilder->get(OperationsController::class);
         $controller();
 
-        $this->assertEquals($expectedOutput, $this->getResponseHtmlResult());
+        self::assertSame($expectedOutput, $this->getResponseHtmlResult());
     }
 }
diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php
index 7ca7df94d3..793d59d3bd 100644
--- a/test/classes/Controllers/Table/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Table/PrivilegesControllerTest.php
@@ -54,56 +54,29 @@ class PrivilegesControllerTest extends AbstractTestCase
             $dbi
         ))(['checkprivsdb' => $db, 'checkprivstable' => $table]);
 
-        $this->assertStringContainsString($db . '.' . $table, $actual);
+        self::assertStringContainsString($db . '.' . $table, $actual);
 
         //validate 2: Url::getCommon
         $item = Url::getCommon([
             'db' => $db,
             'table' => $table,
         ], '');
-        $this->assertStringContainsString($item, $actual);
+        self::assertStringContainsString($item, $actual);
 
         //validate 3: items
-        $this->assertStringContainsString(
-            __('User'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Host'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Type'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Privileges'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Grant'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('Action'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            __('No user found'),
-            $actual
-        );
+        self::assertStringContainsString(__('User'), $actual);
+        self::assertStringContainsString(__('Host'), $actual);
+        self::assertStringContainsString(__('Type'), $actual);
+        self::assertStringContainsString(__('Privileges'), $actual);
+        self::assertStringContainsString(__('Grant'), $actual);
+        self::assertStringContainsString(__('Action'), $actual);
+        self::assertStringContainsString(__('No user found'), $actual);
 
         //_pgettext('Create new user', 'New')
-        $this->assertStringContainsString(
-            _pgettext('Create new user', 'New'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            Url::getCommon([
-                'checkprivsdb' => $db,
-                'checkprivstable' => $table,
-            ]),
-            $actual
-        );
+        self::assertStringContainsString(_pgettext('Create new user', 'New'), $actual);
+        self::assertStringContainsString(Url::getCommon([
+            'checkprivsdb' => $db,
+            'checkprivstable' => $table,
+        ]), $actual);
     }
 }
diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php
index f7e217e0ea..99fe1368be 100644
--- a/test/classes/Controllers/Table/RelationControllerTest.php
+++ b/test/classes/Controllers/Table/RelationControllerTest.php
@@ -103,7 +103,7 @@ class RelationControllerTest extends AbstractTestCase
 
         $ctrl->getDropdownValueForTable();
         $json = $this->response->getJSONResult();
-        $this->assertEquals($viewColumns, $json['columns']);
+        self::assertSame($viewColumns, $json['columns']);
     }
 
     /**
@@ -138,7 +138,7 @@ class RelationControllerTest extends AbstractTestCase
 
         $ctrl->getDropdownValueForTable();
         $json = $this->response->getJSONResult();
-        $this->assertEquals($indexedColumns, $json['columns']);
+        self::assertSame($indexedColumns, $json['columns']);
     }
 
     /**
@@ -177,10 +177,7 @@ class RelationControllerTest extends AbstractTestCase
         $_POST['foreign'] = 'true';
         $ctrl->getDropdownValueForDatabase('INNODB');
         $json = $this->response->getJSONResult();
-        $this->assertEquals(
-            ['table'],
-            $json['tables']
-        );
+        self::assertSame(['table'], $json['tables']);
     }
 
     /**
@@ -212,9 +209,6 @@ class RelationControllerTest extends AbstractTestCase
         $_POST['foreign'] = 'false';
         $ctrl->getDropdownValueForDatabase('INNODB');
         $json = $this->response->getJSONResult();
-        $this->assertEquals(
-            ['table'],
-            $json['tables']
-        );
+        self::assertSame(['table'], $json['tables']);
     }
 }
diff --git a/test/classes/Controllers/Table/ReplaceControllerTest.php b/test/classes/Controllers/Table/ReplaceControllerTest.php
index fac53e765f..98a1824977 100644
--- a/test/classes/Controllers/Table/ReplaceControllerTest.php
+++ b/test/classes/Controllers/Table/ReplaceControllerTest.php
@@ -97,14 +97,11 @@ class ReplaceControllerTest extends AbstractTestCase
         $this->dummyDbi->addSelectDb('my_db');
         $replaceController();
         $this->assertAllSelectsConsumed();
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'class="icon ic_s_success"> Showing rows 0 -  1 (2 total, Query took',
             $this->getResponseHtmlResult()
         );
-        $this->assertStringContainsString(
-            'SELECT * FROM `test_tbl`',
-            $this->getResponseHtmlResult()
-        );
+        self::assertStringContainsString('SELECT * FROM `test_tbl`', $this->getResponseHtmlResult());
     }
 
     public function testIsInsertRow(): void
@@ -139,16 +136,10 @@ class ReplaceControllerTest extends AbstractTestCase
         $this->dummyDbi->addSelectDb('my_db');
         $replaceController();
         $this->assertAllSelectsConsumed();
-        $this->assertEquals(5, $GLOBALS['cfg']['InsertRows']);
-        $this->assertStringContainsString(
-            '<form id="continueForm" method="post" '
-            . 'action="index.php?route=/table/replace&lang=en" name="continueForm">',
-            $this->getResponseHtmlResult()
-        );
-        $this->assertStringContainsString(
-            'Continue insertion with         <input type="number" '
-            . 'name="insert_rows" id="insert_rows" value="5" min="1">',
-            $this->getResponseHtmlResult()
-        );
+        self::assertSame(5, $GLOBALS['cfg']['InsertRows']);
+        self::assertStringContainsString('<form id="continueForm" method="post" '
+        . 'action="index.php?route=/table/replace&lang=en" name="continueForm">', $this->getResponseHtmlResult());
+        self::assertStringContainsString('Continue insertion with         <input type="number" '
+        . 'name="insert_rows" id="insert_rows" value="5" min="1">', $this->getResponseHtmlResult());
     }
 }
diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php
index 64306193ff..b270bb559e 100644
--- a/test/classes/Controllers/Table/SearchControllerTest.php
+++ b/test/classes/Controllers/Table/SearchControllerTest.php
@@ -119,7 +119,7 @@ class SearchControllerTest extends AbstractTestCase
         );
 
         $result = $ctrl->getColumnMinMax('column');
-        $this->assertEquals([$expected], $result);
+        self::assertSame([$expected], $result);
     }
 
     /**
@@ -180,6 +180,6 @@ class SearchControllerTest extends AbstractTestCase
         $ctrl->getDataRowAction();
 
         $json = $this->getResponseJsonResult();
-        $this->assertEquals($expected, $json['row_info']);
+        self::assertSame($expected, $json['row_info']);
     }
 }
diff --git a/test/classes/Controllers/Table/Structure/ChangeControllerTest.php b/test/classes/Controllers/Table/Structure/ChangeControllerTest.php
index a395226662..4d435a7f3a 100644
--- a/test/classes/Controllers/Table/Structure/ChangeControllerTest.php
+++ b/test/classes/Controllers/Table/Structure/ChangeControllerTest.php
@@ -45,17 +45,14 @@ class ChangeControllerTest extends AbstractTestCase
 
         $method->invokeArgs($ctrl, [null]);
         $actual = $response->getHTMLResult();
-        $this->assertStringContainsString(
-            '<input id="field_0_1"' . "\n"
-            . '        type="text"' . "\n"
-            . '    name="field_name[0]"' . "\n"
-            . '    maxlength="64"' . "\n"
-            . '    class="textfield"' . "\n"
-            . '    title="Column"' . "\n"
-            . '    size="10"' . "\n"
-            . '    value="_id">' . "\n",
-            $actual
-        );
-        $this->assertStringContainsString('id="enumEditorModal"', $actual);
+        self::assertStringContainsString('<input id="field_0_1"' . "\n"
+        . '        type="text"' . "\n"
+        . '    name="field_name[0]"' . "\n"
+        . '    maxlength="64"' . "\n"
+        . '    class="textfield"' . "\n"
+        . '    title="Column"' . "\n"
+        . '    size="10"' . "\n"
+        . '    value="_id">' . "\n", $actual);
+        self::assertStringContainsString('id="enumEditorModal"', $actual);
     }
 }
diff --git a/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php b/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
index 0d393d7daa..4cab536d7a 100644
--- a/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
+++ b/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
@@ -41,7 +41,7 @@ class MoveColumnsControllerTest extends AbstractTestCase
 
         $expected = $expected === null ? null : preg_replace('/\r?\n/', "\n", $expected);
         $alterStatement = $alterStatement === null ? null : preg_replace('/\r?\n/', "\n", $alterStatement);
-        $this->assertSame($expected, $alterStatement);
+        self::assertSame($expected, $alterStatement);
     }
 
     /**
diff --git a/test/classes/Controllers/Table/Structure/SaveControllerTest.php b/test/classes/Controllers/Table/Structure/SaveControllerTest.php
index 534a68d460..8d3752feee 100644
--- a/test/classes/Controllers/Table/Structure/SaveControllerTest.php
+++ b/test/classes/Controllers/Table/Structure/SaveControllerTest.php
@@ -41,8 +41,6 @@ class SaveControllerTest extends AbstractTestCase
             $this->createStub(StructureController::class)
         );
 
-        $this->assertFalse(
-            $method->invokeArgs($ctrl, [[]])
-        );
+        self::assertFalse($method->invokeArgs($ctrl, [[]]));
     }
 }
diff --git a/test/classes/Controllers/Transformation/OverviewControllerTest.php b/test/classes/Controllers/Transformation/OverviewControllerTest.php
index d54c44b40d..3431dbb047 100644
--- a/test/classes/Controllers/Transformation/OverviewControllerTest.php
+++ b/test/classes/Controllers/Transformation/OverviewControllerTest.php
@@ -42,22 +42,16 @@ class OverviewControllerTest extends AbstractTestCase
         $controller();
         $actual = $response->getHTMLResult();
 
-        $this->assertStringContainsString(
-            __('Available media types'),
-            $actual
-        );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(__('Available media types'), $actual);
+        self::assertStringContainsString(
             'id="transformation">' . __('Available browser display transformations'),
             $actual
         );
-        $this->assertStringContainsString(
-            'id="input_transformation">' . __('Available input transformations'),
-            $actual
-        );
-        $this->assertStringContainsString('Text/Plain', $actual);
-        $this->assertStringContainsString('Image/JPEG: Inline', $actual);
-        $this->assertStringContainsString('Displays a clickable thumbnail.', $actual);
-        $this->assertStringContainsString('Image/JPEG: Upload', $actual);
-        $this->assertStringContainsString('Image upload functionality which also displays a thumbnail.', $actual);
+        self::assertStringContainsString('id="input_transformation">' . __('Available input transformations'), $actual);
+        self::assertStringContainsString('Text/Plain', $actual);
+        self::assertStringContainsString('Image/JPEG: Inline', $actual);
+        self::assertStringContainsString('Displays a clickable thumbnail.', $actual);
+        self::assertStringContainsString('Image/JPEG: Upload', $actual);
+        self::assertStringContainsString('Image upload functionality which also displays a thumbnail.', $actual);
     }
 }
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index e58b3b6726..505f99ae3d 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -76,75 +76,33 @@ class CoreTest extends AbstractNetworkTestCase
             ],
         ];
 
-        $this->assertEquals(
-            Core::arrayRead('int', $arr),
-            $arr['int']
-        );
+        self::assertSame(Core::arrayRead('int', $arr), $arr['int']);
 
-        $this->assertEquals(
-            Core::arrayRead('str', $arr),
-            $arr['str']
-        );
+        self::assertSame(Core::arrayRead('str', $arr), $arr['str']);
 
-        $this->assertEquals(
-            Core::arrayRead('arr/0', $arr),
-            $arr['arr'][0]
-        );
+        self::assertSame(Core::arrayRead('arr/0', $arr), $arr['arr'][0]);
 
-        $this->assertEquals(
-            Core::arrayRead('arr/1', $arr),
-            $arr['arr'][1]
-        );
+        self::assertSame(Core::arrayRead('arr/1', $arr), $arr['arr'][1]);
 
-        $this->assertEquals(
-            Core::arrayRead('arr/2', $arr),
-            $arr['arr'][2]
-        );
+        self::assertSame(Core::arrayRead('arr/2', $arr), $arr['arr'][2]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/arr1/0', $arr),
-            $arr['sarr']['arr1'][0]
-        );
+        self::assertSame(Core::arrayRead('sarr/arr1/0', $arr), $arr['sarr']['arr1'][0]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/arr1/1', $arr),
-            $arr['sarr']['arr1'][1]
-        );
+        self::assertSame(Core::arrayRead('sarr/arr1/1', $arr), $arr['sarr']['arr1'][1]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/arr1/2', $arr),
-            $arr['sarr']['arr1'][2]
-        );
+        self::assertSame(Core::arrayRead('sarr/arr1/2', $arr), $arr['sarr']['arr1'][2]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/0/0', $arr),
-            $arr['sarr'][0][0]
-        );
+        self::assertSame(Core::arrayRead('sarr/0/0', $arr), $arr['sarr'][0][0]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/0/1', $arr),
-            $arr['sarr'][0][1]
-        );
+        self::assertSame(Core::arrayRead('sarr/0/1', $arr), $arr['sarr'][0][1]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/0/1/2', $arr),
-            $arr['sarr'][0][1][2]
-        );
+        self::assertSame(Core::arrayRead('sarr/0/1/2', $arr), $arr['sarr'][0][1][2]);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/not_exiting/1', $arr),
-            null
-        );
+        self::assertSame(Core::arrayRead('sarr/not_exiting/1', $arr), null);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/not_exiting/1', $arr, 0),
-            0
-        );
+        self::assertSame(Core::arrayRead('sarr/not_exiting/1', $arr, 0), 0);
 
-        $this->assertEquals(
-            Core::arrayRead('sarr/not_exiting/1', $arr, 'default_val'),
-            'default_val'
-        );
+        self::assertSame(Core::arrayRead('sarr/not_exiting/1', $arr, 'default_val'), 'default_val');
     }
 
     /**
@@ -179,40 +137,40 @@ class CoreTest extends AbstractNetworkTestCase
         ];
 
         Core::arrayWrite('int', $arr, 5);
-        $this->assertEquals($arr['int'], 5);
+        self::assertSame($arr['int'], 5);
 
         Core::arrayWrite('str', $arr, '_str');
-        $this->assertEquals($arr['str'], '_str');
+        self::assertSame($arr['str'], '_str');
 
         Core::arrayWrite('arr/0', $arr, 'val_arr_0');
-        $this->assertEquals($arr['arr'][0], 'val_arr_0');
+        self::assertSame($arr['arr'][0], 'val_arr_0');
 
         Core::arrayWrite('arr/1', $arr, 'val_arr_1');
-        $this->assertEquals($arr['arr'][1], 'val_arr_1');
+        self::assertSame($arr['arr'][1], 'val_arr_1');
 
         Core::arrayWrite('arr/2', $arr, 'val_arr_2');
-        $this->assertEquals($arr['arr'][2], 'val_arr_2');
+        self::assertSame($arr['arr'][2], 'val_arr_2');
 
         Core::arrayWrite('sarr/arr1/0', $arr, 'val_sarr_arr_0');
-        $this->assertEquals($arr['sarr']['arr1'][0], 'val_sarr_arr_0');
+        self::assertSame($arr['sarr']['arr1'][0], 'val_sarr_arr_0');
 
         Core::arrayWrite('sarr/arr1/1', $arr, 'val_sarr_arr_1');
-        $this->assertEquals($arr['sarr']['arr1'][1], 'val_sarr_arr_1');
+        self::assertSame($arr['sarr']['arr1'][1], 'val_sarr_arr_1');
 
         Core::arrayWrite('sarr/arr1/2', $arr, 'val_sarr_arr_2');
-        $this->assertEquals($arr['sarr']['arr1'][2], 'val_sarr_arr_2');
+        self::assertSame($arr['sarr']['arr1'][2], 'val_sarr_arr_2');
 
         Core::arrayWrite('sarr/0/0', $arr, 5);
-        $this->assertEquals($arr['sarr'][0][0], 5);
+        self::assertSame($arr['sarr'][0][0], 5);
 
         Core::arrayWrite('sarr/0/1/0', $arr, 'e');
-        $this->assertEquals($arr['sarr'][0][1][0], 'e');
+        self::assertSame($arr['sarr'][0][1][0], 'e');
 
         Core::arrayWrite('sarr/not_existing/1', $arr, 'some_val');
-        $this->assertEquals($arr['sarr']['not_existing'][1], 'some_val');
+        self::assertSame($arr['sarr']['not_existing'][1], 'some_val');
 
         Core::arrayWrite('sarr/0/2', $arr, null);
-        $this->assertNull($arr['sarr'][0][2]);
+        self::assertNull($arr['sarr'][0][2]);
     }
 
     /**
@@ -247,48 +205,48 @@ class CoreTest extends AbstractNetworkTestCase
         ];
 
         Core::arrayRemove('int', $arr);
-        $this->assertArrayNotHasKey('int', $arr);
+        self::assertArrayNotHasKey('int', $arr);
 
         Core::arrayRemove('str', $arr);
-        $this->assertArrayNotHasKey('str', $arr);
+        self::assertArrayNotHasKey('str', $arr);
 
         Core::arrayRemove('arr/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['arr']);
+        self::assertArrayNotHasKey(0, $arr['arr']);
 
         Core::arrayRemove('arr/1', $arr);
-        $this->assertArrayNotHasKey(1, $arr['arr']);
+        self::assertArrayNotHasKey(1, $arr['arr']);
 
         Core::arrayRemove('arr/2', $arr);
-        $this->assertArrayNotHasKey('arr', $arr);
+        self::assertArrayNotHasKey('arr', $arr);
 
         $tmp_arr = $arr;
         Core::arrayRemove('sarr/not_existing/1', $arr);
-        $this->assertEquals($tmp_arr, $arr);
+        self::assertSame($tmp_arr, $arr);
 
         Core::arrayRemove('sarr/arr1/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['sarr']['arr1']);
+        self::assertArrayNotHasKey(0, $arr['sarr']['arr1']);
 
         Core::arrayRemove('sarr/arr1/1', $arr);
-        $this->assertArrayNotHasKey(1, $arr['sarr']['arr1']);
+        self::assertArrayNotHasKey(1, $arr['sarr']['arr1']);
 
         Core::arrayRemove('sarr/arr1/2', $arr);
-        $this->assertArrayNotHasKey('arr1', $arr['sarr']);
+        self::assertArrayNotHasKey('arr1', $arr['sarr']);
 
         Core::arrayRemove('sarr/0/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['sarr'][0]);
+        self::assertArrayNotHasKey(0, $arr['sarr'][0]);
 
         Core::arrayRemove('sarr/0/1/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['sarr'][0][1]);
+        self::assertArrayNotHasKey(0, $arr['sarr'][0][1]);
 
         Core::arrayRemove('sarr/0/1/1', $arr);
-        $this->assertArrayNotHasKey(1, $arr['sarr'][0][1]);
+        self::assertArrayNotHasKey(1, $arr['sarr'][0][1]);
 
         Core::arrayRemove('sarr/0/1/2', $arr);
-        $this->assertArrayNotHasKey(1, $arr['sarr'][0]);
+        self::assertArrayNotHasKey(1, $arr['sarr'][0]);
 
         Core::arrayRemove('sarr/0/2', $arr);
 
-        $this->assertEmpty($arr);
+        self::assertEmpty($arr);
     }
 
     /**
@@ -303,7 +261,7 @@ class CoreTest extends AbstractNetworkTestCase
      */
     public function testGotoNowhere(?string $page, array $allowList, bool $include, bool $expected): void
     {
-        $this->assertSame($expected, Core::checkPageValidity($page, $allowList, $include));
+        self::assertSame($expected, Core::checkPageValidity($page, $allowList, $include));
     }
 
     /**
@@ -413,7 +371,7 @@ class CoreTest extends AbstractNetworkTestCase
      */
     public function testGetRealSize(string $size, int $expected): void
     {
-        $this->assertEquals($expected, Core::getRealSize($size));
+        self::assertSame($expected, Core::getRealSize($size));
     }
 
     /**
@@ -481,11 +439,8 @@ class CoreTest extends AbstractNetworkTestCase
     public function testGetPHPDocLink(): void
     {
         $lang = _pgettext('PHP documentation language', 'en');
-        $this->assertEquals(
-            Core::getPHPDocLink('function'),
-            './url.php?url=https%3A%2F%2Fwww.php.net%2Fmanual%2F'
-            . $lang . '%2Ffunction'
-        );
+        self::assertSame(Core::getPHPDocLink('function'), './url.php?url=https%3A%2F%2Fwww.php.net%2Fmanual%2F'
+        . $lang . '%2Ffunction');
     }
 
     /**
@@ -498,7 +453,7 @@ class CoreTest extends AbstractNetworkTestCase
      */
     public function testLinkURL(string $link, string $url): void
     {
-        $this->assertEquals(Core::linkURL($link), $url);
+        self::assertSame(Core::linkURL($link), $url);
     }
 
     /**
@@ -614,10 +569,7 @@ class CoreTest extends AbstractNetworkTestCase
     public function testIsAllowedDomain(string $url, $expected): void
     {
         $_SERVER['SERVER_NAME'] = 'server.local';
-        $this->assertEquals(
-            $expected,
-            Core::isAllowedDomain($url)
-        );
+        self::assertSame($expected, Core::isAllowedDomain($url));
     }
 
     /**
@@ -673,10 +625,7 @@ class CoreTest extends AbstractNetworkTestCase
      */
     public function testSafeUnserialize(string $data, $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            Core::safeUnserialize($data)
-        );
+        self::assertSame($expected, Core::safeUnserialize($data));
     }
 
     /**
@@ -745,10 +694,7 @@ class CoreTest extends AbstractNetworkTestCase
      */
     public function testSanitizeMySQLHost(string $host, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            Core::sanitizeMySQLHost($host)
-        );
+        self::assertSame($expected, Core::sanitizeMySQLHost($host));
     }
 
     /**
@@ -783,18 +729,9 @@ class CoreTest extends AbstractNetworkTestCase
      */
     public function testReplaceDots(): void
     {
-        $this->assertEquals(
-            Core::securePath('../../../etc/passwd'),
-            './././etc/passwd'
-        );
-        $this->assertEquals(
-            Core::securePath('/var/www/../phpmyadmin'),
-            '/var/www/./phpmyadmin'
-        );
-        $this->assertEquals(
-            Core::securePath('./path/with..dots/../../file..php'),
-            './path/with.dots/././file.php'
-        );
+        self::assertSame(Core::securePath('../../../etc/passwd'), './././etc/passwd');
+        self::assertSame(Core::securePath('/var/www/../phpmyadmin'), '/var/www/./phpmyadmin');
+        self::assertSame(Core::securePath('./path/with..dots/../../file..php'), './path/with.dots/././file.php');
     }
 
     /**
@@ -836,7 +773,7 @@ class CoreTest extends AbstractNetworkTestCase
         $printed = ob_get_contents();
         ob_end_clean();
 
-        $this->assertGreaterThan(0, mb_strpos((string) $printed, $warn));
+        self::assertGreaterThan(0, mb_strpos((string) $printed, $warn));
     }
 
     /**
@@ -848,7 +785,7 @@ class CoreTest extends AbstractNetworkTestCase
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $signature = Core::signSqlQuery($sqlQuery);
         $hmac = '33371e8680a640dc05944a2a24e6e630d3e9e3dba24464135f2fb954c3a4ffe2';
-        $this->assertSame($hmac, $signature, 'The signature must match the computed one');
+        self::assertSame($hmac, $signature, 'The signature must match the computed one');
     }
 
     /**
@@ -859,7 +796,7 @@ class CoreTest extends AbstractNetworkTestCase
         $_SESSION[' HMAC_secret '] = hash('sha1', 'test');
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $hmac = '33371e8680a640dc05944a2a24e6e630d3e9e3dba24464135f2fb954c3a4ffe2';
-        $this->assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
     }
 
     /**
@@ -870,7 +807,7 @@ class CoreTest extends AbstractNetworkTestCase
         $_SESSION[' HMAC_secret '] = hash('sha1', '132654987gguieunofz');
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $hmac = '33371e8680a640dc05944a2a24e6e630d3e9e3dba24464135f2fb954c3a4ffe2';
-        $this->assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
     }
 
     /**
@@ -881,7 +818,7 @@ class CoreTest extends AbstractNetworkTestCase
         $_SESSION[' HMAC_secret '] = hash('sha1', 'test');
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $hmac = '3333333380a640dc05944a2a24e6e630d3e9e3dba24464135f2fb954c3eeeeee';
-        $this->assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
     }
 
     /**
@@ -892,7 +829,7 @@ class CoreTest extends AbstractNetworkTestCase
         $_SESSION[' HMAC_secret '] = 'empty';
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $hmac = '3333333380a640dc05944a2a24e6e630d3e9e3dba24464135f2fb954c3eeeeee';
-        $this->assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
     }
 
     /**
@@ -903,10 +840,10 @@ class CoreTest extends AbstractNetworkTestCase
         $_SESSION[' HMAC_secret '] = hash('sha1', 'firstSession');
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $hmac = Core::signSqlQuery($sqlQuery);
-        $this->assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
         $_SESSION[' HMAC_secret '] = hash('sha1', 'secondSession');
         // Try to use the token (hmac) from the previous session
-        $this->assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
     }
 
     /**
@@ -918,16 +855,16 @@ class CoreTest extends AbstractNetworkTestCase
         $_SESSION[' HMAC_secret '] = hash('sha1', 'firstSession');
         $sqlQuery = 'SELECT * FROM `test`.`db` WHERE 1;';
         $hmac = Core::signSqlQuery($sqlQuery);
-        $this->assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
         $GLOBALS['cfg']['blowfish_secret'] = str_repeat('a', 32);
         // Try to use the previous HMAC signature
-        $this->assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertFalse(Core::checkSqlQuerySignature($sqlQuery, $hmac));
 
         $GLOBALS['cfg']['blowfish_secret'] = str_repeat('a', 32);
         // Generate the HMAC signature to check that it works
         $hmac = Core::signSqlQuery($sqlQuery);
         // Must work now, (good secret and blowfish_secret)
-        $this->assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
+        self::assertTrue(Core::checkSqlQuerySignature($sqlQuery, $hmac));
     }
 
     public function testPopulateRequestWithEncryptedQueryParams(): void
@@ -951,8 +888,8 @@ class CoreTest extends AbstractNetworkTestCase
 
         $expected = ['pos' => '0', 'db' => 'test_db', 'table' => 'test_table'];
 
-        $this->assertEquals($expected, $_GET);
-        $this->assertEquals($expected, $_REQUEST);
+        self::assertSame($expected, $_GET);
+        self::assertSame($expected, $_REQUEST);
     }
 
     /**
@@ -982,8 +919,8 @@ class CoreTest extends AbstractNetworkTestCase
 
         Core::populateRequestWithEncryptedQueryParams($request);
 
-        $this->assertEquals($decrypted, $_GET);
-        $this->assertEquals($decrypted, $_REQUEST);
+        self::assertSame($decrypted, $_GET);
+        self::assertSame($decrypted, $_REQUEST);
     }
 
     /**
@@ -1017,13 +954,13 @@ class CoreTest extends AbstractNetworkTestCase
         $headersList = \xdebug_get_headers();
         // phpcs:enable
 
-        $this->assertContains('Cache-Control: private, max-age=10800', $headersList);
-        $this->assertContains('Content-Description: File Transfer', $headersList);
-        $this->assertContains('Content-Disposition: attachment; filename="test.sql"', $headersList);
-        $this->assertContains('Content-type: text/x-sql;charset=UTF-8', $headersList);
-        $this->assertContains('Content-Transfer-Encoding: binary', $headersList);
-        $this->assertContains('Content-Length: 100', $headersList);
-        $this->assertNotContains('Content-Encoding: gzip', $headersList);
+        self::assertContains('Cache-Control: private, max-age=10800', $headersList);
+        self::assertContains('Content-Description: File Transfer', $headersList);
+        self::assertContains('Content-Disposition: attachment; filename="test.sql"', $headersList);
+        self::assertContains('Content-type: text/x-sql;charset=UTF-8', $headersList);
+        self::assertContains('Content-Transfer-Encoding: binary', $headersList);
+        self::assertContains('Content-Length: 100', $headersList);
+        self::assertNotContains('Content-Encoding: gzip', $headersList);
     }
 
     /**
@@ -1044,12 +981,12 @@ class CoreTest extends AbstractNetworkTestCase
         $headersList = \xdebug_get_headers();
         // phpcs:enable
 
-        $this->assertContains('Cache-Control: private, max-age=10800', $headersList);
-        $this->assertContains('Content-Description: File Transfer', $headersList);
-        $this->assertContains('Content-Disposition: attachment; filename="test.sql.gz"', $headersList);
-        $this->assertContains('Content-Type: application/x-gzip', $headersList);
-        $this->assertNotContains('Content-Encoding: gzip', $headersList);
-        $this->assertContains('Content-Transfer-Encoding: binary', $headersList);
-        $this->assertNotContains('Content-Length: 0', $headersList);
+        self::assertContains('Cache-Control: private, max-age=10800', $headersList);
+        self::assertContains('Content-Description: File Transfer', $headersList);
+        self::assertContains('Content-Disposition: attachment; filename="test.sql.gz"', $headersList);
+        self::assertContains('Content-Type: application/x-gzip', $headersList);
+        self::assertNotContains('Content-Encoding: gzip', $headersList);
+        self::assertContains('Content-Transfer-Encoding: binary', $headersList);
+        self::assertNotContains('Content-Length: 0', $headersList);
     }
 }
diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php
index 29c19546ac..a4021ce8d8 100644
--- a/test/classes/CreateAddFieldTest.php
+++ b/test/classes/CreateAddFieldTest.php
@@ -37,7 +37,7 @@ class CreateAddFieldTest extends AbstractTestCase
     {
         $_POST = $request;
         $actual = $this->createAddField->getPartitionsDefinition();
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -238,7 +238,7 @@ class CreateAddFieldTest extends AbstractTestCase
     {
         $_POST = $request;
         $actual = $this->createAddField->getTableCreationQuery($db, $table);
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -311,7 +311,7 @@ class CreateAddFieldTest extends AbstractTestCase
     {
         $_POST = $request;
         $actual = $this->createAddField->getNumberOfFieldsFromRequest();
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -525,6 +525,6 @@ class CreateAddFieldTest extends AbstractTestCase
     {
         $_POST = $request;
         $sqlQuery = $this->createAddField->getColumnCreationQuery('my_table');
-        $this->assertEquals($expected, $sqlQuery);
+        self::assertSame($expected, $sqlQuery);
     }
 }
diff --git a/test/classes/Crypto/CryptoTest.php b/test/classes/Crypto/CryptoTest.php
index 4e525ec9ae..3cc662da62 100644
--- a/test/classes/Crypto/CryptoTest.php
+++ b/test/classes/Crypto/CryptoTest.php
@@ -24,9 +24,9 @@ class CryptoTest extends AbstractTestCase
 
         $crypto = new Crypto();
         $encrypted = $crypto->encrypt('test');
-        $this->assertNotSame('test', $encrypted);
-        $this->assertSame('test', $crypto->decrypt($encrypted));
-        $this->assertArrayNotHasKey('URLQueryEncryptionSecretKey', $_SESSION);
+        self::assertNotSame('test', $encrypted);
+        self::assertSame('test', $crypto->decrypt($encrypted));
+        self::assertArrayNotHasKey('URLQueryEncryptionSecretKey', $_SESSION);
     }
 
     public function testWithValidKeyFromSession(): void
@@ -38,9 +38,9 @@ class CryptoTest extends AbstractTestCase
 
         $crypto = new Crypto();
         $encrypted = $crypto->encrypt('test');
-        $this->assertNotSame('test', $encrypted);
-        $this->assertSame('test', $crypto->decrypt($encrypted));
-        $this->assertArrayHasKey('URLQueryEncryptionSecretKey', $_SESSION);
+        self::assertNotSame('test', $encrypted);
+        self::assertSame('test', $crypto->decrypt($encrypted));
+        self::assertArrayHasKey('URLQueryEncryptionSecretKey', $_SESSION);
     }
 
     public function testWithNewSessionKey(): void
@@ -52,10 +52,10 @@ class CryptoTest extends AbstractTestCase
 
         $crypto = new Crypto();
         $encrypted = $crypto->encrypt('test');
-        $this->assertNotSame('test', $encrypted);
-        $this->assertSame('test', $crypto->decrypt($encrypted));
-        $this->assertArrayHasKey('URLQueryEncryptionSecretKey', $_SESSION);
-        $this->assertEquals(32, mb_strlen($_SESSION['URLQueryEncryptionSecretKey'], '8bit'));
+        self::assertNotSame('test', $encrypted);
+        self::assertSame('test', $crypto->decrypt($encrypted));
+        self::assertArrayHasKey('URLQueryEncryptionSecretKey', $_SESSION);
+        self::assertSame(32, mb_strlen($_SESSION['URLQueryEncryptionSecretKey'], '8bit'));
     }
 
     public function testDecryptWithInvalidKey(): void
@@ -67,12 +67,12 @@ class CryptoTest extends AbstractTestCase
 
         $crypto = new Crypto();
         $encrypted = $crypto->encrypt('test');
-        $this->assertNotSame('test', $encrypted);
-        $this->assertSame('test', $crypto->decrypt($encrypted));
+        self::assertNotSame('test', $encrypted);
+        self::assertSame('test', $crypto->decrypt($encrypted));
 
         $config->set('URLQueryEncryptionSecretKey', str_repeat('b', 32));
 
         $crypto = new Crypto();
-        $this->assertNull($crypto->decrypt($encrypted));
+        self::assertNull($crypto->decrypt($encrypted));
     }
 }
diff --git a/test/classes/Database/CentralColumnsTest.php b/test/classes/Database/CentralColumnsTest.php
index f50226c4d7..98d8be0f5b 100644
--- a/test/classes/Database/CentralColumnsTest.php
+++ b/test/classes/Database/CentralColumnsTest.php
@@ -165,14 +165,11 @@ class CentralColumnsTest extends AbstractTestCase
      */
     public function testGetParams(): void
     {
-        $this->assertSame(
-            [
-                'user' => 'pma_user',
-                'db' => 'phpmyadmin',
-                'table' => 'pma_central_columns',
-            ],
-            $this->centralColumns->getParams()
-        );
+        self::assertSame([
+            'user' => 'pma_user',
+            'db' => 'phpmyadmin',
+            'table' => 'pma_central_columns',
+        ], $this->centralColumns->getParams());
     }
 
     /**
@@ -187,11 +184,8 @@ class CentralColumnsTest extends AbstractTestCase
                 array_slice($this->columnData, 1, 2)
             );
 
-        $this->assertEquals(
-            $this->modifiedColumnData,
-            $this->centralColumns->getColumnsList('phpmyadmin')
-        );
-        $this->assertEquals(
+        self::assertSame($this->modifiedColumnData, $this->centralColumns->getColumnsList('phpmyadmin'));
+        self::assertSame(
             array_slice($this->modifiedColumnData, 1, 2),
             $this->centralColumns->getColumnsList('phpmyadmin', 1, 2)
         );
@@ -214,10 +208,7 @@ class CentralColumnsTest extends AbstractTestCase
                 $this->returnValue([3])
             );
 
-        $this->assertEquals(
-            3,
-            $this->centralColumns->getCount('phpmyadmin')
-        );
+        self::assertSame(3, $this->centralColumns->getCount('phpmyadmin'));
     }
 
     /**
@@ -228,11 +219,9 @@ class CentralColumnsTest extends AbstractTestCase
         $_POST['db'] = 'PMA_db';
         $_POST['table'] = 'PMA_table';
 
-        $this->assertTrue(
-            $this->centralColumns->syncUniqueColumns(
-                ['PMA_table']
-            )
-        );
+        self::assertTrue($this->centralColumns->syncUniqueColumns(
+            ['PMA_table']
+        ));
     }
 
     /**
@@ -250,12 +239,10 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue('PMA_table=CREATE table `PMA_table` (id integer)')
             );
-        $this->assertTrue(
-            $this->centralColumns->makeConsistentWithList(
-                'phpmyadmin',
-                ['PMA_table']
-            )
-        );
+        self::assertTrue($this->centralColumns->makeConsistentWithList(
+            'phpmyadmin',
+            ['PMA_table']
+        ));
     }
 
     /**
@@ -278,16 +265,13 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue(['id', 'col1'])
             );
-        $this->assertEquals(
-            [
-                'id',
-                'col1',
-            ],
-            $this->centralColumns->getFromTable(
-                $db,
-                $table
-            )
-        );
+        self::assertSame([
+            'id',
+            'col1',
+        ], $this->centralColumns->getFromTable(
+            $db,
+            $table
+        ));
     }
 
     /**
@@ -310,14 +294,11 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue(array_slice($this->columnData, 0, 2))
             );
-        $this->assertEquals(
-            array_slice($this->modifiedColumnData, 0, 2),
-            $this->centralColumns->getFromTable(
-                $db,
-                $table,
-                true
-            )
-        );
+        self::assertSame(array_slice($this->modifiedColumnData, 0, 2), $this->centralColumns->getFromTable(
+            $db,
+            $table,
+            true
+        ));
     }
 
     /**
@@ -325,34 +306,30 @@ class CentralColumnsTest extends AbstractTestCase
      */
     public function testUpdateOneColumn(): void
     {
-        $this->assertTrue(
-            $this->centralColumns->updateOneColumn(
-                'phpmyadmin',
-                '',
-                '',
-                '',
-                '',
-                '',
-                0,
-                '',
-                '',
-                ''
-            )
-        );
-        $this->assertTrue(
-            $this->centralColumns->updateOneColumn(
-                'phpmyadmin',
-                'col1',
-                '',
-                '',
-                '',
-                '',
-                0,
-                '',
-                '',
-                ''
-            )
-        );
+        self::assertTrue($this->centralColumns->updateOneColumn(
+            'phpmyadmin',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0,
+            '',
+            '',
+            ''
+        ));
+        self::assertTrue($this->centralColumns->updateOneColumn(
+            'phpmyadmin',
+            'col1',
+            '',
+            '',
+            '',
+            '',
+            0,
+            '',
+            '',
+            ''
+        ));
     }
 
     /**
@@ -394,9 +371,7 @@ class CentralColumnsTest extends AbstractTestCase
             '',
             '',
         ];
-        $this->assertTrue(
-            $this->centralColumns->updateMultipleColumn($params)
-        );
+        self::assertTrue($this->centralColumns->updateMultipleColumn($params));
     }
 
     /**
@@ -433,18 +408,15 @@ class CentralColumnsTest extends AbstractTestCase
                 true,
             ]
         );
-        $this->assertStringContainsString(
-            $this->callFunction(
-                $this->centralColumns,
-                CentralColumns::class,
-                'getHtmlForEditTableRow',
-                [
-                    $list_detail_cols[0],
-                    0,
-                ]
-            ),
-            $result
-        );
+        self::assertStringContainsString($this->callFunction(
+            $this->centralColumns,
+            CentralColumns::class,
+            'getHtmlForEditTableRow',
+            [
+                $list_detail_cols[0],
+                0,
+            ]
+        ), $result);
     }
 
     /**
@@ -463,13 +435,10 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue($this->columnData)
             );
-        $this->assertEquals(
-            $this->modifiedColumnData,
-            $this->centralColumns->getListRaw(
-                'phpmyadmin',
-                ''
-            )
-        );
+        self::assertSame($this->modifiedColumnData, $this->centralColumns->getListRaw(
+            'phpmyadmin',
+            ''
+        ));
     }
 
     /**
@@ -490,13 +459,10 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue($this->columnData)
             );
-        $this->assertEquals(
-            $this->modifiedColumnData,
-            $this->centralColumns->getListRaw(
-                'phpmyadmin',
-                'table1'
-            )
-        );
+        self::assertSame($this->modifiedColumnData, $this->centralColumns->getListRaw(
+            'phpmyadmin',
+            'table1'
+        ));
     }
 
     /**
@@ -515,25 +481,22 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue(array_slice($this->columnData, 1, 1))
             );
-        $this->assertEquals(
-            array_slice($this->modifiedColumnData, 1, 1),
-            $this->callFunction(
-                $this->centralColumns,
-                CentralColumns::class,
-                'findExistingColNames',
-                [
-                    'phpmyadmin',
-                    "'col1'",
-                    true,
-                ]
-            )
-        );
+        self::assertSame(array_slice($this->modifiedColumnData, 1, 1), $this->callFunction(
+            $this->centralColumns,
+            CentralColumns::class,
+            'findExistingColNames',
+            [
+                'phpmyadmin',
+                "'col1'",
+                true,
+            ]
+        ));
     }
 
     public function testGetColumnsNotInCentralList(): void
     {
         $columns = $this->centralColumns->getColumnsNotInCentralList('PMA_db', 'PMA_table');
-        $this->assertIsArray($columns);
-        $this->assertEquals(['id', 'col1', 'col2'], $columns);
+        self::assertIsArray($columns);
+        self::assertSame(['id', 'col1', 'col2'], $columns);
     }
 }
diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php
index bac5348d46..c0226cac08 100644
--- a/test/classes/Database/Designer/CommonTest.php
+++ b/test/classes/Database/Designer/CommonTest.php
@@ -108,7 +108,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->getPageName($pg);
 
-        $this->assertEquals($pageName, $result);
+        self::assertSame($pageName, $result);
     }
 
     /**
@@ -134,7 +134,7 @@ class CommonTest extends AbstractTestCase
         $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi));
 
         $result = $this->designerCommon->deletePage($pg);
-        $this->assertTrue($result);
+        self::assertTrue($result);
     }
 
     /**
@@ -168,7 +168,7 @@ class CommonTest extends AbstractTestCase
         $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi));
 
         $result = $this->designerCommon->getDefaultPage($db);
-        $this->assertEquals($default_pg, $result);
+        self::assertEquals($default_pg, $result);
     }
 
     /**
@@ -200,7 +200,7 @@ class CommonTest extends AbstractTestCase
         $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi));
 
         $result = $this->designerCommon->getDefaultPage($db);
-        $this->assertEquals(-1, $result);
+        self::assertSame(-1, $result);
     }
 
     /**
@@ -233,7 +233,7 @@ class CommonTest extends AbstractTestCase
         $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi));
 
         $result = $this->designerCommon->getLoadingPage($db);
-        $this->assertEquals($default_pg, $result);
+        self::assertEquals($default_pg, $result);
     }
 
     /**
@@ -261,7 +261,7 @@ class CommonTest extends AbstractTestCase
         $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi));
 
         $result = $this->designerCommon->getLoadingPage($db);
-        $this->assertEquals($first_pg, $result);
+        self::assertEquals($first_pg, $result);
     }
 
     private function loadTestDataForRelationDeleteAddTests(string $createTableString): void
@@ -366,7 +366,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
+        self::assertSame([
             false,
             'Error: Relational features are disabled!',
         ], $result);
@@ -409,7 +409,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
+        self::assertSame([
             true,
             'Internal relationship has been removed.',
         ], $result);
@@ -472,7 +472,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
+        self::assertSame([
             true,
             'FOREIGN KEY relationship has been removed.',
         ], $result);
@@ -515,7 +515,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
+        self::assertSame([
             false,
             'Error: Internal relationship could not be removed!<br>',
         ], $result);
diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
index 68d873d471..54f2d91662 100644
--- a/test/classes/Database/DesignerTest.php
+++ b/test/classes/Database/DesignerTest.php
@@ -108,13 +108,10 @@ class DesignerTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invokeArgs($this->designer, [$db]);
 
-        $this->assertEquals(
-            [
-                '1' => 'page1',
-                '2' => 'page2',
-            ],
-            $result
-        );
+        self::assertSame([
+            '1' => 'page1',
+            '2' => 'page2',
+        ], $result);
     }
 
     /**
@@ -129,13 +126,13 @@ class DesignerTest extends AbstractTestCase
         $this->designer = new Designer($GLOBALS['dbi'], new Relation($GLOBALS['dbi']), new Template());
 
         $result = $this->designer->getHtmlForEditOrDeletePages($db, $operation);
-        $this->assertStringContainsString('<input type="hidden" name="operation" value="' . $operation . '">', $result);
-        $this->assertStringContainsString('<select name="selected_page" id="selected_page">', $result);
-        $this->assertStringContainsString('<option value="0">', $result);
-        $this->assertStringContainsString('<option value="1">', $result);
-        $this->assertStringContainsString('page1', $result);
-        $this->assertStringContainsString('<option value="2">', $result);
-        $this->assertStringContainsString('page2', $result);
+        self::assertStringContainsString('<input type="hidden" name="operation" value="' . $operation . '">', $result);
+        self::assertStringContainsString('<select name="selected_page" id="selected_page">', $result);
+        self::assertStringContainsString('<option value="0">', $result);
+        self::assertStringContainsString('<option value="1">', $result);
+        self::assertStringContainsString('page1', $result);
+        self::assertStringContainsString('<option value="2">', $result);
+        self::assertStringContainsString('page2', $result);
     }
 
     /**
@@ -149,23 +146,23 @@ class DesignerTest extends AbstractTestCase
         $this->designer = new Designer($GLOBALS['dbi'], new Relation($GLOBALS['dbi']), new Template());
 
         $result = $this->designer->getHtmlForPageSaveAs($db);
-        $this->assertStringContainsString('<input type="hidden" name="operation" value="savePage">', $result);
-        $this->assertStringContainsString('<select name="selected_page" id="selected_page">', $result);
-        $this->assertStringContainsString('<option value="0">', $result);
-        $this->assertStringContainsString('<option value="1">', $result);
-        $this->assertStringContainsString('page1', $result);
-        $this->assertStringContainsString('<option value="2">', $result);
-        $this->assertStringContainsString('page2', $result);
+        self::assertStringContainsString('<input type="hidden" name="operation" value="savePage">', $result);
+        self::assertStringContainsString('<select name="selected_page" id="selected_page">', $result);
+        self::assertStringContainsString('<option value="0">', $result);
+        self::assertStringContainsString('<option value="1">', $result);
+        self::assertStringContainsString('page1', $result);
+        self::assertStringContainsString('<option value="2">', $result);
+        self::assertStringContainsString('page2', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="radio" name="save_page" id="savePageSameRadio" value="same" checked>',
             $result
         );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="radio" name="save_page" id="savePageNewRadio" value="new">',
             $result
         );
-        $this->assertStringContainsString('<input type="text" name="selected_value" id="selected_value">', $result);
+        self::assertStringContainsString('<input type="text" name="selected_value" id="selected_value">', $result);
     }
 
     /**
@@ -180,25 +177,25 @@ class DesignerTest extends AbstractTestCase
 
         $result = $this->designer->getHtmlForSchemaExport($db, $page);
         // export type
-        $this->assertStringContainsString('<select id="plugins" name="export_type">', $result);
+        self::assertStringContainsString('<select id="plugins" name="export_type">', $result);
 
         // hidden field
-        $this->assertStringContainsString('<input type="hidden" name="page_number" value="' . $page . '">', $result);
+        self::assertStringContainsString('<input type="hidden" name="page_number" value="' . $page . '">', $result);
 
         // orientation
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<select class="form-select" name="pdf_orientation" id="select_pdf_orientation">',
             $result
         );
-        $this->assertStringContainsString('<option value="L" selected>Landscape</option>', $result);
-        $this->assertStringContainsString('<option value="P">Portrait</option>', $result);
+        self::assertStringContainsString('<option value="L" selected>Landscape</option>', $result);
+        self::assertStringContainsString('<option value="P">Portrait</option>', $result);
 
         // paper size
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<select class="form-select" name="pdf_paper" id="select_pdf_paper">',
             $result
         );
-        $this->assertStringContainsString('<option value="A3">A3</option>', $result);
-        $this->assertStringContainsString('<option value="A4" selected>A4</option>', $result);
+        self::assertStringContainsString('<option value="A3">A3</option>', $result);
+        self::assertStringContainsString('<option value="A4" selected>A4</option>', $result);
     }
 }
diff --git a/test/classes/Database/EventsTest.php b/test/classes/Database/EventsTest.php
index 3f1b7623e0..c035e04fdf 100644
--- a/test/classes/Database/EventsTest.php
+++ b/test/classes/Database/EventsTest.php
@@ -60,7 +60,7 @@ class EventsTest extends AbstractTestCase
             $_POST[$key] = $value;
         }
 
-        $this->assertEquals($out, $this->events->getDataFromRequest());
+        self::assertEquals($out, $this->events->getDataFromRequest());
     }
 
     /**
@@ -151,10 +151,7 @@ class EventsTest extends AbstractTestCase
     public function testGetEditorFormAdd(array $data, string $matcher): void
     {
         ResponseRenderer::getInstance()->setAjax(false);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->events->getEditorForm('add', 'change', $data)
-        );
+        self::assertStringContainsString($matcher, $this->events->getEditorForm('add', 'change', $data));
     }
 
     /**
@@ -206,10 +203,7 @@ class EventsTest extends AbstractTestCase
     public function testGetEditorFormEdit(array $data, string $matcher): void
     {
         ResponseRenderer::getInstance()->setAjax(false);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->events->getEditorForm('edit', 'change', $data)
-        );
+        self::assertStringContainsString($matcher, $this->events->getEditorForm('edit', 'change', $data));
     }
 
     /**
@@ -261,10 +255,7 @@ class EventsTest extends AbstractTestCase
     public function testGetEditorFormAjax(array $data, string $matcher): void
     {
         ResponseRenderer::getInstance()->setAjax(true);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->events->getEditorForm('edit', 'change', $data)
-        );
+        self::assertStringContainsString($matcher, $this->events->getEditorForm('edit', 'change', $data));
         ResponseRenderer::getInstance()->setAjax(false);
     }
 
@@ -325,8 +316,8 @@ class EventsTest extends AbstractTestCase
             ->will($this->returnArgument(0));
         $GLOBALS['dbi'] = $dbi;
 
-        $this->assertEquals($query, $this->events->getQueryFromRequest());
-        $this->assertCount($num_err, $errors);
+        self::assertSame($query, $this->events->getQueryFromRequest());
+        self::assertCount($num_err, $errors);
     }
 
     /**
diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
index 3bdba94650..24ac6b9352 100644
--- a/test/classes/Database/QbeTest.php
+++ b/test/classes/Database/QbeTest.php
@@ -68,36 +68,27 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetSortSelectCell(): void
     {
-        $this->assertStringContainsString(
-            'style="width:12ex" name="criteriaSort[1]"',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSortSelectCell',
-                [1]
-            )
-        );
-        $this->assertStringNotContainsString(
-            'selected="selected"',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSortSelectCell',
-                [1]
-            )
-        );
-        $this->assertStringContainsString(
-            'value="ASC" selected="selected">',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSortSelectCell',
-                [
-                    1,
-                    'ASC',
-                ]
-            )
-        );
+        self::assertStringContainsString('style="width:12ex" name="criteriaSort[1]"', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSortSelectCell',
+            [1]
+        ));
+        self::assertStringNotContainsString('selected="selected"', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSortSelectCell',
+            [1]
+        ));
+        self::assertStringContainsString('value="ASC" selected="selected">', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSortSelectCell',
+            [
+                1,
+                'ASC',
+            ]
+        ));
     }
 
     /**
@@ -105,33 +96,24 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetSortRow(): void
     {
-        $this->assertStringContainsString(
-            'name="criteriaSort[0]"',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSortRow',
-                []
-            )
-        );
-        $this->assertStringContainsString(
-            'name="criteriaSort[1]"',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSortRow',
-                []
-            )
-        );
-        $this->assertStringContainsString(
-            'name="criteriaSort[2]"',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSortRow',
-                []
-            )
-        );
+        self::assertStringContainsString('name="criteriaSort[0]"', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSortRow',
+            []
+        ));
+        self::assertStringContainsString('name="criteriaSort[1]"', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSortRow',
+            []
+        ));
+        self::assertStringContainsString('name="criteriaSort[2]"', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSortRow',
+            []
+        ));
     }
 
     /**
@@ -139,19 +121,16 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetShowRow(): void
     {
-        $this->assertEquals(
-            '<td class="text-center"><input type'
-            . '="checkbox" name="criteriaShow[0]"></td><td class="text-center">'
-            . '<input type="checkbox" name="criteriaShow[1]"></td><td '
-            . 'class="text-center"><input type="checkbox" name="criteriaShow[2]">'
-            . '</td>',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getShowRow',
-                []
-            )
-        );
+        self::assertSame('<td class="text-center"><input type'
+        . '="checkbox" name="criteriaShow[0]"></td><td class="text-center">'
+        . '<input type="checkbox" name="criteriaShow[1]"></td><td '
+        . 'class="text-center"><input type="checkbox" name="criteriaShow[2]">'
+        . '</td>', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getShowRow',
+            []
+        ));
     }
 
     /**
@@ -159,24 +138,21 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetCriteriaInputboxRow(): void
     {
-        $this->assertEquals(
-            '<td class="text-center">'
-            . '<input type="hidden" name="prev_criteria[0]" value="">'
-            . '<input type="text" name="criteria[0]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20"></td><td class="text-center">'
-            . '<input type="hidden" name="prev_criteria[1]" value="">'
-            . '<input type="text" name="criteria[1]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20"></td><td class="text-center">'
-            . '<input type="hidden" name="prev_criteria[2]" value="">'
-            . '<input type="text" name="criteria[2]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20"></td>',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getCriteriaInputboxRow',
-                []
-            )
-        );
+        self::assertSame('<td class="text-center">'
+        . '<input type="hidden" name="prev_criteria[0]" value="">'
+        . '<input type="text" name="criteria[0]" value="" class="textfield" '
+        . 'style="width: 12ex" size="20"></td><td class="text-center">'
+        . '<input type="hidden" name="prev_criteria[1]" value="">'
+        . '<input type="text" name="criteria[1]" value="" class="textfield" '
+        . 'style="width: 12ex" size="20"></td><td class="text-center">'
+        . '<input type="hidden" name="prev_criteria[2]" value="">'
+        . '<input type="text" name="criteria[2]" value="" class="textfield" '
+        . 'style="width: 12ex" size="20"></td>', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getCriteriaInputboxRow',
+            []
+        ));
     }
 
     /**
@@ -184,20 +160,17 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetAndOrColCell(): void
     {
-        $this->assertEquals(
-            '<td class="text-center"><strong>Or:</strong><input type="radio" '
-            . 'name="criteriaAndOrColumn[1]" value="or">&nbsp;&nbsp;<strong>And:'
-            . '</strong><input type="radio" name="criteriaAndOrColumn[1]" value='
-            . '"and"><br>Ins<input type="checkbox" name="criteriaColumnInsert'
-            . '[1]">&nbsp;&nbsp;Del<input type="checkbox" '
-            . 'name="criteriaColumnDelete[1]"></td>',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getAndOrColCell',
-                [1]
-            )
-        );
+        self::assertSame('<td class="text-center"><strong>Or:</strong><input type="radio" '
+        . 'name="criteriaAndOrColumn[1]" value="or">&nbsp;&nbsp;<strong>And:'
+        . '</strong><input type="radio" name="criteriaAndOrColumn[1]" value='
+        . '"and"><br>Ins<input type="checkbox" name="criteriaColumnInsert'
+        . '[1]">&nbsp;&nbsp;Del<input type="checkbox" '
+        . 'name="criteriaColumnDelete[1]"></td>', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getAndOrColCell',
+            [1]
+        ));
     }
 
     /**
@@ -205,28 +178,25 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetModifyColumnsRow(): void
     {
-        $this->assertEquals(
-            '<td class="text-center"><strong>'
-            . 'Or:</strong><input type="radio" name="criteriaAndOrColumn[0]" value'
-            . '="or">&nbsp;&nbsp;<strong>And:</strong><input type="radio" name='
-            . '"criteriaAndOrColumn[0]" value="and" checked="checked"><br>Ins'
-            . '<input type="checkbox" name="criteriaColumnInsert[0]">&nbsp;&nbsp;'
-            . 'Del<input type="checkbox" name="criteriaColumnDelete[0]"></td><td '
-            . 'class="text-center"><strong>Or:</strong><input type="radio" name="'
-            . 'criteriaAndOrColumn[1]" value="or">&nbsp;&nbsp;<strong>And:'
-            . '</strong><input type="radio" name="criteriaAndOrColumn[1]" value='
-            . '"and" checked="checked"><br>Ins<input type="checkbox" name='
-            . '"criteriaColumnInsert[1]">&nbsp;&nbsp;Del<input type="checkbox" '
-            . 'name="criteriaColumnDelete[1]"></td><td class="text-center"><br>Ins'
-            . '<input type="checkbox" name="criteriaColumnInsert[2]">&nbsp;&nbsp;'
-            . 'Del<input type="checkbox" name="criteriaColumnDelete[2]"></td>',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getModifyColumnsRow',
-                []
-            )
-        );
+        self::assertSame('<td class="text-center"><strong>'
+        . 'Or:</strong><input type="radio" name="criteriaAndOrColumn[0]" value'
+        . '="or">&nbsp;&nbsp;<strong>And:</strong><input type="radio" name='
+        . '"criteriaAndOrColumn[0]" value="and" checked="checked"><br>Ins'
+        . '<input type="checkbox" name="criteriaColumnInsert[0]">&nbsp;&nbsp;'
+        . 'Del<input type="checkbox" name="criteriaColumnDelete[0]"></td><td '
+        . 'class="text-center"><strong>Or:</strong><input type="radio" name="'
+        . 'criteriaAndOrColumn[1]" value="or">&nbsp;&nbsp;<strong>And:'
+        . '</strong><input type="radio" name="criteriaAndOrColumn[1]" value='
+        . '"and" checked="checked"><br>Ins<input type="checkbox" name='
+        . '"criteriaColumnInsert[1]">&nbsp;&nbsp;Del<input type="checkbox" '
+        . 'name="criteriaColumnDelete[1]"></td><td class="text-center"><br>Ins'
+        . '<input type="checkbox" name="criteriaColumnInsert[2]">&nbsp;&nbsp;'
+        . 'Del<input type="checkbox" name="criteriaColumnDelete[2]"></td>', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getModifyColumnsRow',
+            []
+        ));
     }
 
     /**
@@ -234,20 +204,17 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetInputboxRow(): void
     {
-        $this->assertEquals(
-            '<td class="text-center"><input type="text" name="Or2[0]" value="" class='
-            . '"textfield" style="width: 12ex" size="20"></td><td class="text-center">'
-            . '<input type="text" name="Or2[1]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20"></td><td class="text-center"><input '
-            . 'type="text" name="Or2[2]" value="" class="textfield" style="width: '
-            . '12ex" size="20"></td>',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getInputboxRow',
-                [2]
-            )
-        );
+        self::assertSame('<td class="text-center"><input type="text" name="Or2[0]" value="" class='
+        . '"textfield" style="width: 12ex" size="20"></td><td class="text-center">'
+        . '<input type="text" name="Or2[1]" value="" class="textfield" '
+        . 'style="width: 12ex" size="20"></td><td class="text-center"><input '
+        . 'type="text" name="Or2[2]" value="" class="textfield" style="width: '
+        . '12ex" size="20"></td>', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getInputboxRow',
+            [2]
+        ));
     }
 
     /**
@@ -265,16 +232,13 @@ class QbeTest extends AbstractTestCase
             ]
         );
 
-        $this->assertStringContainsString('<tr class="noclick">', $actual);
-        $this->assertStringContainsString(
-            '<td class="text-center"><input type="text" '
-            . 'name="Or0[0]" value="" class="textfield" style="width: 12ex" '
-            . 'size="20"></td><td class="text-center"><input type="text" name="Or0[1]" '
-            . 'value="" class="textfield" style="width: 12ex" size="20"></td><td '
-            . 'class="text-center"><input type="text" name="Or0[2]" value="" class='
-            . '"textfield" style="width: 12ex" size="20"></td></tr>',
-            $actual
-        );
+        self::assertStringContainsString('<tr class="noclick">', $actual);
+        self::assertStringContainsString('<td class="text-center"><input type="text" '
+        . 'name="Or0[0]" value="" class="textfield" style="width: 12ex" '
+        . 'size="20"></td><td class="text-center"><input type="text" name="Or0[1]" '
+        . 'value="" class="textfield" style="width: 12ex" size="20"></td><td '
+        . 'class="text-center"><input type="text" name="Or0[2]" value="" class='
+        . '"textfield" style="width: 12ex" size="20"></td></tr>', $actual);
     }
 
     /**
@@ -282,15 +246,12 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetSelectClause(): void
     {
-        $this->assertEquals(
-            '',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSelectClause',
-                []
-            )
-        );
+        self::assertSame('', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSelectClause',
+            []
+        ));
     }
 
     /**
@@ -298,15 +259,12 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetWhereClause(): void
     {
-        $this->assertEquals(
-            '',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getWhereClause',
-                []
-            )
-        );
+        self::assertSame('', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getWhereClause',
+            []
+        ));
     }
 
     /**
@@ -314,15 +272,12 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetOrderByClause(): void
     {
-        $this->assertEquals(
-            '',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getOrderByClause',
-                []
-            )
-        );
+        self::assertSame('', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getOrderByClause',
+            []
+        ));
     }
 
     /**
@@ -330,29 +285,26 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetIndexes(): void
     {
-        $this->assertEquals(
+        self::assertSame([
+            'unique' => [],
+            'index' => [],
+        ], $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getIndexes',
             [
-                'unique' => [],
-                'index' => [],
-            ],
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getIndexes',
                 [
-                    [
-                        '`table1`',
-                        'table2',
-                    ],
-                    [
-                        'column1',
-                        'column2',
-                        'column3',
-                    ],
-                    ['column2'],
-                ]
-            )
-        );
+                    '`table1`',
+                    'table2',
+                ],
+                [
+                    'column1',
+                    'column2',
+                    'column3',
+                ],
+                ['column2'],
+            ]
+        ));
     }
 
     /**
@@ -360,26 +312,23 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetLeftJoinColumnCandidates(): void
     {
-        $this->assertEquals(
-            [0 => 'column2'],
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getLeftJoinColumnCandidates',
+        self::assertSame([0 => 'column2'], $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getLeftJoinColumnCandidates',
+            [
                 [
-                    [
-                        '`table1`',
-                        'table2',
-                    ],
-                    [
-                        'column1',
-                        'column2',
-                        'column3',
-                    ],
-                    ['column2'],
-                ]
-            )
-        );
+                    '`table1`',
+                    'table2',
+                ],
+                [
+                    'column1',
+                    'column2',
+                    'column3',
+                ],
+                ['column2'],
+            ]
+        ));
     }
 
     /**
@@ -387,27 +336,24 @@ class QbeTest extends AbstractTestCase
      */
     public function testGetMasterTable(): void
     {
-        $this->assertEquals(
-            0,
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getMasterTable',
+        self::assertSame(0, $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getMasterTable',
+            [
                 [
-                    [
-                        'table1',
-                        'table2',
-                    ],
-                    [
-                        'column1',
-                        'column2',
-                        'column3',
-                    ],
-                    ['column2'],
-                    ['qbe_test'],
-                ]
-            )
-        );
+                    'table1',
+                    'table2',
+                ],
+                [
+                    'column1',
+                    'column2',
+                    'column3',
+                ],
+                ['column2'],
+                ['qbe_test'],
+            ]
+        ));
     }
 
     /**
@@ -421,18 +367,15 @@ class QbeTest extends AbstractTestCase
             'table1.name',
             'table1.deleted',
         ];
-        $this->assertEquals(
-            [
-                'where_clause_tables' => [],
-                'where_clause_columns' => [],
-            ],
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getWhereClauseTablesAndColumns',
-                []
-            )
-        );
+        self::assertSame([
+            'where_clause_tables' => [],
+            'where_clause_columns' => [],
+        ], $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getWhereClauseTablesAndColumns',
+            []
+        ));
     }
 
     /**
@@ -446,15 +389,12 @@ class QbeTest extends AbstractTestCase
             'table1.name',
             'table1.deleted',
         ];
-        $this->assertEquals(
-            '`table1`',
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getFromClause',
-                [['`table1`.`id`']]
-            )
-        );
+        self::assertSame('`table1`', $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getFromClause',
+            [['`table1`.`id`']]
+        ));
     }
 
     /**
@@ -468,14 +408,11 @@ class QbeTest extends AbstractTestCase
             'table1.name',
             'table1.deleted',
         ];
-        $this->assertEquals(
-            'FROM `table1`' . "\n",
-            $this->callFunction(
-                $this->object,
-                Qbe::class,
-                'getSQLQuery',
-                [['`table1`.`id`']]
-            )
-        );
+        self::assertSame('FROM `table1`' . "\n", $this->callFunction(
+            $this->object,
+            Qbe::class,
+            'getSQLQuery',
+            [['`table1`.`id`']]
+        ));
     }
 }
diff --git a/test/classes/Database/RoutinesTest.php b/test/classes/Database/RoutinesTest.php
index d72fbc3aa8..faea53647a 100644
--- a/test/classes/Database/RoutinesTest.php
+++ b/test/classes/Database/RoutinesTest.php
@@ -66,7 +66,7 @@ class RoutinesTest extends AbstractTestCase
             $_REQUEST[$key] = $value;
         }
 
-        $this->assertEquals($out, $this->routines->getDataFromRequest());
+        self::assertEquals($out, $this->routines->getDataFromRequest());
     }
 
     /**
@@ -304,7 +304,7 @@ class RoutinesTest extends AbstractTestCase
      */
     public function testGetParameterRowEmpty(): void
     {
-        $this->assertEquals('', $this->routines->getParameterRow([], 0));
+        self::assertSame('', $this->routines->getParameterRow([], 0));
     }
 
     /**
@@ -317,10 +317,7 @@ class RoutinesTest extends AbstractTestCase
      */
     public function testGetParameterRow(array $data, int $index, string $matcher): void
     {
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getParameterRow($data, $index)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getParameterRow($data, $index));
     }
 
     /**
@@ -396,10 +393,7 @@ class RoutinesTest extends AbstractTestCase
     public function testGetParameterRowAjax(array $data, string $matcher): void
     {
         ResponseRenderer::getInstance()->setAjax(true);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getParameterRow($data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getParameterRow($data));
         ResponseRenderer::getInstance()->setAjax(false);
     }
 
@@ -470,10 +464,7 @@ class RoutinesTest extends AbstractTestCase
      */
     public function testGetEditorForm1(array $data, string $matcher): void
     {
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getEditorForm('add', '', $data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getEditorForm('add', '', $data));
     }
 
     /**
@@ -587,10 +578,7 @@ class RoutinesTest extends AbstractTestCase
      */
     public function testGetEditorForm2(array $data, string $matcher): void
     {
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getEditorForm('edit', 'change', $data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getEditorForm('edit', 'change', $data));
     }
 
     /**
@@ -705,10 +693,7 @@ class RoutinesTest extends AbstractTestCase
     public function testGetEditorForm3(array $data, string $matcher): void
     {
         ResponseRenderer::getInstance()->setAjax(true);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getEditorForm('edit', 'remove', $data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getEditorForm('edit', 'remove', $data));
         ResponseRenderer::getInstance()->setAjax(false);
     }
 
@@ -819,10 +804,7 @@ class RoutinesTest extends AbstractTestCase
      */
     public function testGetEditorForm4(array $data, string $matcher): void
     {
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getEditorForm('edit', 'change', $data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getEditorForm('edit', 'change', $data));
     }
 
     /**
@@ -877,10 +859,7 @@ class RoutinesTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
 
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getExecuteForm($data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getExecuteForm($data));
     }
 
     /**
@@ -1019,10 +998,7 @@ class RoutinesTest extends AbstractTestCase
     public function testGetExecuteForm2(array $data, string $matcher): void
     {
         ResponseRenderer::getInstance()->setAjax(true);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->routines->getExecuteForm($data)
-        );
+        self::assertStringContainsString($matcher, $this->routines->getExecuteForm($data));
         ResponseRenderer::getInstance()->setAjax(false);
     }
 
@@ -1183,8 +1159,8 @@ class RoutinesTest extends AbstractTestCase
 
         unset($_POST);
         $_POST = $request;
-        $this->assertEquals($query, $routines->getQueryFromRequest());
-        $this->assertCount($num_err, $errors);
+        self::assertSame($query, $routines->getQueryFromRequest());
+        self::assertCount($num_err, $errors);
 
         // reset
         $GLOBALS['dbi'] = $old_dbi;
diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index 965477a585..f448414157 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -74,15 +74,12 @@ class SearchTest extends AbstractTestCase
         $_POST['criteriaSearchString'] = 'search string';
 
         $this->object = new Search($GLOBALS['dbi'], 'pma_test', new Template());
-        $this->assertEquals(
-            $expected,
-            $this->callFunction(
-                $this->object,
-                Search::class,
-                'getWhereClause',
-                ['table1']
-            )
-        );
+        self::assertSame($expected, $this->callFunction(
+            $this->object,
+            Search::class,
+            'getWhereClause',
+            ['table1']
+        ));
     }
 
     /**
@@ -130,19 +127,16 @@ class SearchTest extends AbstractTestCase
      */
     public function testGetSearchSqls(): void
     {
-        $this->assertEquals(
-            [
-                'select_columns' => 'SELECT *  FROM `pma`.`table1` WHERE FALSE',
-                'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE',
-                'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE',
-            ],
-            $this->callFunction(
-                $this->object,
-                Search::class,
-                'getSearchSqls',
-                ['table1']
-            )
-        );
+        self::assertSame([
+            'select_columns' => 'SELECT *  FROM `pma`.`table1` WHERE FALSE',
+            'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE',
+            'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE',
+        ], $this->callFunction(
+            $this->object,
+            Search::class,
+            'getSearchSqls',
+            ['table1']
+        ));
     }
 
     /**
@@ -150,10 +144,7 @@ class SearchTest extends AbstractTestCase
      */
     public function testGetSearchResults(): void
     {
-        $this->assertStringContainsString(
-            'Search results for "<em></em>" :',
-            $this->object->getSearchResults()
-        );
+        self::assertStringContainsString('Search results for "<em></em>" :', $this->object->getSearchResults());
     }
 
     /**
@@ -164,15 +155,15 @@ class SearchTest extends AbstractTestCase
         $main = $this->object->getMainHtml();
 
         // test selection form
-        $this->assertStringContainsString('<form', $main);
-        $this->assertStringContainsString('<a id="togglesearchformlink">', $main);
-        $this->assertStringContainsString('criteriaSearchType', $main);
+        self::assertStringContainsString('<form', $main);
+        self::assertStringContainsString('<a id="togglesearchformlink">', $main);
+        self::assertStringContainsString('criteriaSearchType', $main);
 
         // test result divs
-        $this->assertStringContainsString('<div id="table-info"', $main);
-        $this->assertStringContainsString('<a id="table-link"', $main);
-        $this->assertStringContainsString('<div id="browse-results"', $main);
-        $this->assertStringContainsString('<div id="sqlqueryform"', $main);
-        $this->assertStringContainsString('<button class="btn btn-secondary" id="togglequerybox"', $main);
+        self::assertStringContainsString('<div id="table-info"', $main);
+        self::assertStringContainsString('<a id="table-link"', $main);
+        self::assertStringContainsString('<div id="browse-results"', $main);
+        self::assertStringContainsString('<div id="sqlqueryform"', $main);
+        self::assertStringContainsString('<button class="btn btn-secondary" id="togglequerybox"', $main);
     }
 }
diff --git a/test/classes/Database/TriggersTest.php b/test/classes/Database/TriggersTest.php
index 210ad33a37..e101f14705 100644
--- a/test/classes/Database/TriggersTest.php
+++ b/test/classes/Database/TriggersTest.php
@@ -58,7 +58,7 @@ class TriggersTest extends AbstractTestCase
             $_POST[$key] = $value;
         }
 
-        $this->assertEquals($out, $this->triggers->getDataFromRequest());
+        self::assertSame($out, $this->triggers->getDataFromRequest());
     }
 
     /**
@@ -123,10 +123,7 @@ class TriggersTest extends AbstractTestCase
     public function testGetEditorFormAdd(array $data, string $matcher): void
     {
         $GLOBALS['server'] = 1;
-        $this->assertStringContainsString(
-            $matcher,
-            $this->triggers->getEditorForm('pma_test', 'table', 'add', $data)
-        );
+        self::assertStringContainsString($matcher, $this->triggers->getEditorForm('pma_test', 'table', 'add', $data));
     }
 
     /**
@@ -169,10 +166,7 @@ class TriggersTest extends AbstractTestCase
     public function testGetEditorFormEdit(array $data, string $matcher): void
     {
         $GLOBALS['server'] = 1;
-        $this->assertStringContainsString(
-            $matcher,
-            $this->triggers->getEditorForm('pma_test', 'table', 'edit', $data)
-        );
+        self::assertStringContainsString($matcher, $this->triggers->getEditorForm('pma_test', 'table', 'edit', $data));
     }
 
     /**
@@ -215,10 +209,7 @@ class TriggersTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 1;
         ResponseRenderer::getInstance()->setAjax(true);
-        $this->assertStringContainsString(
-            $matcher,
-            $this->triggers->getEditorForm('pma_test', 'table', 'edit', $data)
-        );
+        self::assertStringContainsString($matcher, $this->triggers->getEditorForm('pma_test', 'table', 'edit', $data));
         ResponseRenderer::getInstance()->setAjax(false);
     }
 
@@ -281,8 +272,8 @@ class TriggersTest extends AbstractTestCase
         $_POST['item_definition'] = $definition;
         $GLOBALS['server'] = 1;
 
-        $this->assertEquals($query, $this->triggers->getQueryFromRequest());
-        $this->assertCount($num_err, $errors);
+        self::assertSame($query, $this->triggers->getQueryFromRequest());
+        self::assertCount($num_err, $errors);
     }
 
     /**
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index 58f2e027e5..8d2722c697 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -62,15 +62,9 @@ class DatabaseInterfaceTest extends AbstractTestCase
             $this->dummyDbi->addResult('SELECT CURRENT_USER();', $value);
         }
 
-        $this->assertEquals(
-            $expected,
-            $this->dbi->getCurrentUserAndHost()
-        );
+        self::assertSame($expected, $this->dbi->getCurrentUserAndHost());
 
-        $this->assertEquals(
-            $string,
-            $this->dbi->getCurrentUser()
-        );
+        self::assertSame($string, $this->dbi->getCurrentUser());
 
         $this->assertAllQueriesConsumed();
     }
@@ -210,22 +204,16 @@ class DatabaseInterfaceTest extends AbstractTestCase
 
         $column_map = $this->dbi->getColumnMapFromSql($sql_query, $view_columns);
 
-        $this->assertEquals(
-            [
-                'table_name' => 'meta1_table',
-                'refering_column' => 'meta1_name',
-                'real_column' => 'view_columns1',
-            ],
-            $column_map[0]
-        );
-        $this->assertEquals(
-            [
-                'table_name' => 'meta2_table',
-                'refering_column' => 'meta2_name',
-                'real_column' => 'view_columns2',
-            ],
-            $column_map[1]
-        );
+        self::assertSame([
+            'table_name' => 'meta1_table',
+            'refering_column' => 'meta1_name',
+            'real_column' => 'view_columns1',
+        ], $column_map[0]);
+        self::assertSame([
+            'table_name' => 'meta2_table',
+            'refering_column' => 'meta2_name',
+            'real_column' => 'view_columns2',
+        ], $column_map[1]);
 
         $this->assertAllQueriesConsumed();
     }
@@ -236,7 +224,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
     public function testGetSystemDatabase(): void
     {
         $sd = $this->dbi->getSystemDatabase();
-        $this->assertInstanceOf(SystemDatabase::class, $sd);
+        self::assertInstanceOf(SystemDatabase::class, $sd);
     }
 
     /**
@@ -252,7 +240,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         $GLOBALS['db'] = '';
         $GLOBALS['cfg']['Server']['only_db'] = [];
         $this->dbi->postConnectControl(new Relation($this->dbi));
-        $this->assertInstanceOf(DatabaseList::class, $GLOBALS['dblist']);
+        self::assertInstanceOf(DatabaseList::class, $GLOBALS['dblist']);
     }
 
     /**
@@ -337,9 +325,9 @@ class DatabaseInterfaceTest extends AbstractTestCase
 
         $mock->postConnect();
 
-        $this->assertEquals($mock->getVersion(), $versionInt);
-        $this->assertEquals($mock->isMariaDB(), $isMariaDb);
-        $this->assertEquals($mock->isPercona(), $isPercona);
+        self::assertSame($mock->getVersion(), $versionInt);
+        self::assertSame($mock->isMariaDB(), $isMariaDb);
+        self::assertSame($mock->isPercona(), $isPercona);
     }
 
     /**
@@ -351,10 +339,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['DBG']['sql'] = false;
 
-        $this->assertEquals(
-            'utf8_general_ci',
-            $this->dbi->getDbCollation('pma_test')
-        );
+        self::assertSame('utf8_general_ci', $this->dbi->getDbCollation('pma_test'));
 
         $GLOBALS['cfg']['Server']['DisableIS'] = true;
 
@@ -364,7 +349,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         $this->dummyDbi->removeDefaultResults();
         $this->dummyDbi->addResult('SELECT @@collation_database', [['utf8mb3_general_ci']], ['@@collation_database']);
 
-        $this->assertEquals('utf8mb3_general_ci', $this->dbi->getDbCollation('information_schema'));
+        self::assertSame('utf8mb3_general_ci', $this->dbi->getDbCollation('information_schema'));
     }
 
     /**
@@ -374,7 +359,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['DBG']['sql'] = true;
-        $this->assertEquals('utf8_general_ci', $this->dbi->getServerCollation());
+        self::assertSame('utf8_general_ci', $this->dbi->getServerCollation());
     }
 
     /**
@@ -388,10 +373,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
      */
     public function testFormatError(int $error_number, string $error_message, string $match): void
     {
-        $this->assertStringContainsString(
-            $match,
-            Utilities::formatError($error_number, $error_message)
-        );
+        self::assertStringContainsString($match, Utilities::formatError($error_number, $error_message));
     }
 
     public static function errorData(): array
@@ -444,10 +426,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
 
         $this->dummyDbi->addResult('SELECT @@basedir', $value);
 
-        $this->assertEquals(
-            $expected,
-            $this->dbi->isAmazonRds()
-        );
+        self::assertSame($expected, $this->dbi->isAmazonRds());
 
         $this->assertAllQueriesConsumed();
     }
@@ -492,9 +471,9 @@ class DatabaseInterfaceTest extends AbstractTestCase
     public function testVersion(string $version, int $expected, int $major, bool $upgrade): void
     {
         $ver_int = Utilities::versionToInt($version);
-        $this->assertEquals($expected, $ver_int);
-        $this->assertEquals($major, (int) ($ver_int / 10000));
-        $this->assertEquals($upgrade, $ver_int < $GLOBALS['cfg']['MysqlMinVersion']['internal']);
+        self::assertSame($expected, $ver_int);
+        self::assertSame($major, (int) ($ver_int / 10000));
+        self::assertSame($upgrade, $ver_int < $GLOBALS['cfg']['MysqlMinVersion']['internal']);
     }
 
     public static function versionData(): array
@@ -598,7 +577,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         ];
 
         $actual = $this->dbi->getTablesFull('test_db');
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testGetTablesFullWithInformationSchema(): void
@@ -654,7 +633,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         ];
 
         $actual = $this->dbi->getTablesFull('test_db');
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testGetTablesFullBug18913(): void
@@ -671,7 +650,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         ], ['Name', 'Engine']);
 
         $actual = $this->dbi->getTablesFull('test_db_bug_18913');
-        $this->assertEquals($expected, array_keys($actual));
+        self::assertEquals($expected, array_keys($actual));
     }
 
     /**
@@ -684,15 +663,9 @@ class DatabaseInterfaceTest extends AbstractTestCase
         $this->dummyDbi->addResult($sql, [true]);
         $this->dummyDbi->addResult('Invalid query', false);
 
-        $this->assertInstanceOf(
-            ResultInterface::class,
-            $this->dbi->queryAsControlUser($sql)
-        );
-        $this->assertInstanceOf(
-            ResultInterface::class,
-            $this->dbi->tryQueryAsControlUser($sql)
-        );
-        $this->assertFalse($this->dbi->tryQueryAsControlUser('Invalid query'));
+        self::assertInstanceOf(ResultInterface::class, $this->dbi->queryAsControlUser($sql));
+        self::assertInstanceOf(ResultInterface::class, $this->dbi->tryQueryAsControlUser($sql));
+        self::assertFalse($this->dbi->tryQueryAsControlUser('Invalid query'));
     }
 
     public function testGetDatabasesFullDisabledISAndSortIntColumn(): void
@@ -866,7 +839,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
             100
         );
 
-        $this->assertSame([
+        self::assertSame([
             [
                 'SCHEMA_NAME' => 'db2',
                 'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
@@ -913,10 +886,10 @@ class DatabaseInterfaceTest extends AbstractTestCase
     ): void {
         $this->dbi->setVersion($version);
 
-        $this->assertEquals($versionInt, $this->dbi->getVersion());
-        $this->assertEquals($isMariaDb, $this->dbi->isMariaDB());
-        $this->assertEquals($isPercona, $this->dbi->isPercona());
-        $this->assertEquals($version['@@version'], $this->dbi->getVersionString());
+        self::assertSame($versionInt, $this->dbi->getVersion());
+        self::assertSame($isMariaDb, $this->dbi->isMariaDB());
+        self::assertSame($isPercona, $this->dbi->isPercona());
+        self::assertSame($version['@@version'], $this->dbi->getVersionString());
     }
 
     /**
diff --git a/test/classes/Dbal/DatabaseNameTest.php b/test/classes/Dbal/DatabaseNameTest.php
index 271be3b62b..367c01311d 100644
--- a/test/classes/Dbal/DatabaseNameTest.php
+++ b/test/classes/Dbal/DatabaseNameTest.php
@@ -42,8 +42,8 @@ class DatabaseNameTest extends TestCase
     public function testValidName(): void
     {
         $name = DatabaseName::fromValue('name');
-        $this->assertEquals('name', $name->getName());
-        $this->assertEquals('name', (string) $name);
+        self::assertSame('name', $name->getName());
+        self::assertSame('name', (string) $name);
     }
 
     /**
diff --git a/test/classes/Dbal/DbiDummyTest.php b/test/classes/Dbal/DbiDummyTest.php
index afbf818867..85e3b69da4 100644
--- a/test/classes/Dbal/DbiDummyTest.php
+++ b/test/classes/Dbal/DbiDummyTest.php
@@ -26,9 +26,9 @@ class DbiDummyTest extends AbstractTestCase
 
     public function testGetClientInfo(): void
     {
-        $this->assertNotEmpty($this->dummyDbi->getClientInfo());
+        self::assertNotEmpty($this->dummyDbi->getClientInfo());
         // Call the DatabaseInterface
-        $this->assertSame($this->dbi->getClientInfo(), $this->dummyDbi->getClientInfo());
+        self::assertSame($this->dbi->getClientInfo(), $this->dummyDbi->getClientInfo());
     }
 
     /**
@@ -38,7 +38,7 @@ class DbiDummyTest extends AbstractTestCase
      */
     public function testQuery(): void
     {
-        $this->assertInstanceOf(DummyResult::class, $this->dbi->tryQuery('SELECT 1'));
+        self::assertInstanceOf(DummyResult::class, $this->dbi->tryQuery('SELECT 1'));
     }
 
     /**
@@ -49,8 +49,8 @@ class DbiDummyTest extends AbstractTestCase
     public function testFetch(): void
     {
         $result = $this->dbi->tryQuery('SELECT 1');
-        $this->assertNotFalse($result);
-        $this->assertSame(['1'], $result->fetchRow());
+        self::assertNotFalse($result);
+        self::assertSame(['1'], $result->fetchRow());
     }
 
     /**
@@ -63,7 +63,7 @@ class DbiDummyTest extends AbstractTestCase
      */
     public function testSystemSchema(string $schema, bool $expected): void
     {
-        $this->assertEquals($expected, Utilities::isSystemSchema($schema));
+        self::assertSame($expected, Utilities::isSystemSchema($schema));
     }
 
     /**
@@ -95,10 +95,7 @@ class DbiDummyTest extends AbstractTestCase
     public function testFormatError(int $number, string $message, string $expected): void
     {
         $GLOBALS['server'] = 1;
-        $this->assertEquals(
-            $expected,
-            Utilities::formatError($number, $message)
-        );
+        self::assertSame($expected, Utilities::formatError($number, $message));
     }
 
     /**
@@ -131,13 +128,7 @@ class DbiDummyTest extends AbstractTestCase
      */
     public function testEscapeString(): void
     {
-        $this->assertEquals(
-            'a',
-            $this->dbi->escapeString('a')
-        );
-        $this->assertEquals(
-            'a\\\'',
-            $this->dbi->escapeString('a\'')
-        );
+        self::assertSame('a', $this->dbi->escapeString('a'));
+        self::assertSame('a\\\'', $this->dbi->escapeString('a\''));
     }
 }
diff --git a/test/classes/Dbal/DbiMysqliTest.php b/test/classes/Dbal/DbiMysqliTest.php
index 0948354815..564018909f 100644
--- a/test/classes/Dbal/DbiMysqliTest.php
+++ b/test/classes/Dbal/DbiMysqliTest.php
@@ -30,7 +30,7 @@ class DbiMysqliTest extends AbstractTestCase
 
     public function testGetClientInfo(): void
     {
-        $this->assertNotEmpty($this->object->getClientInfo());
+        self::assertNotEmpty($this->object->getClientInfo());
     }
 
     /**
@@ -45,7 +45,7 @@ class DbiMysqliTest extends AbstractTestCase
             ->with($this->equalTo($databaseName))
             ->willReturn(true);
 
-        $this->assertTrue($this->object->selectDb($databaseName, $mysqli));
+        self::assertTrue($this->object->selectDb($databaseName, $mysqli));
     }
 
     /**
@@ -60,7 +60,7 @@ class DbiMysqliTest extends AbstractTestCase
             ->with($this->equalTo($query))
             ->willReturn(true);
 
-        $this->assertTrue($this->object->realMultiQuery($mysqli, $query));
+        self::assertTrue($this->object->realMultiQuery($mysqli, $query));
     }
 
     /**
@@ -76,7 +76,7 @@ class DbiMysqliTest extends AbstractTestCase
             ->with($this->equalTo($query))
             ->willReturn($mysqliResult);
 
-        $this->assertInstanceOf(MysqliResult::class, $this->object->realQuery($query, $mysqli, 0));
+        self::assertInstanceOf(MysqliResult::class, $this->object->realQuery($query, $mysqli, 0));
     }
 
     /**
@@ -89,7 +89,7 @@ class DbiMysqliTest extends AbstractTestCase
             ->method('more_results')
             ->willReturn(true);
 
-        $this->assertTrue($this->object->moreResults($mysqli));
+        self::assertTrue($this->object->moreResults($mysqli));
     }
 
     /**
@@ -102,7 +102,7 @@ class DbiMysqliTest extends AbstractTestCase
             ->method('next_result')
             ->willReturn(true);
 
-        $this->assertTrue($this->object->nextResult($mysqli));
+        self::assertTrue($this->object->nextResult($mysqli));
     }
 
     /**
@@ -116,7 +116,7 @@ class DbiMysqliTest extends AbstractTestCase
             ->method('store_result')
             ->willReturn($mysqliResult);
 
-        $this->assertInstanceOf(MysqliResult::class, $this->object->storeResult($mysqli));
+        self::assertInstanceOf(MysqliResult::class, $this->object->storeResult($mysqli));
     }
 
     /**
@@ -130,6 +130,6 @@ class DbiMysqliTest extends AbstractTestCase
             ->method('real_escape_string')
             ->willReturn($string);
 
-        $this->assertEquals($string, $this->object->escapeString($mysqli, $string));
+        self::assertSame($string, $this->object->escapeString($mysqli, $string));
     }
 }
diff --git a/test/classes/Dbal/MysqliResultTest.php b/test/classes/Dbal/MysqliResultTest.php
index 7f96e9b4e3..d594553446 100644
--- a/test/classes/Dbal/MysqliResultTest.php
+++ b/test/classes/Dbal/MysqliResultTest.php
@@ -26,8 +26,8 @@ class MysqliResultTest extends AbstractTestCase
 
         $result = new MysqliResult($mysqliResult);
 
-        $this->assertSame(['foo' => 'bar'], $result->fetchAssoc());
-        $this->assertSame([], $result->fetchAssoc());
+        self::assertSame(['foo' => 'bar'], $result->fetchAssoc());
+        self::assertSame([], $result->fetchAssoc());
     }
 
     /**
@@ -43,8 +43,8 @@ class MysqliResultTest extends AbstractTestCase
 
         $result = new MysqliResult($mysqliResult);
 
-        $this->assertSame(['bar'], $result->fetchRow());
-        $this->assertSame([], $result->fetchRow());
+        self::assertSame(['bar'], $result->fetchRow());
+        self::assertSame([], $result->fetchRow());
     }
 
     /**
@@ -61,6 +61,6 @@ class MysqliResultTest extends AbstractTestCase
 
         $result = new MysqliResult($mysqliResult);
 
-        $this->assertTrue($result->seek($offset));
+        self::assertTrue($result->seek($offset));
     }
 }
diff --git a/test/classes/Dbal/TableNameTest.php b/test/classes/Dbal/TableNameTest.php
index 6f47964227..569832f57f 100644
--- a/test/classes/Dbal/TableNameTest.php
+++ b/test/classes/Dbal/TableNameTest.php
@@ -42,8 +42,8 @@ class TableNameTest extends TestCase
     public function testValidName(): void
     {
         $name = TableName::fromValue('name');
-        $this->assertEquals('name', $name->getName());
-        $this->assertEquals('name', (string) $name);
+        self::assertSame('name', $name->getName());
+        self::assertSame('name', (string) $name);
     }
 
     /**
diff --git a/test/classes/Dbal/WarningTest.php b/test/classes/Dbal/WarningTest.php
index ab59a7aff2..0955b5cf83 100644
--- a/test/classes/Dbal/WarningTest.php
+++ b/test/classes/Dbal/WarningTest.php
@@ -20,10 +20,10 @@ class WarningTest extends TestCase
     public function testWarning(array $row, string $level, int $code, string $message, string $toString): void
     {
         $warning = Warning::fromArray($row);
-        $this->assertSame($level, $warning->level);
-        $this->assertSame($code, $warning->code);
-        $this->assertSame($message, $warning->message);
-        $this->assertSame($toString, (string) $warning);
+        self::assertSame($level, $warning->level);
+        self::assertSame($code, $warning->code);
+        self::assertSame($message, $warning->message);
+        self::assertSame($toString, (string) $warning);
     }
 
     /**
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index fc361ad087..b44a94a834 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -82,19 +82,17 @@ class ResultsTest extends AbstractTestCase
     public function testisSelect(): void
     {
         $parser = new Parser('SELECT * FROM pma');
-        $this->assertTrue(
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'isSelect',
+        self::assertTrue($this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'isSelect',
+            [
                 [
-                    [
-                        'statement' => $parser->statements[0],
-                        'select_from' => true,
-                    ],
-                ]
-            )
-        );
+                    'statement' => $parser->statements[0],
+                    'select_from' => true,
+                ],
+            ]
+        ));
     }
 
     /**
@@ -129,11 +127,11 @@ class ResultsTest extends AbstractTestCase
             ]
         );
 
-        $this->assertStringContainsString('<form action="index.php?route=/sql', $actual);
-        $this->assertStringContainsString('" method="post" >', $actual);
-        $this->assertStringContainsString('name="sql_query" value="SELECT * FROM `pma_bookmark` WHERE 1"', $actual);
-        $this->assertStringContainsString('name="pos" value="1"', $actual);
-        $this->assertStringContainsString('value="btn" title="Submit"', $actual);
+        self::assertStringContainsString('<form action="index.php?route=/sql', $actual);
+        self::assertStringContainsString('" method="post" >', $actual);
+        self::assertStringContainsString('name="sql_query" value="SELECT * FROM `pma_bookmark` WHERE 1"', $actual);
+        self::assertStringContainsString('name="pos" value="1"', $actual);
+        self::assertStringContainsString('value="btn" title="Submit"', $actual);
     }
 
     /**
@@ -155,41 +153,32 @@ class ResultsTest extends AbstractTestCase
 
     public function testGetClassForDateTimeRelatedFieldsCase1(): void
     {
-        $this->assertEquals(
-            'datetimefield',
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getClassForDateTimeRelatedFields',
-                [new FieldMetadata(MYSQLI_TYPE_TIMESTAMP, 0, (object) [])]
-            )
-        );
+        self::assertSame('datetimefield', $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getClassForDateTimeRelatedFields',
+            [new FieldMetadata(MYSQLI_TYPE_TIMESTAMP, 0, (object) [])]
+        ));
     }
 
     public function testGetClassForDateTimeRelatedFieldsCase2(): void
     {
-        $this->assertEquals(
-            'datefield',
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getClassForDateTimeRelatedFields',
-                [new FieldMetadata(MYSQLI_TYPE_DATE, 0, (object) [])]
-            )
-        );
+        self::assertSame('datefield', $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getClassForDateTimeRelatedFields',
+            [new FieldMetadata(MYSQLI_TYPE_DATE, 0, (object) [])]
+        ));
     }
 
     public function testGetClassForDateTimeRelatedFieldsCase3(): void
     {
-        $this->assertEquals(
-            'text',
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getClassForDateTimeRelatedFields',
-                [new FieldMetadata(MYSQLI_TYPE_STRING, 0, (object) [])]
-            )
-        );
+        self::assertSame('text', $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getClassForDateTimeRelatedFields',
+            [new FieldMetadata(MYSQLI_TYPE_STRING, 0, (object) [])]
+        ));
     }
 
     /**
@@ -198,18 +187,15 @@ class ResultsTest extends AbstractTestCase
     public function testGetOffsetsCase1(): void
     {
         $_SESSION['tmpval']['max_rows'] = DisplayResults::ALL_ROWS;
-        $this->assertEquals(
-            [
-                0,
-                0,
-            ],
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getOffsets',
-                []
-            )
-        );
+        self::assertSame([
+            0,
+            0,
+        ], $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getOffsets',
+            []
+        ));
     }
 
     /**
@@ -219,18 +205,15 @@ class ResultsTest extends AbstractTestCase
     {
         $_SESSION['tmpval']['max_rows'] = 5;
         $_SESSION['tmpval']['pos'] = 4;
-        $this->assertEquals(
-            [
-                9,
-                0,
-            ],
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getOffsets',
-                []
-            )
-        );
+        self::assertSame([
+            9,
+            0,
+        ], $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getOffsets',
+            []
+        ));
     }
 
     /**
@@ -326,19 +309,16 @@ class ResultsTest extends AbstractTestCase
             ],
         ];
 
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getSpecialLinkUrl',
-                [
-                    $specialSchemaLinks[$db][$table][$field_name],
-                    $column_value,
-                    $row_info,
-                ]
-            )
-        );
+        self::assertSame($output, $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getSpecialLinkUrl',
+            [
+                $specialSchemaLinks[$db][$table][$field_name],
+                $column_value,
+                $row_info,
+            ]
+        ));
     }
 
     /**
@@ -409,18 +389,15 @@ class ResultsTest extends AbstractTestCase
         $this->object->properties['fields_meta'] = $fields_meta;
         $this->object->properties['fields_cnt'] = $fields_count;
 
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getRowInfoForSpecialLinks',
-                [
-                    $row,
-                    $col_order,
-                ]
-            )
-        );
+        self::assertSame($output, $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getRowInfoForSpecialLinks',
+            [
+                $row,
+                $col_order,
+            ]
+        ));
     }
 
     /**
@@ -461,7 +438,7 @@ class ResultsTest extends AbstractTestCase
             [$analyzed_sql]
         );
 
-        $this->assertEquals($output, $this->object->properties['highlight_columns']);
+        self::assertSame($output, $this->object->properties['highlight_columns']);
     }
 
     /**
@@ -529,15 +506,12 @@ class ResultsTest extends AbstractTestCase
     {
         $_SESSION['tmpval']['pftext'] = $pftext;
         $GLOBALS['cfg']['LimitChars'] = $limitChars;
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getPartialText',
-                [$str]
-            )
-        );
+        self::assertSame($output, $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getPartialText',
+            [$str]
+        ));
     }
 
     /**
@@ -657,23 +631,20 @@ class ResultsTest extends AbstractTestCase
         $_SESSION['tmpval']['display_binary'] = $display_binary;
         $_SESSION['tmpval']['display_blob'] = $display_blob;
         $GLOBALS['cfg']['LimitChars'] = 50;
-        $this->assertStringContainsString(
-            $output,
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'handleNonPrintableContents',
-                [
-                    $category,
-                    $content,
-                    $transformation_plugin,
-                    $transform_options,
-                    $meta,
-                    $url_params,
-                    &$is_truncated,
-                ]
-            )
-        );
+        self::assertStringContainsString($output, $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'handleNonPrintableContents',
+            [
+                $category,
+                $content,
+                $transformation_plugin,
+                $transform_options,
+                $meta,
+                $url_params,
+                &$is_truncated,
+            ]
+        ));
     }
 
     /**
@@ -855,25 +826,22 @@ class ResultsTest extends AbstractTestCase
         $_SESSION['tmpval']['relational_display'] = false;
         $GLOBALS['cfg']['LimitChars'] = 50;
         $GLOBALS['cfg']['ProtectBinary'] = $protectBinary;
-        $this->assertStringContainsString(
-            $output,
-            $this->callFunction(
-                $this->object,
-                DisplayResults::class,
-                'getDataCellForNonNumericColumns',
-                [
-                    $column,
-                    $class,
-                    $meta,
-                    $map,
-                    $_url_params,
-                    $condition_field,
-                    $transformation_plugin,
-                    $transform_options,
-                    $analyzed_sql_results,
-                ]
-            )
-        );
+        self::assertStringContainsString($output, $this->callFunction(
+            $this->object,
+            DisplayResults::class,
+            'getDataCellForNonNumericColumns',
+            [
+                $column,
+                $class,
+                $meta,
+                $map,
+                $_url_params,
+                $condition_field,
+                $transformation_plugin,
+                $transform_options,
+                $analyzed_sql_results,
+            ]
+        ));
     }
 
     /**
@@ -966,9 +934,9 @@ class ResultsTest extends AbstractTestCase
         );
 
         // Dateformat
-        $this->assertStringContainsString('Jan 01, 1970 at 01:00 AM', $output);
+        self::assertStringContainsString('Jan 01, 1970 at 01:00 AM', $output);
         // Bool2Text
-        $this->assertStringContainsString('>T<', $output);
+        self::assertStringContainsString('>T<', $output);
     }
 
     public static function dataProviderGetSortOrderHiddenInputs(): array
@@ -1060,31 +1028,31 @@ class ResultsTest extends AbstractTestCase
             ]
         );
         $out = urldecode(htmlspecialchars_decode($output));
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'name="url-remove-order" value="index.php?route=/sql&sql_query=' . $sqlRemove,
             $out,
             'The remove query should be found'
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'name="url-add-order" value="index.php?route=/sql&sql_query=' . $sqlAdd,
             $out,
             'The add query should be found'
         );
 
         $firstLine = explode("\n", $out)[0] ?? '';
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'url-remove-order',
             $firstLine,
             'The first line should contain url-remove-order input'
         );
-        $this->assertStringNotContainsString(
+        self::assertStringNotContainsString(
             'url-add-order',
             $firstLine,
             'The first line should contain NOT url-add-order input'
         );
 
-        $this->assertStringContainsString($urlParamsRemove, $firstLine, 'The first line should contain the URL params');
+        self::assertStringContainsString($urlParamsRemove, $firstLine, 'The first line should contain the URL params');
     }
 
     /**
@@ -1102,7 +1070,7 @@ class ResultsTest extends AbstractTestCase
                 '  special value  ',
             ]
         );
-        $this->assertSame('<td class="text-start my_class">  special value  </td>' . "\n", $output);
+        self::assertSame('<td class="text-start my_class">  special value  </td>' . "\n", $output);
         $output = $this->callFunction(
             $this->object,
             DisplayResults::class,
@@ -1113,7 +1081,7 @@ class ResultsTest extends AbstractTestCase
                 '0x11e6ac0cfb1e8bf3bf48b827ebdafb0b',
             ]
         );
-        $this->assertSame('<td class="text-start my_class">0x11e6ac0cfb1e8bf3bf48b827ebdafb0b</td>' . "\n", $output);
+        self::assertSame('<td class="text-start my_class">0x11e6ac0cfb1e8bf3bf48b827ebdafb0b</td>' . "\n", $output);
         $output = $this->callFunction(
             $this->object,
             DisplayResults::class,
@@ -1124,7 +1092,7 @@ class ResultsTest extends AbstractTestCase
                 '0x11e6ac0cfb1e8bf3bf48b827ebdafb0b',
             ]
         );
-        $this->assertSame(
+        self::assertSame(
             '<td class="text-start my_class condition">0x11e6ac0cfb1e8bf3bf48b827ebdafb0b</td>' . "\n",
             $output
         );
@@ -1141,7 +1109,7 @@ class ResultsTest extends AbstractTestCase
         $object = new DisplayResults($this->dbi, $db, $table, 1, '', $query);
         $object->setConfigParamsForDisplayTable($analyzedSqlResults);
 
-        $this->assertSame('F', $_SESSION['tmpval']['pftext']);
+        self::assertSame('F', $_SESSION['tmpval']['pftext']);
 
         $query = 'ANALYZE NO_WRITE_TO_BINLOG TABLE test_table';
         [$analyzedSqlResults] = ParseAnalyze::sqlQuery($query, $db);
@@ -1149,7 +1117,7 @@ class ResultsTest extends AbstractTestCase
         $object = new DisplayResults($this->dbi, $db, $table, 1, '', $query);
         $object->setConfigParamsForDisplayTable($analyzedSqlResults);
 
-        $this->assertSame('P', $_SESSION['tmpval']['pftext']);
+        self::assertSame('P', $_SESSION['tmpval']['pftext']);
     }
 
     /**
@@ -1175,9 +1143,9 @@ class ResultsTest extends AbstractTestCase
         $object = new DisplayResults($this->dbi, $db, $table, 1, '', $query);
         $object->setConfigParamsForDisplayTable($analyzedSqlResults);
 
-        $this->assertArrayHasKey('tmpval', $_SESSION);
-        $this->assertIsArray($_SESSION['tmpval']);
-        $this->assertSame($expected, $_SESSION['tmpval']);
+        self::assertArrayHasKey('tmpval', $_SESSION);
+        self::assertIsArray($_SESSION['tmpval']);
+        self::assertSame($expected, $_SESSION['tmpval']);
     }
 
     public static function providerSetConfigParamsForDisplayTable(): array
@@ -1457,7 +1425,7 @@ class ResultsTest extends AbstractTestCase
             'pview_lnk' => '1',
             'query_stats' => '1',
         ];
-        $this->assertNotFalse($dtResult);
+        self::assertNotFalse($dtResult);
         $actual = $object->getTable($dtResult, $displayParts, $analyzedSqlResults);
 
         $template = new Template();
@@ -1665,7 +1633,7 @@ class ResultsTest extends AbstractTestCase
             'text_dir' => 'ltr',
         ]);
 
-        $this->assertEquals($tableTemplate, $actual);
+        self::assertSame($tableTemplate, $actual);
     }
 
     /**
@@ -1776,7 +1744,7 @@ class ResultsTest extends AbstractTestCase
             ]
         );
 
-        $this->assertSame([
+        self::assertSame([
             "\n" . 'ORDER BY `Country`.`FoundedIn` ' . $querySortDirection, // singleSortOrder
             "\n" . 'ORDER BY `Country`.`Code` ASC, `Country`.`FoundedIn` ' . $querySortDirection, // sortOrderColumns
             '', // orderImg
@@ -1796,7 +1764,7 @@ class ResultsTest extends AbstractTestCase
             ]
         );
 
-        $this->assertSame([
+        self::assertSame([
             "\n" . 'ORDER BY `Country`.`Code2` ' . $querySortDirection, // singleSortOrder
             "\n" . 'ORDER BY `Country`.`Code` ASC, `Country`.`Code2` ' . $querySortDirection, // sortOrderColumns
             '', // orderImg
@@ -1823,7 +1791,7 @@ class ResultsTest extends AbstractTestCase
             ]
         );
 
-        $this->assertSame([
+        self::assertSame([
             "\n" . 'ORDER BY `Country`.`Code2` ' . $querySortDirection, // singleSortOrder
             "\n" . 'ORDER BY `Country`.`Continent` DESC, `Country`.`Region` ASC'
                 . ', `Country`.`Population` ASC, `Country`.`Code2` ' . $querySortDirection, // sortOrderColumns
diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php
index fc563cf133..2a18f4f718 100644
--- a/test/classes/EncodingTest.php
+++ b/test/classes/EncodingTest.php
@@ -42,20 +42,14 @@ class EncodingTest extends AbstractTestCase
      */
     public function testNoConversion(): void
     {
-        $this->assertEquals(
-            'test',
-            Encoding::convertString('UTF-8', 'UTF-8', 'test')
-        );
+        self::assertSame('test', Encoding::convertString('UTF-8', 'UTF-8', 'test'));
     }
 
     public function testInvalidConversion(): void
     {
         // Invalid value to use default case
         Encoding::setEngine(-1);
-        $this->assertEquals(
-            'test',
-            Encoding::convertString('UTF-8', 'anything', 'test')
-        );
+        self::assertSame('test', Encoding::convertString('UTF-8', 'anything', 'test'));
     }
 
     /**
@@ -64,14 +58,11 @@ class EncodingTest extends AbstractTestCase
     public function testRecode(): void
     {
         Encoding::setEngine(Encoding::ENGINE_RECODE);
-        $this->assertEquals(
-            'Only That ecole & Can Be My Blame',
-            Encoding::convertString(
-                'UTF-8',
-                'flat',
-                'Only That école & Can Be My Blame'
-            )
-        );
+        self::assertSame('Only That ecole & Can Be My Blame', Encoding::convertString(
+            'UTF-8',
+            'flat',
+            'Only That école & Can Be My Blame'
+        ));
     }
 
     /**
@@ -96,41 +87,32 @@ class EncodingTest extends AbstractTestCase
         if (PHP_INT_SIZE === 8) {
             $GLOBALS['cfg']['IconvExtraParams'] = '//TRANSLIT';
             Encoding::setEngine(Encoding::ENGINE_ICONV);
-            $this->assertEquals(
-                "This is the Euro symbol 'EUR'.",
-                Encoding::convertString(
-                    'UTF-8',
-                    'ISO-8859-1',
-                    "This is the Euro symbol '€'."
-                )
-            );
+            self::assertSame("This is the Euro symbol 'EUR'.", Encoding::convertString(
+                'UTF-8',
+                'ISO-8859-1',
+                "This is the Euro symbol '€'."
+            ));
         } elseif (PHP_INT_SIZE === 4) {
             // NOTE: this does not work on 32bit systems and requires "//IGNORE"
             // NOTE: or it will throw "iconv(): Detected an illegal character in input string"
             $GLOBALS['cfg']['IconvExtraParams'] = '//TRANSLIT//IGNORE';
             Encoding::setEngine(Encoding::ENGINE_ICONV);
-            $this->assertEquals(
-                "This is the Euro symbol ''.",
-                Encoding::convertString(
-                    'UTF-8',
-                    'ISO-8859-1',
-                    "This is the Euro symbol '€'."
-                )
-            );
+            self::assertSame("This is the Euro symbol ''.", Encoding::convertString(
+                'UTF-8',
+                'ISO-8859-1',
+                "This is the Euro symbol '€'."
+            ));
         }
     }
 
     public function testMbstring(): void
     {
         Encoding::setEngine(Encoding::ENGINE_MB);
-        $this->assertEquals(
-            "This is the Euro symbol '?'.",
-            Encoding::convertString(
-                'UTF-8',
-                'ISO-8859-1',
-                "This is the Euro symbol '€'."
-            )
-        );
+        self::assertSame("This is the Euro symbol '?'.", Encoding::convertString(
+            'UTF-8',
+            'ISO-8859-1',
+            "This is the Euro symbol '€'."
+        ));
     }
 
     /**
@@ -138,11 +120,11 @@ class EncodingTest extends AbstractTestCase
      */
     public function testChangeOrder(): void
     {
-        $this->assertEquals('ASCII,SJIS,EUC-JP,JIS', Encoding::getKanjiEncodings());
+        self::assertSame('ASCII,SJIS,EUC-JP,JIS', Encoding::getKanjiEncodings());
         Encoding::kanjiChangeOrder();
-        $this->assertEquals('ASCII,EUC-JP,SJIS,JIS', Encoding::getKanjiEncodings());
+        self::assertSame('ASCII,EUC-JP,SJIS,JIS', Encoding::getKanjiEncodings());
         Encoding::kanjiChangeOrder();
-        $this->assertEquals('ASCII,SJIS,EUC-JP,JIS', Encoding::getKanjiEncodings());
+        self::assertSame('ASCII,SJIS,EUC-JP,JIS', Encoding::getKanjiEncodings());
     }
 
     /**
@@ -150,27 +132,18 @@ class EncodingTest extends AbstractTestCase
      */
     public function testKanjiStrConv(): void
     {
-        $this->assertEquals(
-            'test',
-            Encoding::kanjiStrConv('test', '', '')
-        );
+        self::assertSame('test', Encoding::kanjiStrConv('test', '', ''));
 
         $GLOBALS['kanji_encoding_list'] = 'ASCII,SJIS,EUC-JP,JIS';
 
-        $this->assertEquals(
-            'test è',
-            Encoding::kanjiStrConv('test è', '', '')
-        );
+        self::assertSame('test è', Encoding::kanjiStrConv('test è', '', ''));
 
-        $this->assertEquals(
+        self::assertSame(
             mb_convert_encoding('test è', 'ASCII', 'SJIS'),
             Encoding::kanjiStrConv('test è', 'ASCII', '')
         );
 
-        $this->assertEquals(
-            mb_convert_kana('全角', 'KV', 'SJIS'),
-            Encoding::kanjiStrConv('全角', '', 'kana')
-        );
+        self::assertSame(mb_convert_kana('全角', 'KV', 'SJIS'), Encoding::kanjiStrConv('全角', '', 'kana'));
     }
 
     /**
@@ -180,7 +153,7 @@ class EncodingTest extends AbstractTestCase
     {
         $file_str = '教育漢字常用漢字';
         $filename = 'test.kanji';
-        $this->assertNotFalse(file_put_contents($filename, $file_str));
+        self::assertNotFalse(file_put_contents($filename, $file_str));
         $GLOBALS['kanji_encoding_list'] = 'ASCII,EUC-JP,SJIS,JIS';
 
         $result = Encoding::kanjiFileConv($filename, 'JIS', 'kana');
@@ -189,7 +162,7 @@ class EncodingTest extends AbstractTestCase
         Encoding::kanjiChangeOrder();
         $expected = Encoding::kanjiStrConv($file_str, 'JIS', 'kana');
         Encoding::kanjiChangeOrder();
-        $this->assertEquals($string, $expected);
+        self::assertSame($string, $expected);
         unlink($result);
     }
 
@@ -199,17 +172,17 @@ class EncodingTest extends AbstractTestCase
     public function testEncodingForm(): void
     {
         $actual = Encoding::kanjiEncodingForm();
-        $this->assertStringContainsString('<input type="radio" name="knjenc"', $actual);
-        $this->assertStringContainsString('type="radio" name="knjenc"', $actual);
-        $this->assertStringContainsString('<input type="radio" name="knjenc" value="EUC-JP" id="kj-euc">', $actual);
-        $this->assertStringContainsString('<input type="radio" name="knjenc" value="SJIS" id="kj-sjis">', $actual);
-        $this->assertStringContainsString('<input type="checkbox" name="xkana" value="kana" id="kj-kana">', $actual);
+        self::assertStringContainsString('<input type="radio" name="knjenc"', $actual);
+        self::assertStringContainsString('type="radio" name="knjenc"', $actual);
+        self::assertStringContainsString('<input type="radio" name="knjenc" value="EUC-JP" id="kj-euc">', $actual);
+        self::assertStringContainsString('<input type="radio" name="knjenc" value="SJIS" id="kj-sjis">', $actual);
+        self::assertStringContainsString('<input type="checkbox" name="xkana" value="kana" id="kj-kana">', $actual);
     }
 
     public function testListEncodings(): void
     {
         $GLOBALS['cfg']['AvailableCharsets'] = ['utf-8'];
         $result = Encoding::listEncodings();
-        $this->assertContains('utf-8', $result);
+        self::assertContains('utf-8', $result);
     }
 }
diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php
index 1be43f6603..ed854eaa35 100644
--- a/test/classes/Engines/BdbTest.php
+++ b/test/classes/Engines/BdbTest.php
@@ -43,28 +43,25 @@ class BdbTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            [
-                'version_bdb' => [
-                    'title' => __('Version information'),
-                ],
-                'bdb_cache_size' => ['type' => 1],
-                'bdb_home' => [],
-                'bdb_log_buffer_size' => ['type' => 1],
-                'bdb_logdir' => [],
-                'bdb_max_lock' => ['type' => 2],
-                'bdb_shared_data' => [],
-                'bdb_tmpdir' => [],
-                'bdb_data_direct' => [],
-                'bdb_lock_detect' => [],
-                'bdb_log_direct' => [],
-                'bdb_no_recover' => [],
-                'bdb_no_sync' => [],
-                'skip_sync_bdb_logs' => [],
-                'sync_bdb_logs' => [],
-            ]
-        );
+        self::assertSame($this->object->getVariables(), [
+            'version_bdb' => [
+                'title' => __('Version information'),
+            ],
+            'bdb_cache_size' => ['type' => 1],
+            'bdb_home' => [],
+            'bdb_log_buffer_size' => ['type' => 1],
+            'bdb_logdir' => [],
+            'bdb_max_lock' => ['type' => 2],
+            'bdb_shared_data' => [],
+            'bdb_tmpdir' => [],
+            'bdb_data_direct' => [],
+            'bdb_lock_detect' => [],
+            'bdb_log_direct' => [],
+            'bdb_no_recover' => [],
+            'bdb_no_sync' => [],
+            'skip_sync_bdb_logs' => [],
+            'sync_bdb_logs' => [],
+        ]);
     }
 
     /**
@@ -72,10 +69,7 @@ class BdbTest extends AbstractTestCase
      */
     public function testGetVariablesLikePattern(): void
     {
-        $this->assertEquals(
-            $this->object->getVariablesLikePattern(),
-            '%bdb%'
-        );
+        self::assertSame($this->object->getVariablesLikePattern(), '%bdb%');
     }
 
     /**
@@ -83,9 +77,6 @@ class BdbTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'bdb'
-        );
+        self::assertSame($this->object->getMysqlHelpPage(), 'bdb');
     }
 }
diff --git a/test/classes/Engines/BinlogTest.php b/test/classes/Engines/BinlogTest.php
index 045dc6d983..dc1c7b5d3b 100644
--- a/test/classes/Engines/BinlogTest.php
+++ b/test/classes/Engines/BinlogTest.php
@@ -41,9 +41,6 @@ class BinlogTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'binary-log'
-        );
+        self::assertSame($this->object->getMysqlHelpPage(), 'binary-log');
     }
 }
diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
index 268ef2e322..51f241512d 100644
--- a/test/classes/Engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -43,62 +43,59 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            [
-                'innodb_data_home_dir' => [
-                    'title' => __('Data home directory'),
-                    'desc' => __('The common part of the directory path for all InnoDB data files.'),
-                ],
-                'innodb_data_file_path' => [
-                    'title' => __('Data files'),
-                ],
-                'innodb_autoextend_increment' => [
-                    'title' => __('Autoextend increment'),
-                    'desc' => __(
-                        'The increment size for extending the size of an autoextending tablespace when it becomes full.'
-                    ),
-                    'type' => 2,
-                ],
-                'innodb_buffer_pool_size' => [
-                    'title' => __('Buffer pool size'),
-                    'desc' => __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.'),
-                    'type' => 1,
-                ],
-                'innodb_additional_mem_pool_size' => [
-                    'title' => 'innodb_additional_mem_pool_size',
-                    'type' => 1,
-                ],
-                'innodb_buffer_pool_awe_mem_mb' => ['type' => 1],
-                'innodb_checksums' => [],
-                'innodb_commit_concurrency' => [],
-                'innodb_concurrency_tickets' => ['type' => 2],
-                'innodb_doublewrite' => [],
-                'innodb_fast_shutdown' => [],
-                'innodb_file_io_threads' => ['type' => 2],
-                'innodb_file_per_table' => [],
-                'innodb_flush_log_at_trx_commit' => [],
-                'innodb_flush_method' => [],
-                'innodb_force_recovery' => [],
-                'innodb_lock_wait_timeout' => ['type' => 2],
-                'innodb_locks_unsafe_for_binlog' => [],
-                'innodb_log_arch_dir' => [],
-                'innodb_log_archive' => [],
-                'innodb_log_buffer_size' => ['type' => 1],
-                'innodb_log_file_size' => ['type' => 1],
-                'innodb_log_files_in_group' => ['type' => 2],
-                'innodb_log_group_home_dir' => [],
-                'innodb_max_dirty_pages_pct' => ['type' => 2],
-                'innodb_max_purge_lag' => [],
-                'innodb_mirrored_log_groups' => ['type' => 2],
-                'innodb_open_files' => ['type' => 2],
-                'innodb_support_xa' => [],
-                'innodb_sync_spin_loops' => ['type' => 2],
-                'innodb_table_locks' => ['type' => 3],
-                'innodb_thread_concurrency' => ['type' => 2],
-                'innodb_thread_sleep_delay' => ['type' => 2],
+        self::assertSame([
+            'innodb_data_home_dir' => [
+                'title' => __('Data home directory'),
+                'desc' => __('The common part of the directory path for all InnoDB data files.'),
             ],
-            $this->object->getVariables()
-        );
+            'innodb_data_file_path' => [
+                'title' => __('Data files'),
+            ],
+            'innodb_autoextend_increment' => [
+                'title' => __('Autoextend increment'),
+                'desc' => __(
+                    'The increment size for extending the size of an autoextending tablespace when it becomes full.'
+                ),
+                'type' => 2,
+            ],
+            'innodb_buffer_pool_size' => [
+                'title' => __('Buffer pool size'),
+                'desc' => __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.'),
+                'type' => 1,
+            ],
+            'innodb_additional_mem_pool_size' => [
+                'title' => 'innodb_additional_mem_pool_size',
+                'type' => 1,
+            ],
+            'innodb_buffer_pool_awe_mem_mb' => ['type' => 1],
+            'innodb_checksums' => [],
+            'innodb_commit_concurrency' => [],
+            'innodb_concurrency_tickets' => ['type' => 2],
+            'innodb_doublewrite' => [],
+            'innodb_fast_shutdown' => [],
+            'innodb_file_io_threads' => ['type' => 2],
+            'innodb_file_per_table' => [],
+            'innodb_flush_log_at_trx_commit' => [],
+            'innodb_flush_method' => [],
+            'innodb_force_recovery' => [],
+            'innodb_lock_wait_timeout' => ['type' => 2],
+            'innodb_locks_unsafe_for_binlog' => [],
+            'innodb_log_arch_dir' => [],
+            'innodb_log_archive' => [],
+            'innodb_log_buffer_size' => ['type' => 1],
+            'innodb_log_file_size' => ['type' => 1],
+            'innodb_log_files_in_group' => ['type' => 2],
+            'innodb_log_group_home_dir' => [],
+            'innodb_max_dirty_pages_pct' => ['type' => 2],
+            'innodb_max_purge_lag' => [],
+            'innodb_mirrored_log_groups' => ['type' => 2],
+            'innodb_open_files' => ['type' => 2],
+            'innodb_support_xa' => [],
+            'innodb_sync_spin_loops' => ['type' => 2],
+            'innodb_table_locks' => ['type' => 3],
+            'innodb_thread_concurrency' => ['type' => 2],
+            'innodb_thread_sleep_delay' => ['type' => 2],
+        ], $this->object->getVariables());
     }
 
     /**
@@ -106,10 +103,7 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetVariablesLikePattern(): void
     {
-        $this->assertEquals(
-            'innodb\\_%',
-            $this->object->getVariablesLikePattern()
-        );
+        self::assertSame('innodb\\_%', $this->object->getVariablesLikePattern());
     }
 
     /**
@@ -117,18 +111,12 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetInfoPages(): void
     {
-        $this->assertEquals(
-            [],
-            $this->object->getInfoPages()
-        );
+        self::assertSame([], $this->object->getInfoPages());
         $this->object->support = 2;
-        $this->assertEquals(
-            [
-                'Bufferpool' => 'Buffer Pool',
-                'Status' => 'InnoDB Status',
-            ],
-            $this->object->getInfoPages()
-        );
+        self::assertSame([
+            'Bufferpool' => 'Buffer Pool',
+            'Status' => 'InnoDB Status',
+        ], $this->object->getInfoPages());
     }
 
     /**
@@ -136,82 +124,79 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetPageBufferpool(): void
     {
-        $this->assertEquals(
-            '<table class="table table-striped table-hover w-auto float-start caption-top">' . "\n" .
-            '    <caption>' . "\n" .
-            '        Buffer Pool Usage' . "\n" .
-            '    </caption>' . "\n" .
-            '    <tfoot>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th colspan="2">' . "\n" .
-            '                Total: 4,096&nbsp;pages / 65,536&nbsp;KiB' . "\n" .
-            '            </th>' . "\n" .
-            '        </tr>' . "\n" .
-            '    </tfoot>' . "\n" .
-            '    <tbody>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Free pages</th>' . "\n" .
-            '            <td class="font-monospace text-end">0</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Dirty pages</th>' . "\n" .
-            '            <td class="font-monospace text-end">0</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Pages containing data</th>' . "\n" .
-            '            <td class="font-monospace text-end">0' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Pages to be flushed</th>' . "\n" .
-            '            <td class="font-monospace text-end">0' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Busy pages</th>' . "\n" .
-            '            <td class="font-monospace text-end">0' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>    </tbody>' . "\n" .
-            '</table>' . "\n\n" .
-            '<table class="table table-striped table-hover w-auto ms-4 float-start caption-top">' . "\n" .
-            '    <caption>' . "\n" .
-            '        Buffer Pool Activity' . "\n" .
-            '    </caption>' . "\n" .
-            '    <tbody>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Read requests</th>' . "\n" .
-            '            <td class="font-monospace text-end">64' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Write requests</th>' . "\n" .
-            '            <td class="font-monospace text-end">64' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Read misses</th>' . "\n" .
-            '            <td class="font-monospace text-end">32' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Write waits</th>' . "\n" .
-            '            <td class="font-monospace text-end">0' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Read misses in %</th>' . "\n" .
-            '            <td class="font-monospace text-end">50   %' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '        <tr>' . "\n" .
-            '            <th scope="row">Write waits in %</th>' . "\n" .
-            '            <td class="font-monospace text-end">0 %' . "\n" .
-            '</td>' . "\n" .
-            '        </tr>' . "\n" .
-            '    </tbody>' . "\n" .
-            '</table>' . "\n",
-            $this->object->getPageBufferpool()
-        );
+        self::assertSame('<table class="table table-striped table-hover w-auto float-start caption-top">' . "\n" .
+        '    <caption>' . "\n" .
+        '        Buffer Pool Usage' . "\n" .
+        '    </caption>' . "\n" .
+        '    <tfoot>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th colspan="2">' . "\n" .
+        '                Total: 4,096&nbsp;pages / 65,536&nbsp;KiB' . "\n" .
+        '            </th>' . "\n" .
+        '        </tr>' . "\n" .
+        '    </tfoot>' . "\n" .
+        '    <tbody>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Free pages</th>' . "\n" .
+        '            <td class="font-monospace text-end">0</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Dirty pages</th>' . "\n" .
+        '            <td class="font-monospace text-end">0</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Pages containing data</th>' . "\n" .
+        '            <td class="font-monospace text-end">0' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Pages to be flushed</th>' . "\n" .
+        '            <td class="font-monospace text-end">0' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Busy pages</th>' . "\n" .
+        '            <td class="font-monospace text-end">0' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>    </tbody>' . "\n" .
+        '</table>' . "\n\n" .
+        '<table class="table table-striped table-hover w-auto ms-4 float-start caption-top">' . "\n" .
+        '    <caption>' . "\n" .
+        '        Buffer Pool Activity' . "\n" .
+        '    </caption>' . "\n" .
+        '    <tbody>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Read requests</th>' . "\n" .
+        '            <td class="font-monospace text-end">64' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Write requests</th>' . "\n" .
+        '            <td class="font-monospace text-end">64' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Read misses</th>' . "\n" .
+        '            <td class="font-monospace text-end">32' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Write waits</th>' . "\n" .
+        '            <td class="font-monospace text-end">0' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Read misses in %</th>' . "\n" .
+        '            <td class="font-monospace text-end">50   %' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '        <tr>' . "\n" .
+        '            <th scope="row">Write waits in %</th>' . "\n" .
+        '            <td class="font-monospace text-end">0 %' . "\n" .
+        '</td>' . "\n" .
+        '        </tr>' . "\n" .
+        '    </tbody>' . "\n" .
+        '</table>' . "\n", $this->object->getPageBufferpool());
     }
 
     /**
@@ -219,10 +204,7 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetPageStatus(): void
     {
-        $this->assertEquals(
-            '<pre id="pre_innodb_status">' . "\n\n" . '</pre>' . "\n",
-            $this->object->getPageStatus()
-        );
+        self::assertSame('<pre id="pre_innodb_status">' . "\n\n" . '</pre>' . "\n", $this->object->getPageStatus());
     }
 
     /**
@@ -230,15 +212,9 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetPage(): void
     {
-        $this->assertEquals(
-            '',
-            $this->object->getPage('Status')
-        );
+        self::assertSame('', $this->object->getPage('Status'));
         $this->object->support = 2;
-        $this->assertEquals(
-            '<pre id="pre_innodb_status">' . "\n\n" . '</pre>' . "\n",
-            $this->object->getPage('Status')
-        );
+        self::assertSame('<pre id="pre_innodb_status">' . "\n\n" . '</pre>' . "\n", $this->object->getPage('Status'));
     }
 
     /**
@@ -246,10 +222,7 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            'innodb-storage-engine',
-            $this->object->getMysqlHelpPage()
-        );
+        self::assertSame('innodb-storage-engine', $this->object->getMysqlHelpPage());
     }
 
     /**
@@ -257,10 +230,7 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetInnodbPluginVersion(): void
     {
-        $this->assertEquals(
-            '1.1.8',
-            $this->object->getInnodbPluginVersion()
-        );
+        self::assertSame('1.1.8', $this->object->getInnodbPluginVersion());
     }
 
     /**
@@ -268,9 +238,7 @@ class InnodbTest extends AbstractTestCase
      */
     public function testSupportsFilePerTable(): void
     {
-        $this->assertFalse(
-            $this->object->supportsFilePerTable()
-        );
+        self::assertFalse($this->object->supportsFilePerTable());
     }
 
     /**
@@ -278,9 +246,6 @@ class InnodbTest extends AbstractTestCase
      */
     public function testGetInnodbFileFormat(): void
     {
-        $this->assertEquals(
-            'Antelope',
-            $this->object->getInnodbFileFormat()
-        );
+        self::assertSame('Antelope', $this->object->getInnodbFileFormat());
     }
 }
diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php
index a24b1e955c..2cd431592b 100644
--- a/test/classes/Engines/MemoryTest.php
+++ b/test/classes/Engines/MemoryTest.php
@@ -41,11 +41,8 @@ class MemoryTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            [
-                'max_heap_table_size' => ['type' => 1],
-            ]
-        );
+        self::assertSame($this->object->getVariables(), [
+            'max_heap_table_size' => ['type' => 1],
+        ]);
     }
 }
diff --git a/test/classes/Engines/MrgMyisamTest.php b/test/classes/Engines/MrgMyisamTest.php
index 20ac355d6a..100fe17d3f 100644
--- a/test/classes/Engines/MrgMyisamTest.php
+++ b/test/classes/Engines/MrgMyisamTest.php
@@ -41,9 +41,6 @@ class MrgMyisamTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'merge-storage-engine'
-        );
+        self::assertSame($this->object->getMysqlHelpPage(), 'merge-storage-engine');
     }
 }
diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php
index 1ab9145aae..a90f5f8e79 100644
--- a/test/classes/Engines/MyisamTest.php
+++ b/test/classes/Engines/MyisamTest.php
@@ -43,63 +43,60 @@ class MyisamTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            [
-                'myisam_data_pointer_size' => [
-                    'title' => __('Data pointer size'),
-                    'desc' => __(
-                        'The default pointer size in bytes, to be used by CREATE'
-                        . ' TABLE for MyISAM tables when no MAX_ROWS option is specified.'
-                    ),
-                    'type' => 1,
-                ],
-                'myisam_recover_options' => [
-                    'title' => __('Automatic recovery mode'),
-                    'desc' => __(
-                        'The mode for automatic recovery of crashed MyISAM tables,'
-                        . ' as set via the --myisam-recover server startup option.'
-                    ),
-                ],
-                'myisam_max_sort_file_size' => [
-                    'title' => __('Maximum size for temporary sort files'),
-                    'desc' => __(
-                        'The maximum size of the temporary file MySQL is allowed'
-                        . ' to use while re-creating a MyISAM index (during REPAIR TABLE,'
-                        . ' ALTER TABLE, or LOAD DATA INFILE).'
-                    ),
-                    'type' => 1,
-                ],
-                'myisam_max_extra_sort_file_size' => [
-                    'title' => __('Maximum size for temporary files on index creation'),
-                    'desc' => __(
-                        'If the temporary file used for fast MyISAM index creation would'
-                        . ' be larger than using the key cache by the amount specified here,'
-                        . ' prefer the key cache method.'
-                    ),
-                    'type' => 1,
-                ],
-                'myisam_repair_threads' => [
-                    'title' => __('Repair threads'),
-                    'desc' => __(
-                        'If this value is greater than 1, MyISAM table indexes are created'
-                        . ' in parallel (each index in its own thread) during the repair by sorting process.'
-                    ),
-                    'type' => 2,
-                ],
-                'myisam_sort_buffer_size' => [
-                    'title' => __('Sort buffer size'),
-                    'desc' => __(
-                        'The buffer that is allocated when sorting MyISAM indexes during a'
-                        . ' REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.'
-                    ),
-                    'type' => 1,
-                ],
-                'myisam_stats_method' => [],
-                'delay_key_write' => [],
-                'bulk_insert_buffer_size' => ['type' => 1],
-                'skip_external_locking' => [],
-            ]
-        );
+        self::assertSame($this->object->getVariables(), [
+            'myisam_data_pointer_size' => [
+                'title' => __('Data pointer size'),
+                'desc' => __(
+                    'The default pointer size in bytes, to be used by CREATE'
+                    . ' TABLE for MyISAM tables when no MAX_ROWS option is specified.'
+                ),
+                'type' => 1,
+            ],
+            'myisam_recover_options' => [
+                'title' => __('Automatic recovery mode'),
+                'desc' => __(
+                    'The mode for automatic recovery of crashed MyISAM tables,'
+                    . ' as set via the --myisam-recover server startup option.'
+                ),
+            ],
+            'myisam_max_sort_file_size' => [
+                'title' => __('Maximum size for temporary sort files'),
+                'desc' => __(
+                    'The maximum size of the temporary file MySQL is allowed'
+                    . ' to use while re-creating a MyISAM index (during REPAIR TABLE,'
+                    . ' ALTER TABLE, or LOAD DATA INFILE).'
+                ),
+                'type' => 1,
+            ],
+            'myisam_max_extra_sort_file_size' => [
+                'title' => __('Maximum size for temporary files on index creation'),
+                'desc' => __(
+                    'If the temporary file used for fast MyISAM index creation would'
+                    . ' be larger than using the key cache by the amount specified here,'
+                    . ' prefer the key cache method.'
+                ),
+                'type' => 1,
+            ],
+            'myisam_repair_threads' => [
+                'title' => __('Repair threads'),
+                'desc' => __(
+                    'If this value is greater than 1, MyISAM table indexes are created'
+                    . ' in parallel (each index in its own thread) during the repair by sorting process.'
+                ),
+                'type' => 2,
+            ],
+            'myisam_sort_buffer_size' => [
+                'title' => __('Sort buffer size'),
+                'desc' => __(
+                    'The buffer that is allocated when sorting MyISAM indexes during a'
+                    . ' REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.'
+                ),
+                'type' => 1,
+            ],
+            'myisam_stats_method' => [],
+            'delay_key_write' => [],
+            'bulk_insert_buffer_size' => ['type' => 1],
+            'skip_external_locking' => [],
+        ]);
     }
 }
diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php
index b723987614..f727610d7a 100644
--- a/test/classes/Engines/NdbclusterTest.php
+++ b/test/classes/Engines/NdbclusterTest.php
@@ -41,12 +41,9 @@ class NdbclusterTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            [
-                'ndb_connectstring' => [],
-            ]
-        );
+        self::assertSame($this->object->getVariables(), [
+            'ndb_connectstring' => [],
+        ]);
     }
 
     /**
@@ -54,10 +51,7 @@ class NdbclusterTest extends AbstractTestCase
      */
     public function testGetVariablesLikePattern(): void
     {
-        $this->assertEquals(
-            $this->object->getVariablesLikePattern(),
-            'ndb\\_%'
-        );
+        self::assertSame($this->object->getVariablesLikePattern(), 'ndb\\_%');
     }
 
     /**
@@ -65,9 +59,6 @@ class NdbclusterTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'ndbcluster'
-        );
+        self::assertSame($this->object->getMysqlHelpPage(), 'ndbcluster');
     }
 }
diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
index 3597e83002..c7fa397f46 100644
--- a/test/classes/Engines/PbxtTest.php
+++ b/test/classes/Engines/PbxtTest.php
@@ -46,116 +46,113 @@ class PbxtTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            [
-                'pbxt_index_cache_size' => [
-                    'title' => __('Index cache size'),
-                    'desc' => __(
-                        'This is the amount of memory allocated to the'
-                        . ' index cache. Default value is 32MB. The memory'
-                        . ' allocated here is used only for caching index pages.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_record_cache_size' => [
-                    'title' => __('Record cache size'),
-                    'desc' => __(
-                        'This is the amount of memory allocated to the'
-                        . ' record cache used to cache table data. The default'
-                        . ' value is 32MB. This memory is used to cache changes to'
-                        . ' the handle data (.xtd) and row pointer (.xtr) files.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_log_cache_size' => [
-                    'title' => __('Log cache size'),
-                    'desc' => __(
-                        'The amount of memory allocated to the'
-                        . ' transaction log cache used to cache on transaction log'
-                        . ' data. The default is 16MB.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_log_file_threshold' => [
-                    'title' => __('Log file threshold'),
-                    'desc' => __(
-                        'The size of a transaction log before rollover,'
-                        . ' and a new log is created. The default value is 16MB.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_transaction_buffer_size' => [
-                    'title' => __('Transaction buffer size'),
-                    'desc' => __(
-                        'The size of the global transaction log buffer'
-                        . ' (the engine allocates 2 buffers of this size).'
-                        . ' The default is 1MB.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_checkpoint_frequency' => [
-                    'title' => __('Checkpoint frequency'),
-                    'desc' => __(
-                        'The amount of data written to the transaction'
-                        . ' log before a checkpoint is performed.'
-                        . ' The default value is 24MB.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_data_log_threshold' => [
-                    'title' => __('Data log threshold'),
-                    'desc' => __(
-                        'The maximum size of a data log file. The default'
-                        . ' value is 64MB. PBXT can create a maximum of 32000 data'
-                        . ' logs, which are used by all tables. So the value of'
-                        . ' this variable can be increased to increase the total'
-                        . ' amount of data that can be stored in the database.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_garbage_threshold' => [
-                    'title' => __('Garbage threshold'),
-                    'desc' => __(
-                        'The percentage of garbage in a data log file'
-                        . ' before it is compacted. This is a value between 1 and'
-                        . ' 99. The default is 50.'
-                    ),
-                    'type' => 2,
-                ],
-                'pbxt_log_buffer_size' => [
-                    'title' => __('Log buffer size'),
-                    'desc' => __(
-                        'The size of the buffer used when writing a data'
-                        . ' log. The default is 256MB. The engine allocates one'
-                        . ' buffer per thread, but only if the thread is required'
-                        . ' to write a data log.'
-                    ),
-                    'type' => 1,
-                ],
-                'pbxt_data_file_grow_size' => [
-                    'title' => __('Data file grow size'),
-                    'desc' => __('The grow size of the handle data (.xtd) files.'),
-                    'type' => 1,
-                ],
-                'pbxt_row_file_grow_size' => [
-                    'title' => __('Row file grow size'),
-                    'desc' => __('The grow size of the row pointer (.xtr) files.'),
-                    'type' => 1,
-                ],
-                'pbxt_log_file_count' => [
-                    'title' => __('Log file count'),
-                    'desc' => __(
-                        'This is the number of transaction log files'
-                        . ' (pbxt/system/xlog*.xt) the system will maintain. If the'
-                        . ' number of logs exceeds this value then old logs will be'
-                        . ' deleted, otherwise they are renamed and given the next'
-                        . ' highest number.'
-                    ),
-                    'type' => 2,
-                ],
-            ]
-        );
+        self::assertSame($this->object->getVariables(), [
+            'pbxt_index_cache_size' => [
+                'title' => __('Index cache size'),
+                'desc' => __(
+                    'This is the amount of memory allocated to the'
+                    . ' index cache. Default value is 32MB. The memory'
+                    . ' allocated here is used only for caching index pages.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_record_cache_size' => [
+                'title' => __('Record cache size'),
+                'desc' => __(
+                    'This is the amount of memory allocated to the'
+                    . ' record cache used to cache table data. The default'
+                    . ' value is 32MB. This memory is used to cache changes to'
+                    . ' the handle data (.xtd) and row pointer (.xtr) files.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_log_cache_size' => [
+                'title' => __('Log cache size'),
+                'desc' => __(
+                    'The amount of memory allocated to the'
+                    . ' transaction log cache used to cache on transaction log'
+                    . ' data. The default is 16MB.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_log_file_threshold' => [
+                'title' => __('Log file threshold'),
+                'desc' => __(
+                    'The size of a transaction log before rollover,'
+                    . ' and a new log is created. The default value is 16MB.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_transaction_buffer_size' => [
+                'title' => __('Transaction buffer size'),
+                'desc' => __(
+                    'The size of the global transaction log buffer'
+                    . ' (the engine allocates 2 buffers of this size).'
+                    . ' The default is 1MB.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_checkpoint_frequency' => [
+                'title' => __('Checkpoint frequency'),
+                'desc' => __(
+                    'The amount of data written to the transaction'
+                    . ' log before a checkpoint is performed.'
+                    . ' The default value is 24MB.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_data_log_threshold' => [
+                'title' => __('Data log threshold'),
+                'desc' => __(
+                    'The maximum size of a data log file. The default'
+                    . ' value is 64MB. PBXT can create a maximum of 32000 data'
+                    . ' logs, which are used by all tables. So the value of'
+                    . ' this variable can be increased to increase the total'
+                    . ' amount of data that can be stored in the database.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_garbage_threshold' => [
+                'title' => __('Garbage threshold'),
+                'desc' => __(
+                    'The percentage of garbage in a data log file'
+                    . ' before it is compacted. This is a value between 1 and'
+                    . ' 99. The default is 50.'
+                ),
+                'type' => 2,
+            ],
+            'pbxt_log_buffer_size' => [
+                'title' => __('Log buffer size'),
+                'desc' => __(
+                    'The size of the buffer used when writing a data'
+                    . ' log. The default is 256MB. The engine allocates one'
+                    . ' buffer per thread, but only if the thread is required'
+                    . ' to write a data log.'
+                ),
+                'type' => 1,
+            ],
+            'pbxt_data_file_grow_size' => [
+                'title' => __('Data file grow size'),
+                'desc' => __('The grow size of the handle data (.xtd) files.'),
+                'type' => 1,
+            ],
+            'pbxt_row_file_grow_size' => [
+                'title' => __('Row file grow size'),
+                'desc' => __('The grow size of the row pointer (.xtr) files.'),
+                'type' => 1,
+            ],
+            'pbxt_log_file_count' => [
+                'title' => __('Log file count'),
+                'desc' => __(
+                    'This is the number of transaction log files'
+                    . ' (pbxt/system/xlog*.xt) the system will maintain. If the'
+                    . ' number of logs exceeds this value then old logs will be'
+                    . ' deleted, otherwise they are renamed and given the next'
+                    . ' highest number.'
+                ),
+                'type' => 2,
+            ],
+        ]);
     }
 
     /**
@@ -168,10 +165,7 @@ class PbxtTest extends AbstractTestCase
      */
     public function testResolveTypeSize(string $formatted_size, array $output): void
     {
-        $this->assertEquals(
-            $this->object->resolveTypeSize($formatted_size),
-            $output
-        );
+        self::assertSame($this->object->resolveTypeSize($formatted_size), $output);
     }
 
     /**
@@ -211,10 +205,7 @@ class PbxtTest extends AbstractTestCase
      */
     public function testGetInfoPages(): void
     {
-        $this->assertEquals(
-            $this->object->getInfoPages(),
-            ['Documentation' => 'Documentation']
-        );
+        self::assertSame($this->object->getInfoPages(), ['Documentation' => 'Documentation']);
     }
 
     /**
@@ -222,23 +213,17 @@ class PbxtTest extends AbstractTestCase
      */
     public function testGetPage(): void
     {
-        $this->assertEquals(
-            $this->object->getPage('Documentation'),
-            '<p>'
-            . sprintf(
-                __(
-                    'Documentation and further information about PBXT can be found on the %sPrimeBase XT Home Page%s.'
-                ),
-                '<a href="' . Core::linkURL('https://mariadb.com/kb/en/about-pbxt/')
-                . '" rel="noopener noreferrer" target="_blank">',
-                '</a>'
-            )
-            . '</p>' . "\n"
-        );
+        self::assertSame($this->object->getPage('Documentation'), '<p>'
+        . sprintf(
+            __(
+                'Documentation and further information about PBXT can be found on the %sPrimeBase XT Home Page%s.'
+            ),
+            '<a href="' . Core::linkURL('https://mariadb.com/kb/en/about-pbxt/')
+            . '" rel="noopener noreferrer" target="_blank">',
+            '</a>'
+        )
+        . '</p>' . "\n");
 
-        $this->assertEquals(
-            $this->object->getPage('NonExistMethod'),
-            false
-        );
+        self::assertEquals($this->object->getPage('NonExistMethod'), false);
     }
 }
diff --git a/test/classes/Engines/PerformanceSchemaTest.php b/test/classes/Engines/PerformanceSchemaTest.php
index 8829cf4562..b490d1d2ac 100644
--- a/test/classes/Engines/PerformanceSchemaTest.php
+++ b/test/classes/Engines/PerformanceSchemaTest.php
@@ -41,9 +41,6 @@ class PerformanceSchemaTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'performance-schema'
-        );
+        self::assertSame($this->object->getMysqlHelpPage(), 'performance-schema');
     }
 }
diff --git a/test/classes/EnvironmentTest.php b/test/classes/EnvironmentTest.php
index 97df64cd2f..2f3df3dda9 100644
--- a/test/classes/EnvironmentTest.php
+++ b/test/classes/EnvironmentTest.php
@@ -18,9 +18,6 @@ class EnvironmentTest extends AbstractTestCase
      */
     public function testPhpVersion(): void
     {
-        $this->assertTrue(
-            version_compare('7.2.5', PHP_VERSION, '<='),
-            'phpMyAdmin requires PHP 7.2.5 or above'
-        );
+        self::assertTrue(version_compare('7.2.5', PHP_VERSION, '<='), 'phpMyAdmin requires PHP 7.2.5 or above');
     }
 }
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index fb140a3f65..5a2fdcc50d 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -13,7 +13,6 @@ use ReflectionProperty;
 
 use function array_keys;
 use function array_pop;
-use function count;
 
 use const E_ERROR;
 use const E_RECOVERABLE_ERROR;
@@ -110,10 +109,10 @@ class ErrorHandlerTest extends AbstractTestCase
         $output = $this->object->getDispErrors();
 
         if ($output_hide === '') {
-            $this->assertEquals('', $output);
+            self::assertSame('', $output);
         } else {
-            $this->assertNotEmpty($output_show);// Useless check
-            $this->assertStringContainsString($output_hide, $output);
+            self::assertNotEmpty($output_show);// Useless check
+            self::assertStringContainsString($output_hide, $output);
         }
     }
 
@@ -142,11 +141,8 @@ class ErrorHandlerTest extends AbstractTestCase
     ): void {
         $this->object->handleError($errno, $errstr, $errfile, $errline);
 
-        $this->assertIsString($output_hide);// Useless check
-        $this->assertStringContainsString(
-            $output_show,
-            $this->object->getDispErrors()
-        );
+        self::assertIsString($output_hide);// Useless check
+        self::assertStringContainsString($output_show, $this->object->getDispErrors());
     }
 
     /**
@@ -160,7 +156,7 @@ class ErrorHandlerTest extends AbstractTestCase
             'checkSavedErrors',
             []
         );
-        $this->assertArrayNotHasKey('errors', $_SESSION);
+        self::assertArrayNotHasKey('errors', $_SESSION);
     }
 
     /**
@@ -171,10 +167,7 @@ class ErrorHandlerTest extends AbstractTestCase
     public function testCountErrors(): void
     {
         $this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
-        $this->assertEquals(
-            1,
-            $this->object->countErrors()
-        );
+        self::assertSame(1, $this->object->countErrors());
     }
 
     /**
@@ -186,26 +179,11 @@ class ErrorHandlerTest extends AbstractTestCase
     {
         $this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
         $this->object->addError('Compile Error', E_WARNING, 'error.txt', 16);
-        $this->assertEquals(
-            2,
-            $this->object->countErrors()
-        );
-        $this->assertEquals(
-            [],
-            $this->object->sliceErrors(2)
-        );
-        $this->assertEquals(
-            2,
-            $this->object->countErrors()
-        );
-        $this->assertCount(
-            1,
-            $this->object->sliceErrors(1)
-        );
-        $this->assertEquals(
-            1,
-            $this->object->countErrors()
-        );
+        self::assertSame(2, $this->object->countErrors());
+        self::assertSame([], $this->object->sliceErrors(2));
+        self::assertSame(2, $this->object->countErrors());
+        self::assertCount(1, $this->object->sliceErrors(1));
+        self::assertSame(1, $this->object->countErrors());
     }
 
     /**
@@ -220,34 +198,31 @@ class ErrorHandlerTest extends AbstractTestCase
         }
 
         // 10 initial items
-        $this->assertEquals(10, $this->object->countErrors());
-        $this->assertEquals(10, count($this->object->getCurrentErrors()));
+        self::assertSame(10, $this->object->countErrors());
+        self::assertCount(10, $this->object->getCurrentErrors());
 
         // slice 9 elements, returns one 10 - 9
         $elements = $this->object->sliceErrors(9);
         $firstKey = array_keys($elements)[0];
 
         // Gives the last element
-        $this->assertEquals(
-            [
-                $firstKey => $elements[$firstKey],
-            ],
-            $elements
-        );
-        $this->assertEquals(9, count($this->object->getCurrentErrors()));
-        $this->assertEquals(9, $this->object->countErrors());
+        self::assertSame([
+            $firstKey => $elements[$firstKey],
+        ], $elements);
+        self::assertCount(9, $this->object->getCurrentErrors());
+        self::assertSame(9, $this->object->countErrors());
 
         // Slice as much as there is (9), does nothing
         $elements = $this->object->sliceErrors(9);
-        $this->assertEquals([], $elements);
-        $this->assertEquals(9, count($this->object->getCurrentErrors()));
-        $this->assertEquals(9, $this->object->countErrors());
+        self::assertSame([], $elements);
+        self::assertCount(9, $this->object->getCurrentErrors());
+        self::assertSame(9, $this->object->countErrors());
 
         // Slice 0, removes everything
         $elements = $this->object->sliceErrors(0);
-        $this->assertEquals(9, count($elements));
-        $this->assertEquals(0, count($this->object->getCurrentErrors()));
-        $this->assertEquals(0, $this->object->countErrors());
+        self::assertCount(9, $elements);
+        self::assertCount(0, $this->object->getCurrentErrors());
+        self::assertSame(0, $this->object->countErrors());
     }
 
     /**
@@ -256,15 +231,9 @@ class ErrorHandlerTest extends AbstractTestCase
     public function testCountUserErrors(): void
     {
         $this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
-        $this->assertEquals(
-            0,
-            $this->object->countUserErrors()
-        );
+        self::assertSame(0, $this->object->countUserErrors());
         $this->object->addError('Compile Error', E_USER_WARNING, 'error.txt', 15);
-        $this->assertEquals(
-            1,
-            $this->object->countUserErrors()
-        );
+        self::assertSame(1, $this->object->countUserErrors());
     }
 
     /**
@@ -272,7 +241,7 @@ class ErrorHandlerTest extends AbstractTestCase
      */
     public function testHasUserErrors(): void
     {
-        $this->assertFalse($this->object->hasUserErrors());
+        self::assertFalse($this->object->hasUserErrors());
     }
 
     /**
@@ -280,7 +249,7 @@ class ErrorHandlerTest extends AbstractTestCase
      */
     public function testHasErrors(): void
     {
-        $this->assertFalse($this->object->hasErrors());
+        self::assertFalse($this->object->hasErrors());
     }
 
     /**
@@ -288,10 +257,7 @@ class ErrorHandlerTest extends AbstractTestCase
      */
     public function testCountDisplayErrorsForDisplayTrue(): void
     {
-        $this->assertEquals(
-            0,
-            $this->object->countDisplayErrors()
-        );
+        self::assertSame(0, $this->object->countDisplayErrors());
     }
 
     /**
@@ -299,10 +265,7 @@ class ErrorHandlerTest extends AbstractTestCase
      */
     public function testCountDisplayErrorsForDisplayFalse(): void
     {
-        $this->assertEquals(
-            0,
-            $this->object->countDisplayErrors()
-        );
+        self::assertSame(0, $this->object->countDisplayErrors());
     }
 
     /**
@@ -310,7 +273,7 @@ class ErrorHandlerTest extends AbstractTestCase
      */
     public function testHasDisplayErrors(): void
     {
-        $this->assertFalse($this->object->hasDisplayErrors());
+        self::assertFalse($this->object->hasDisplayErrors());
     }
 
     public function testHandleExceptionForDevEnv(): void
@@ -325,18 +288,18 @@ class ErrorHandlerTest extends AbstractTestCase
         $property->setValue(null, $responseStub);
         $responseStub->setHeadersSent(true);
         $errorHandler = new ErrorHandler();
-        $this->assertSame([], $errorHandler->getCurrentErrors());
+        self::assertSame([], $errorHandler->getCurrentErrors());
         $errorHandler->handleException(new Exception('Exception message.'));
         $output = $responseStub->getHTMLResult();
         $errors = $errorHandler->getCurrentErrors();
-        $this->assertCount(1, $errors);
+        self::assertCount(1, $errors);
         $error = array_pop($errors);
-        $this->assertInstanceOf(Error::class, $error);
-        $this->assertSame('Exception: Exception message.', $error->getOnlyMessage());
-        $this->assertStringContainsString($error->getDisplay(), $output);
-        $this->assertStringContainsString('Internal error', $output);
-        $this->assertStringContainsString('ErrorHandlerTest.php#' . $error->getLine(), $output);
-        $this->assertStringContainsString('Exception: Exception message.', $output);
+        self::assertInstanceOf(Error::class, $error);
+        self::assertSame('Exception: Exception message.', $error->getOnlyMessage());
+        self::assertStringContainsString($error->getDisplay(), $output);
+        self::assertStringContainsString('Internal error', $output);
+        self::assertStringContainsString('ErrorHandlerTest.php#' . $error->getLine(), $output);
+        self::assertStringContainsString('Exception: Exception message.', $output);
     }
 
     public function testHandleExceptionForProdEnv(): void
@@ -351,18 +314,18 @@ class ErrorHandlerTest extends AbstractTestCase
         $property->setValue(null, $responseStub);
         $responseStub->setHeadersSent(true);
         $errorHandler = new ErrorHandler();
-        $this->assertSame([], $errorHandler->getCurrentErrors());
+        self::assertSame([], $errorHandler->getCurrentErrors());
         $errorHandler->handleException(new Exception('Exception message.'));
         $output = $responseStub->getHTMLResult();
         $errors = $errorHandler->getCurrentErrors();
-        $this->assertCount(1, $errors);
+        self::assertCount(1, $errors);
         $error = array_pop($errors);
-        $this->assertInstanceOf(Error::class, $error);
-        $this->assertSame('Exception: Exception message.', $error->getOnlyMessage());
-        $this->assertStringContainsString($error->getDisplay(), $output);
-        $this->assertStringContainsString('Exception: Exception message.', $output);
-        $this->assertStringNotContainsString('Internal error', $output);
-        $this->assertStringNotContainsString('ErrorHandlerTest.php#' . $error->getLine(), $output);
+        self::assertInstanceOf(Error::class, $error);
+        self::assertSame('Exception: Exception message.', $error->getOnlyMessage());
+        self::assertStringContainsString($error->getDisplay(), $output);
+        self::assertStringContainsString('Exception: Exception message.', $output);
+        self::assertStringNotContainsString('Internal error', $output);
+        self::assertStringNotContainsString('ErrorHandlerTest.php#' . $error->getLine(), $output);
     }
 
     public function testAddErrorWithFatalErrorAndHeadersSent(): void
@@ -387,8 +350,8 @@ class ErrorHandlerTest extends AbstractTestCase
 HTML;
 
         $output = $responseStub->getHTMLResult();
-        $this->assertStringStartsWith($expectedStart, $output);
-        $this->assertStringEndsWith('</div></body></html>', $output);
+        self::assertStringStartsWith($expectedStart, $output);
+        self::assertStringEndsWith('</div></body></html>', $output);
     }
 
     public function testAddErrorWithFatalErrorAndHeadersNotSent(): void
@@ -414,7 +377,7 @@ HTML;
 HTML;
 
         $output = $responseStub->getHTMLResult();
-        $this->assertStringStartsWith($expectedStart, $output);
-        $this->assertStringEndsWith('</div></body></html>', $output);
+        self::assertStringStartsWith($expectedStart, $output);
+        self::assertStringEndsWith('</div></body></html>', $output);
     }
 }
diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php
index b5fc4b4b82..b6cd9d2ffd 100644
--- a/test/classes/ErrorReportTest.php
+++ b/test/classes/ErrorReportTest.php
@@ -52,15 +52,15 @@ class ErrorReportTest extends AbstractTestCase
     public function testGetData(): void
     {
         $actual = $this->errorReport->getData('unknown');
-        $this->assertEquals([], $actual);
+        self::assertSame([], $actual);
 
         $actual = $this->errorReport->getData('php');
-        $this->assertEquals([], $actual);
+        self::assertSame([], $actual);
 
         $_SESSION['prev_errors'] = [];
 
         $actual = $this->errorReport->getData('php');
-        $this->assertEquals([], $actual);
+        self::assertSame([], $actual);
 
         $_SESSION['prev_errors'] = [
             new Error(0, 'error 0', 'file', 1),
@@ -99,7 +99,7 @@ class ErrorReportTest extends AbstractTestCase
         ];
 
         $actual = $this->errorReport->getData('php');
-        $this->assertEquals($report, $actual);
+        self::assertSame($report, $actual);
     }
 
     public function testSend(): void
@@ -130,7 +130,7 @@ class ErrorReportTest extends AbstractTestCase
         );
         $this->errorReport->setSubmissionUrl($submissionUrl);
 
-        $this->assertEquals($return, $this->errorReport->send($report));
+        self::assertSame($return, $this->errorReport->send($report));
     }
 
     public function testGetForm(): void
@@ -138,7 +138,7 @@ class ErrorReportTest extends AbstractTestCase
         $_POST['exception'] = [];
 
         $form = $this->errorReport->getForm();
-        $this->assertStringContainsString('<pre class="pre-scrollable">[]</pre>', $form);
+        self::assertStringContainsString('<pre class="pre-scrollable">[]</pre>', $form);
 
         $context = [
             'Widget.prototype = {',
@@ -203,7 +203,7 @@ class ErrorReportTest extends AbstractTestCase
         $expectedData = json_encode($report, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 
         $form = $this->errorReport->getForm();
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<pre class="pre-scrollable">' . htmlspecialchars((string) $expectedData, ENT_QUOTES) . '</pre>',
             $form
         );
@@ -268,7 +268,7 @@ class ErrorReportTest extends AbstractTestCase
         $data['stack'][1]['context'][1] = '!function(e,t){"use strict";"object"='
                                         . '=typeof module&&"object"==typeof modul//...';
 
-        $this->assertEquals($data, $actual['exception']);
+        self::assertSame($data, $actual['exception']);
     }
 
     /**
@@ -349,14 +349,11 @@ class ErrorReportTest extends AbstractTestCase
     public function testSanitizeUrl(string $url, array $result): void
     {
         // $this->errorReport->sanitizeUrl
-        $this->assertSame(
-            $result,
-            $this->callFunction(
-                $this->errorReport,
-                ErrorReport::class,
-                'sanitizeUrl',
-                [$url]
-            )
-        );
+        self::assertSame($result, $this->callFunction(
+            $this->errorReport,
+            ErrorReport::class,
+            'sanitizeUrl',
+            [$url]
+        ));
     }
 }
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index 546cc7a2b3..a138c0e445 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -53,7 +53,7 @@ class ErrorTest extends AbstractTestCase
         ];
         $this->object->setBacktrace($bt);
         $bt[0]['args']['foo'] = '<Class:PhpMyAdmin\Tests\ErrorTest>';
-        $this->assertEquals($bt, $this->object->getBacktrace());
+        self::assertSame($bt, $this->object->getBacktrace());
     }
 
     /**
@@ -62,7 +62,7 @@ class ErrorTest extends AbstractTestCase
     public function testSetLine(): void
     {
         $this->object->setLine(15);
-        $this->assertEquals(15, $this->object->getLine());
+        self::assertSame(15, $this->object->getLine());
     }
 
     /**
@@ -76,7 +76,7 @@ class ErrorTest extends AbstractTestCase
     public function testSetFile(string $file, string $expected): void
     {
         $this->object->setFile($file);
-        $this->assertEquals($expected, $this->object->getFile());
+        self::assertSame($expected, $this->object->getFile());
     }
 
     /**
@@ -108,10 +108,7 @@ class ErrorTest extends AbstractTestCase
      */
     public function testGetHash(): void
     {
-        $this->assertEquals(
-            1,
-            preg_match('/^([a-z0-9]*)$/', $this->object->getHash())
-        );
+        self::assertSame(1, preg_match('/^([a-z0-9]*)$/', $this->object->getHash()));
     }
 
     /**
@@ -121,7 +118,7 @@ class ErrorTest extends AbstractTestCase
      */
     public function testGetBacktraceDisplay(): void
     {
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'PHPUnit\Framework\TestResult->run(<Class:PhpMyAdmin\Tests\ErrorTest>)<br>',
             $this->object->getBacktraceDisplay()
         );
@@ -132,7 +129,7 @@ class ErrorTest extends AbstractTestCase
      */
     public function testGetDisplay(): void
     {
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<div class="alert alert-danger" role="alert"><strong>Warning</strong>',
             $this->object->getDisplay()
         );
@@ -143,7 +140,7 @@ class ErrorTest extends AbstractTestCase
      */
     public function testGetHtmlTitle(): void
     {
-        $this->assertEquals('Warning: Compile Error', $this->object->getHtmlTitle());
+        self::assertSame('Warning: Compile Error', $this->object->getHtmlTitle());
     }
 
     /**
@@ -151,7 +148,7 @@ class ErrorTest extends AbstractTestCase
      */
     public function testGetTitle(): void
     {
-        $this->assertEquals('Warning: Compile Error', $this->object->getTitle());
+        self::assertSame('Warning: Compile Error', $this->object->getTitle());
     }
 
     /**
@@ -189,9 +186,9 @@ class ErrorTest extends AbstractTestCase
         $this->object->setBacktrace($bt);
 
         // case: full backtrace
-        $this->assertCount(4, $this->object->getBacktrace());
+        self::assertCount(4, $this->object->getBacktrace());
 
         // case: first 2 frames
-        $this->assertCount(2, $this->object->getBacktrace(2));
+        self::assertCount(2, $this->object->getBacktrace(2));
     }
 }
diff --git a/test/classes/Export/OptionsTest.php b/test/classes/Export/OptionsTest.php
index 0ad51d2d82..cd393cc463 100644
--- a/test/classes/Export/OptionsTest.php
+++ b/test/classes/Export/OptionsTest.php
@@ -143,7 +143,7 @@ class OptionsTest extends AbstractTestCase
             'filename_template' => 'user value for test',
         ];
 
-        $this->assertIsArray($actual);
-        $this->assertEquals($expected, $actual);
+        self::assertIsArray($actual);
+        self::assertEquals($expected, $actual);
     }
 }
diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php
index c86716a73a..cb25eb9dfa 100644
--- a/test/classes/ExportTest.php
+++ b/test/classes/ExportTest.php
@@ -89,7 +89,7 @@ class ExportTest extends AbstractTestCase
             ],
         ];
         $actual = $this->export->mergeAliases($aliases1, $aliases2);
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -99,12 +99,12 @@ class ExportTest extends AbstractTestCase
     {
         $exportPlugin = new ExportPhparray();
         $finalFileName = $this->export->getFinalFilenameAndMimetypeForFilename($exportPlugin, 'zip', 'myfilename');
-        $this->assertSame([
+        self::assertSame([
             'myfilename.php.zip',
             'application/zip',
         ], $finalFileName);
         $finalFileName = $this->export->getFinalFilenameAndMimetypeForFilename($exportPlugin, 'gzip', 'myfilename');
-        $this->assertSame([
+        self::assertSame([
             'myfilename.php.gz',
             'application/x-gzip',
         ], $finalFileName);
@@ -113,7 +113,7 @@ class ExportTest extends AbstractTestCase
             'gzip',
             'export.db1.table1.file'
         );
-        $this->assertSame([
+        self::assertSame([
             'export.db1.table1.file.php.gz',
             'application/x-gzip',
         ], $finalFileName);
diff --git a/test/classes/FieldMetadataTest.php b/test/classes/FieldMetadataTest.php
index 59e620b3d1..8d90de7f20 100644
--- a/test/classes/FieldMetadataTest.php
+++ b/test/classes/FieldMetadataTest.php
@@ -21,17 +21,17 @@ class FieldMetadataTest extends AbstractTestCase
     public function testEmptyConstruct(): void
     {
         $fm = new FieldMetadata(-1, 0, (object) []);
-        $this->assertSame('', $fm->getMappedType());
-        $this->assertFalse($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertFalse($fm->isBlob());
+        self::assertSame('', $fm->getMappedType());
+        self::assertFalse($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertFalse($fm->isBlob());
     }
 
     public function testIsBinaryStdClassAsObject(): void
@@ -39,16 +39,16 @@ class FieldMetadataTest extends AbstractTestCase
         $obj = new stdClass();
         $obj->charsetnr = 63;
         $fm = new FieldMetadata(MYSQLI_TYPE_STRING, 0, $obj);
-        $this->assertTrue($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertFalse($fm->isBlob());
+        self::assertTrue($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertFalse($fm->isBlob());
     }
 
     public function testIsBinaryCustomClassAsObject(): void
@@ -57,80 +57,80 @@ class FieldMetadataTest extends AbstractTestCase
         $obj->charsetnr = 63;
         $objmd = new FieldMetadata(MYSQLI_TYPE_STRING, 0, $obj);
         $fm = new FieldMetadata(MYSQLI_TYPE_STRING, 0, $objmd);
-        $this->assertTrue($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertFalse($fm->isBlob());
+        self::assertTrue($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertFalse($fm->isBlob());
     }
 
     public function testIsBinary(): void
     {
         $fm = new FieldMetadata(MYSQLI_TYPE_STRING, 0, (object) ['charsetnr' => 63]);
-        $this->assertTrue($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertFalse($fm->isBlob());
+        self::assertTrue($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertFalse($fm->isBlob());
     }
 
     public function testIsNumeric(): void
     {
         $fm = new FieldMetadata(MYSQLI_TYPE_INT24, MYSQLI_NUM_FLAG, (object) []);
-        $this->assertSame('int', $fm->getMappedType());
-        $this->assertFalse($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertTrue($fm->isNumeric());
-        $this->assertFalse($fm->isBlob());
+        self::assertSame('int', $fm->getMappedType());
+        self::assertFalse($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertTrue($fm->isNumeric());
+        self::assertFalse($fm->isBlob());
     }
 
     public function testIsBlob(): void
     {
         $fm = new FieldMetadata(-1, MYSQLI_BLOB_FLAG, (object) []);
-        $this->assertSame('', $fm->getMappedType());
-        $this->assertFalse($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertTrue($fm->isBlob());
+        self::assertSame('', $fm->getMappedType());
+        self::assertFalse($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertTrue($fm->isBlob());
     }
 
     public function testIsNumericFloat(): void
     {
         $fm = new FieldMetadata(MYSQLI_TYPE_FLOAT, MYSQLI_NUM_FLAG, (object) []);
-        $this->assertSame('real', $fm->getMappedType());
-        $this->assertFalse($fm->isBinary());
-        $this->assertFalse($fm->isEnum());
-        $this->assertFalse($fm->isUniqueKey());
-        $this->assertFalse($fm->isUnsigned());
-        $this->assertFalse($fm->isZerofill());
-        $this->assertFalse($fm->isSet());
-        $this->assertFalse($fm->isNotNull());
-        $this->assertFalse($fm->isPrimaryKey());
-        $this->assertFalse($fm->isMultipleKey());
-        $this->assertTrue($fm->isNumeric());
-        $this->assertFalse($fm->isBlob());
+        self::assertSame('real', $fm->getMappedType());
+        self::assertFalse($fm->isBinary());
+        self::assertFalse($fm->isEnum());
+        self::assertFalse($fm->isUniqueKey());
+        self::assertFalse($fm->isUnsigned());
+        self::assertFalse($fm->isZerofill());
+        self::assertFalse($fm->isSet());
+        self::assertFalse($fm->isNotNull());
+        self::assertFalse($fm->isPrimaryKey());
+        self::assertFalse($fm->isMultipleKey());
+        self::assertTrue($fm->isNumeric());
+        self::assertFalse($fm->isBlob());
     }
 }
diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php
index 02fdd9ec6c..9e0156d489 100644
--- a/test/classes/FileListingTest.php
+++ b/test/classes/FileListingTest.php
@@ -28,7 +28,7 @@ class FileListingTest extends AbstractTestCase
 
     public function testGetDirContent(): void
     {
-        $this->assertFalse($this->fileListing->getDirContent('nonexistent directory'));
+        self::assertFalse($this->fileListing->getDirContent('nonexistent directory'));
 
         $fixturesDir = TEST_PATH . 'test/classes/_data/file_listing';
 
@@ -37,20 +37,17 @@ class FileListingTest extends AbstractTestCase
             $dirContent = [];
         }
 
-        $this->assertSame(
-            [
-                'one.txt',
-                'two.md',
-            ],
-            array_values($dirContent)
-        );
+        self::assertSame([
+            'one.txt',
+            'two.md',
+        ], array_values($dirContent));
     }
 
     public function testGetFileSelectOptions(): void
     {
         $fixturesDir = TEST_PATH . 'test/classes/_data/file_listing';
 
-        $this->assertFalse($this->fileListing->getFileSelectOptions('nonexistent directory'));
+        self::assertFalse($this->fileListing->getFileSelectOptions('nonexistent directory'));
 
         $expectedHtmlWithoutActive = '  <option value="one.txt">' . "\n"
             . '    one.txt' . "\n"
@@ -59,10 +56,7 @@ class FileListingTest extends AbstractTestCase
             . '    two.md' . "\n"
             . '  </option>' . "\n";
 
-        $this->assertSame(
-            $expectedHtmlWithoutActive,
-            $this->fileListing->getFileSelectOptions($fixturesDir)
-        );
+        self::assertSame($expectedHtmlWithoutActive, $this->fileListing->getFileSelectOptions($fixturesDir));
 
         $expectedHtmlWithActive = '  <option value="one.txt">' . "\n"
             . '    one.txt' . "\n"
@@ -71,19 +65,13 @@ class FileListingTest extends AbstractTestCase
             . '    two.md' . "\n"
             . '  </option>' . "\n";
 
-        $this->assertSame(
-            $expectedHtmlWithActive,
-            $this->fileListing->getFileSelectOptions($fixturesDir, '', 'two.md')
-        );
+        self::assertSame($expectedHtmlWithActive, $this->fileListing->getFileSelectOptions($fixturesDir, '', 'two.md'));
 
         $expectedFilteredHtml = '  <option value="one.txt">' . "\n"
             . '    one.txt' . "\n"
             . '  </option>' . "\n";
 
-        $this->assertSame(
-            $expectedFilteredHtml,
-            $this->fileListing->getFileSelectOptions($fixturesDir, '/.*\.txt/')
-        );
+        self::assertSame($expectedFilteredHtml, $this->fileListing->getFileSelectOptions($fixturesDir, '/.*\.txt/'));
     }
 
     public function testSupportedDecompressionsEmptyList(): void
@@ -91,7 +79,7 @@ class FileListingTest extends AbstractTestCase
         $GLOBALS['cfg']['ZipDump'] = false;
         $GLOBALS['cfg']['GZipDump'] = false;
         $GLOBALS['cfg']['BZipDump'] = false;
-        $this->assertEmpty($this->fileListing->supportedDecompressions());
+        self::assertEmpty($this->fileListing->supportedDecompressions());
     }
 
     /**
@@ -102,7 +90,7 @@ class FileListingTest extends AbstractTestCase
         $GLOBALS['cfg']['ZipDump'] = true;
         $GLOBALS['cfg']['GZipDump'] = true;
         $GLOBALS['cfg']['BZipDump'] = true;
-        $this->assertEquals('gz|bz2|zip', $this->fileListing->supportedDecompressions());
+        self::assertSame('gz|bz2|zip', $this->fileListing->supportedDecompressions());
     }
 
     public function testSupportedDecompressionsPartial(): void
@@ -116,6 +104,6 @@ class FileListingTest extends AbstractTestCase
         }
 
         $extensionString .= '|zip';
-        $this->assertEquals($extensionString, $this->fileListing->supportedDecompressions());
+        self::assertSame($extensionString, $this->fileListing->supportedDecompressions());
     }
 }
diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php
index dbadf6d097..61b1369df7 100644
--- a/test/classes/FileTest.php
+++ b/test/classes/FileTest.php
@@ -34,7 +34,7 @@ class FileTest extends AbstractTestCase
     public function testMIME(string $file, string $mime): void
     {
         $arr = new File($file);
-        $this->assertEquals($mime, $arr->getCompression());
+        self::assertSame($mime, $arr->getCompression());
     }
 
     /**
@@ -48,7 +48,7 @@ class FileTest extends AbstractTestCase
     {
         $data = '0x' . bin2hex((string) file_get_contents($file));
         $file = new File($file);
-        $this->assertEquals($data, $file->getContent());
+        self::assertSame($data, $file->getContent());
     }
 
     /**
@@ -65,7 +65,7 @@ class FileTest extends AbstractTestCase
         $file = new File($file);
         $file->setDecompressContent(true);
         $file->open();
-        $this->assertEquals("TEST FILE\n", $file->read(100));
+        self::assertSame("TEST FILE\n", $file->read(100));
         $file->close();
     }
 
diff --git a/test/classes/FlashMessagesTest.php b/test/classes/FlashMessagesTest.php
index e4dac486d0..62682fda7e 100644
--- a/test/classes/FlashMessagesTest.php
+++ b/test/classes/FlashMessagesTest.php
@@ -16,10 +16,10 @@ class FlashMessagesTest extends AbstractTestCase
 
     public function testConstructor(): void
     {
-        $this->assertArrayNotHasKey(self::STORAGE_KEY, $_SESSION);
+        self::assertArrayNotHasKey(self::STORAGE_KEY, $_SESSION);
         $flash = new FlashMessages();
-        $this->assertIsArray($_SESSION[self::STORAGE_KEY]);
-        $this->assertSame([], $flash->getMessages());
+        self::assertIsArray($_SESSION[self::STORAGE_KEY]);
+        self::assertSame([], $flash->getMessages());
     }
 
     public function testConstructorSessionNotFound(): void
@@ -33,11 +33,11 @@ class FlashMessagesTest extends AbstractTestCase
     public function testAddMessage(): void
     {
         $flash = new FlashMessages();
-        $this->assertArrayNotHasKey('error', $_SESSION[self::STORAGE_KEY]);
+        self::assertArrayNotHasKey('error', $_SESSION[self::STORAGE_KEY]);
         $flash->addMessage('error', 'Error');
-        $this->assertArrayHasKey('error', $_SESSION[self::STORAGE_KEY]);
-        $this->assertIsArray($_SESSION[self::STORAGE_KEY]['error']);
-        $this->assertEquals(['Error'], $_SESSION[self::STORAGE_KEY]['error']);
+        self::assertArrayHasKey('error', $_SESSION[self::STORAGE_KEY]);
+        self::assertIsArray($_SESSION[self::STORAGE_KEY]['error']);
+        self::assertSame(['Error'], $_SESSION[self::STORAGE_KEY]['error']);
     }
 
     public function testGetMessage(): void
@@ -45,9 +45,9 @@ class FlashMessagesTest extends AbstractTestCase
         $_SESSION[self::STORAGE_KEY] = ['warning' => ['Warning']];
         $flash = new FlashMessages();
         $message = $flash->getMessage('error');
-        $this->assertNull($message);
+        self::assertNull($message);
         $message = $flash->getMessage('warning');
-        $this->assertEquals(['Warning'], $message);
+        self::assertSame(['Warning'], $message);
     }
 
     public function testGetMessages(): void
@@ -59,12 +59,9 @@ class FlashMessagesTest extends AbstractTestCase
         $flash = new FlashMessages();
         $flash->addMessage('notice', 'Notice');
         $messages = $flash->getMessages();
-        $this->assertEquals(
-            [
-                'error' => ['Error1', 'Error2'],
-                'warning' => ['Warning'],
-            ],
-            $messages
-        );
+        self::assertSame([
+            'error' => ['Error1', 'Error2'],
+            'warning' => ['Warning'],
+        ], $messages);
     }
 }
diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php
index e392b9d82f..0a89bc92fc 100644
--- a/test/classes/FontTest.php
+++ b/test/classes/FontTest.php
@@ -29,118 +29,61 @@ class FontTest extends AbstractTestCase
     public function testGetStringWidth(): void
     {
         // empty string
-        $this->assertEquals(
-            0,
-            $this->font->getStringWidth('', 'arial', 10)
-        );
+        self::assertSame(0, $this->font->getStringWidth('', 'arial', 10));
 
         // empty string
-        $this->assertEquals(
-            3,
-            $this->font->getStringWidth(' ', 'arial', 10)
-        );
+        self::assertSame(3, $this->font->getStringWidth(' ', 'arial', 10));
 
         // string "a"
-        $this->assertEquals(
-            6,
-            $this->font->getStringWidth('a', 'arial', 10)
-        );
+        self::assertSame(6, $this->font->getStringWidth('a', 'arial', 10));
 
         // string "aa"
-        $this->assertEquals(
-            12,
-            $this->font->getStringWidth('aa', 'arial', 10)
-        );
+        self::assertSame(12, $this->font->getStringWidth('aa', 'arial', 10));
 
         // string "i"
-        $this->assertEquals(
-            3,
-            $this->font->getStringWidth('i', 'arial', 10)
-        );
+        self::assertSame(3, $this->font->getStringWidth('i', 'arial', 10));
 
         // string "f"
-        $this->assertEquals(
-            3,
-            $this->font->getStringWidth('f', 'arial', 10)
-        );
+        self::assertSame(3, $this->font->getStringWidth('f', 'arial', 10));
 
         // string "t"
-        $this->assertEquals(
-            3,
-            $this->font->getStringWidth('t', 'arial', 10)
-        );
+        self::assertSame(3, $this->font->getStringWidth('t', 'arial', 10));
 
         // string "if"
-        $this->assertEquals(
-            5,
-            $this->font->getStringWidth('if', 'arial', 10)
-        );
+        self::assertSame(5, $this->font->getStringWidth('if', 'arial', 10));
 
         // string "it"
-        $this->assertEquals(
-            6,
-            $this->font->getStringWidth('it', 'arial', 10)
-        );
+        self::assertSame(6, $this->font->getStringWidth('it', 'arial', 10));
 
         // string "r"
-        $this->assertEquals(
-            4,
-            $this->font->getStringWidth('r', 'arial', 10)
-        );
+        self::assertSame(4, $this->font->getStringWidth('r', 'arial', 10));
 
         // string "1"
-        $this->assertEquals(
-            5,
-            $this->font->getStringWidth('1', 'arial', 10)
-        );
+        self::assertSame(5, $this->font->getStringWidth('1', 'arial', 10));
 
         // string "c"
-        $this->assertEquals(
-            5,
-            $this->font->getStringWidth('c', 'arial', 10)
-        );
+        self::assertSame(5, $this->font->getStringWidth('c', 'arial', 10));
 
         // string "F"
-        $this->assertEquals(
-            7,
-            $this->font->getStringWidth('F', 'arial', 10)
-        );
+        self::assertSame(7, $this->font->getStringWidth('F', 'arial', 10));
 
         // string "A"
-        $this->assertEquals(
-            7,
-            $this->font->getStringWidth('A', 'arial', 10)
-        );
+        self::assertSame(7, $this->font->getStringWidth('A', 'arial', 10));
 
         // string "w"
-        $this->assertEquals(
-            8,
-            $this->font->getStringWidth('w', 'arial', 10)
-        );
+        self::assertSame(8, $this->font->getStringWidth('w', 'arial', 10));
 
         // string "G"
-        $this->assertEquals(
-            8,
-            $this->font->getStringWidth('G', 'arial', 10)
-        );
+        self::assertSame(8, $this->font->getStringWidth('G', 'arial', 10));
 
         // string "m"
-        $this->assertEquals(
-            9,
-            $this->font->getStringWidth('m', 'arial', 10)
-        );
+        self::assertSame(9, $this->font->getStringWidth('m', 'arial', 10));
 
         // string "W"
-        $this->assertEquals(
-            10,
-            $this->font->getStringWidth('W', 'arial', 10)
-        );
+        self::assertSame(10, $this->font->getStringWidth('W', 'arial', 10));
 
         // string "$"
-        $this->assertEquals(
-            3,
-            $this->font->getStringWidth('$', 'arial', 10)
-        );
+        self::assertSame(3, $this->font->getStringWidth('$', 'arial', 10));
     }
 
     /**
@@ -149,28 +92,16 @@ class FontTest extends AbstractTestCase
     public function testGetStringWidthFont(): void
     {
         // string "phpMyAdmin", with Arial 10
-        $this->assertEquals(
-            59,
-            $this->font->getStringWidth('phpMyAdmin', 'arial', 10)
-        );
+        self::assertSame(59, $this->font->getStringWidth('phpMyAdmin', 'arial', 10));
 
         // string "phpMyAdmin", with No font
-        $this->assertEquals(
-            59,
-            $this->font->getStringWidth('phpMyAdmin', '', 10)
-        );
+        self::assertSame(59, $this->font->getStringWidth('phpMyAdmin', '', 10));
 
         // string "phpMyAdmin", with Times 10
-        $this->assertEquals(
-            55,
-            $this->font->getStringWidth('phpMyAdmin', 'times', 10)
-        );
+        self::assertSame(55, $this->font->getStringWidth('phpMyAdmin', 'times', 10));
 
         // string "phpMyAdmin", with Broadway 10
-        $this->assertEquals(
-            73,
-            $this->font->getStringWidth('phpMyAdmin', 'broadway', 10)
-        );
+        self::assertSame(73, $this->font->getStringWidth('phpMyAdmin', 'broadway', 10));
     }
 
     /**
@@ -179,28 +110,16 @@ class FontTest extends AbstractTestCase
     public function testGetStringWidthSize(): void
     {
         // string "phpMyAdmin", with font size 0
-        $this->assertEquals(
-            0,
-            $this->font->getStringWidth('phpMyAdmin', 'arial', 0)
-        );
+        self::assertSame(0, $this->font->getStringWidth('phpMyAdmin', 'arial', 0));
 
         // string "phpMyAdmin", with Arial 10
-        $this->assertEquals(
-            59,
-            $this->font->getStringWidth('phpMyAdmin', 'arial', 10)
-        );
+        self::assertSame(59, $this->font->getStringWidth('phpMyAdmin', 'arial', 10));
 
         // string "phpMyAdmin", with Arial 11
-        $this->assertEquals(
-            65,
-            $this->font->getStringWidth('phpMyAdmin', 'arial', 11)
-        );
+        self::assertSame(65, $this->font->getStringWidth('phpMyAdmin', 'arial', 11));
 
         // string "phpMyAdmin", with Arial 20
-        $this->assertEquals(
-            118,
-            $this->font->getStringWidth('phpMyAdmin', 'arial', 20)
-        );
+        self::assertSame(118, $this->font->getStringWidth('phpMyAdmin', 'arial', 20));
     }
 
     /**
@@ -209,66 +128,51 @@ class FontTest extends AbstractTestCase
     public function testGetStringWidthCharLists(): void
     {
         // string "a", with invalid charlist (= array without proper structure)
-        $this->assertEquals(
-            6,
-            $this->font->getStringWidth('a', 'arial', 10, ['list'])
-        );
+        self::assertSame(6, $this->font->getStringWidth('a', 'arial', 10, ['list']));
 
         // string "a", with invalid charlist (= array without proper structure :
         // modifier is missing
-        $this->assertEquals(
-            6,
-            $this->font->getStringWidth(
-                'a',
-                'arial',
-                10,
-                [['chars' => 'a']]
-            )
-        );
+        self::assertSame(6, $this->font->getStringWidth(
+            'a',
+            'arial',
+            10,
+            [['chars' => 'a']]
+        ));
 
         // string "a", with invalid charlist (= array without proper structure :
         // chars is missing
-        $this->assertEquals(
-            6,
-            $this->font->getStringWidth(
-                'a',
-                'arial',
-                10,
-                [['modifier' => 0.61]]
-            )
-        );
+        self::assertSame(6, $this->font->getStringWidth(
+            'a',
+            'arial',
+            10,
+            [['modifier' => 0.61]]
+        ));
 
         // string "a", with invalid charlist (= array without proper structure :
         // chars is not an array
-        $this->assertEquals(
-            6,
-            $this->font->getStringWidth(
-                'a',
-                'arial',
-                10,
+        self::assertSame(6, $this->font->getStringWidth(
+            'a',
+            'arial',
+            10,
+            [
                 [
-                    [
-                        'chars' => 'a',
-                        'modifier' => 0.61,
-                    ],
-                ]
-            )
-        );
+                    'chars' => 'a',
+                    'modifier' => 0.61,
+                ],
+            ]
+        ));
 
         // string "a", with valid charlist
-        $this->assertEquals(
-            7,
-            $this->font->getStringWidth(
-                'a',
-                'arial',
-                10,
+        self::assertSame(7, $this->font->getStringWidth(
+            'a',
+            'arial',
+            10,
+            [
                 [
-                    [
-                        'chars' => ['a'],
-                        'modifier' => 0.61,
-                    ],
-                ]
-            )
-        );
+                    'chars' => ['a'],
+                    'modifier' => 0.61,
+                ],
+            ]
+        ));
     }
 }
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 393a56b9c6..594f1dd6b3 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -80,11 +80,8 @@ class FooterTest extends AbstractTestCase
             ],
         ];
 
-        $this->assertEquals(
-            '{"queries":[{"count":1,"time":0.2,"query":"SELECT * FROM `pma_bookmark` WHERE 1"},'
-            . '{"count":1,"time":2.5,"query":"SELECT * FROM `db` WHERE 1"}]}',
-            $this->object->getDebugMessage()
-        );
+        self::assertSame('{"queries":[{"count":1,"time":0.2,"query":"SELECT * FROM `pma_bookmark` WHERE 1"},'
+        . '{"count":1,"time":2.5,"query":"SELECT * FROM `db` WHERE 1"}]}', $this->object->getDebugMessage());
     }
 
     /**
@@ -98,7 +95,7 @@ class FooterTest extends AbstractTestCase
         $object->child->parent = $object;
 
         $this->callFunction($this->object, Footer::class, 'removeRecursion', [&$object]);
-        $this->assertEquals(
+        self::assertSame(
             '{"child":{"parent":"***RECURSION***"},"childIterator":"***ITERATOR***"}',
             json_encode($object)
         );
@@ -111,20 +108,14 @@ class FooterTest extends AbstractTestCase
     {
         $footer = new Footer();
         $footer->disable();
-        $this->assertEquals(
-            '',
-            $footer->getDisplay()
-        );
+        self::assertSame('', $footer->getDisplay());
     }
 
     public function testGetDisplayWhenAjaxIsEnabled(): void
     {
         $footer = new Footer();
         $footer->setAjax(true);
-        $this->assertEquals(
-            '',
-            $footer->getDisplay()
-        );
+        self::assertSame('', $footer->getDisplay());
     }
 
     /**
@@ -133,7 +124,7 @@ class FooterTest extends AbstractTestCase
     public function testGetScripts(): void
     {
         $footer = new Footer();
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<script data-cfasync="false" type="text/javascript">',
             $footer->getScripts()->getDisplay()
         );
@@ -147,10 +138,7 @@ class FooterTest extends AbstractTestCase
     public function testDisplay(): void
     {
         $footer = new Footer();
-        $this->assertStringContainsString(
-            'Open new phpMyAdmin window',
-            $footer->getDisplay()
-        );
+        self::assertStringContainsString('Open new phpMyAdmin window', $footer->getDisplay());
     }
 
     /**
@@ -160,10 +148,7 @@ class FooterTest extends AbstractTestCase
     {
         $footer = new Footer();
         $footer->setMinimal();
-        $this->assertEquals(
-            "  </div>\n  </body>\n</html>\n",
-            $footer->getDisplay()
-        );
+        self::assertSame("  </div>\n  </body>\n</html>\n", $footer->getDisplay());
     }
 
     public function testSetAjax(): void
@@ -172,10 +157,10 @@ class FooterTest extends AbstractTestCase
         $isAjax->setAccessible(true);
         $footer = new Footer();
 
-        $this->assertFalse($isAjax->getValue($footer));
+        self::assertFalse($isAjax->getValue($footer));
         $footer->setAjax(true);
-        $this->assertTrue($isAjax->getValue($footer));
+        self::assertTrue($isAjax->getValue($footer));
         $footer->setAjax(false);
-        $this->assertFalse($isAjax->getValue($footer));
+        self::assertFalse($isAjax->getValue($footer));
     }
 }
diff --git a/test/classes/Gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php
index aaa30864f3..09eac3522a 100644
--- a/test/classes/Gis/GisFactoryTest.php
+++ b/test/classes/Gis/GisFactoryTest.php
@@ -30,7 +30,7 @@ class GisFactoryTest extends AbstractTestCase
      */
     public function testFactory(string $type, string $geom): void
     {
-        $this->assertInstanceOf($geom, GisFactory::factory($type));
+        self::assertInstanceOf($geom, GisFactory::factory($type));
     }
 
     /**
diff --git a/test/classes/Gis/GisGeomTestCase.php b/test/classes/Gis/GisGeomTestCase.php
index 3603826f2b..e9e00deed1 100644
--- a/test/classes/Gis/GisGeomTestCase.php
+++ b/test/classes/Gis/GisGeomTestCase.php
@@ -31,20 +31,14 @@ abstract class GisGeomTestCase extends AbstractTestCase
     public function testGenerateParams(string $wkt, ?int $index, array $params): void
     {
         if ($index === null) {
-            $this->assertEquals(
-                $params,
-                $this->object->generateParams($wkt)
-            );
+            self::assertEquals($params, $this->object->generateParams($wkt));
 
             return;
         }
 
         /** @var GisPolygon $obj or another GisGeometry that supports this definition */
         $obj = $this->object;
-        $this->assertEquals(
-            $params,
-            $obj->generateParams($wkt, $index)
-        );
+        self::assertEquals($params, $obj->generateParams($wkt, $index));
     }
 
     /**
@@ -57,9 +51,6 @@ abstract class GisGeomTestCase extends AbstractTestCase
      */
     public function testScaleRow(string $spatial, array $min_max): void
     {
-        $this->assertEquals(
-            $min_max,
-            $this->object->scaleRow($spatial)
-        );
+        self::assertEquals($min_max, $this->object->scaleRow($spatial));
     }
 }
diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
index 89755bf4f4..d838af81a3 100644
--- a/test/classes/Gis/GisGeometryCollectionTest.php
+++ b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -49,7 +49,7 @@ class GisGeometryCollectionTest extends AbstractTestCase
      */
     public function testScaleRow(string $spatial, array $output): void
     {
-        $this->assertEquals($output, $this->object->scaleRow($spatial));
+        self::assertEquals($output, $this->object->scaleRow($spatial));
     }
 
     /**
@@ -84,10 +84,7 @@ class GisGeometryCollectionTest extends AbstractTestCase
      */
     public function testGenerateWkt(array $gis_data, int $index, ?string $empty, string $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->object->generateWkt($gis_data, $index, $empty)
-        );
+        self::assertSame($output, $this->object->generateWkt($gis_data, $index, $empty));
     }
 
     /**
@@ -200,7 +197,7 @@ class GisGeometryCollectionTest extends AbstractTestCase
      */
     public function testGenerateParams(string $value, array $output): void
     {
-        $this->assertEquals($output, $this->object->generateParams($value));
+        self::assertSame($output, $this->object->generateParams($value));
     }
 
     /**
@@ -241,7 +238,7 @@ class GisGeometryCollectionTest extends AbstractTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))',
             'image',
@@ -249,8 +246,8 @@ class GisGeometryCollectionTest extends AbstractTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -272,7 +269,7 @@ class GisGeometryCollectionTest extends AbstractTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -317,9 +314,9 @@ class GisGeometryCollectionTest extends AbstractTestCase
         string $output
     ): void {
         $string = $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData);
-        $this->assertEquals(1, preg_match($output, $string));
+        self::assertSame(1, preg_match($output, $string));
 
-        $this->assertMatchesRegularExpressionCompat(
+        self::assertMatchesRegularExpressionCompat(
             $output,
             $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData)
         );
@@ -371,16 +368,13 @@ class GisGeometryCollectionTest extends AbstractTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $line_color,
-                $scale_data
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $line_color,
+            $scale_data
+        ));
     }
 
     /**
diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php
index f6b9a89eaa..15349c10de 100644
--- a/test/classes/Gis/GisGeometryTest.php
+++ b/test/classes/Gis/GisGeometryTest.php
@@ -47,18 +47,15 @@ class GisGeometryTest extends AbstractTestCase
      */
     public function testSetMinMax(string $point_set, array $min_max, array $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                GisGeometry::class,
-                'setMinMax',
-                [
-                    $point_set,
-                    $min_max,
-                ]
-            )
-        );
+        self::assertEquals($output, $this->callFunction(
+            $this->object,
+            GisGeometry::class,
+            'setMinMax',
+            [
+                $point_set,
+                $min_max,
+            ]
+        ));
     }
 
     /**
@@ -107,15 +104,12 @@ class GisGeometryTest extends AbstractTestCase
      */
     public function testGenerateParams(string $value, array $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                GisGeometry::class,
-                'generateParams',
-                [$value]
-            )
-        );
+        self::assertEquals($output, $this->callFunction(
+            $this->object,
+            GisGeometry::class,
+            'generateParams',
+            [$value]
+        ));
     }
 
     /**
@@ -162,19 +156,16 @@ class GisGeometryTest extends AbstractTestCase
      */
     public function testExtractPoints(string $point_set, ?array $scale_data, bool $linear, array $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                GisGeometry::class,
-                'extractPoints',
-                [
-                    $point_set,
-                    $scale_data,
-                    $linear,
-                ]
-            )
-        );
+        self::assertEquals($output, $this->callFunction(
+            $this->object,
+            GisGeometry::class,
+            'extractPoints',
+            [
+                $point_set,
+                $scale_data,
+                $linear,
+            ]
+        ));
     }
 
     /**
@@ -278,18 +269,15 @@ class GisGeometryTest extends AbstractTestCase
      */
     public function testGetBoundsForOl(int $srid, array $scale_data, string $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                GisGeometry::class,
-                'getBoundsForOl',
-                [
-                    $srid,
-                    $scale_data,
-                ]
-            )
-        );
+        self::assertSame($output, $this->callFunction(
+            $this->object,
+            GisGeometry::class,
+            'getBoundsForOl',
+            [
+                $srid,
+                $scale_data,
+            ]
+        ));
     }
 
     /**
@@ -330,18 +318,15 @@ class GisGeometryTest extends AbstractTestCase
      */
     public function testGetPolygonArrayForOpenLayers(array $polygons, int $srid, string $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->callFunction(
-                $this->object,
-                GisGeometry::class,
-                'getPolygonArrayForOpenLayers',
-                [
-                    $polygons,
-                    $srid,
-                ]
-            )
-        );
+        self::assertSame($output, $this->callFunction(
+            $this->object,
+            GisGeometry::class,
+            'getPolygonArrayForOpenLayers',
+            [
+                $polygons,
+                $srid,
+            ]
+        ));
     }
 
     /**
diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php
index e597a366dd..e63d3653b4 100644
--- a/test/classes/Gis/GisLineStringTest.php
+++ b/test/classes/Gis/GisLineStringTest.php
@@ -169,7 +169,7 @@ class GisLineStringTest extends GisGeomTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
             'image',
@@ -177,8 +177,8 @@ class GisLineStringTest extends GisGeomTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -200,7 +200,7 @@ class GisLineStringTest extends GisGeomTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -245,7 +245,7 @@ class GisLineStringTest extends GisGeomTestCase
         string $output
     ): void {
         $string = $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData);
-        $this->assertEquals(1, preg_match($output, $string));
+        self::assertSame(1, preg_match($output, $string));
     }
 
     /**
@@ -293,16 +293,13 @@ class GisLineStringTest extends GisGeomTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $line_color,
-                $scale_data
-            ),
-            $output
-        );
+        self::assertSame($this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $line_color,
+            $scale_data
+        ), $output);
     }
 
     /**
diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php
index b56b744ed6..4e4c37466f 100644
--- a/test/classes/Gis/GisMultiLineStringTest.php
+++ b/test/classes/Gis/GisMultiLineStringTest.php
@@ -164,7 +164,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
             ],
         ];
 
-        $this->assertEquals(
+        self::assertSame(
             $this->object->getShape($row_data),
             'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'
         );
@@ -251,7 +251,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
             'image',
@@ -259,8 +259,8 @@ class GisMultiLineStringTest extends GisGeomTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -282,7 +282,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -327,7 +327,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
         string $output
     ): void {
         $string = $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData);
-        $this->assertEquals(1, preg_match($output, $string));
+        self::assertSame(1, preg_match($output, $string));
     }
 
     /**
@@ -377,16 +377,13 @@ class GisMultiLineStringTest extends GisGeomTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $line_color,
-                $scale_data
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $line_color,
+            $scale_data
+        ));
     }
 
     /**
diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php
index efebcb8885..802ba09150 100644
--- a/test/classes/Gis/GisMultiPointTest.php
+++ b/test/classes/Gis/GisMultiPointTest.php
@@ -99,10 +99,7 @@ class GisMultiPointTest extends GisGeomTestCase
             ],
         ];
 
-        $this->assertEquals(
-            $this->object->getShape($gis_data),
-            'MULTIPOINT(5.02 8.45,6.14 0.15)'
-        );
+        self::assertSame($this->object->getShape($gis_data), 'MULTIPOINT(5.02 8.45,6.14 0.15)');
     }
 
     /**
@@ -171,7 +168,7 @@ class GisMultiPointTest extends GisGeomTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
             'image',
@@ -179,8 +176,8 @@ class GisMultiPointTest extends GisGeomTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -202,7 +199,7 @@ class GisMultiPointTest extends GisGeomTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $point_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -247,7 +244,7 @@ class GisMultiPointTest extends GisGeomTestCase
         string $output
     ): void {
         $string = $this->object->prepareRowAsSvg($spatial, $label, $pointColor, $scaleData);
-        $this->assertEquals(1, preg_match($output, $string));
+        self::assertSame(1, preg_match($output, $string));
     }
 
     /**
@@ -303,16 +300,13 @@ class GisMultiPointTest extends GisGeomTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $point_color,
-                $scale_data
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $point_color,
+            $scale_data
+        ));
     }
 
     /**
diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php
index 1d03304590..d5d40ea017 100644
--- a/test/classes/Gis/GisMultiPolygonTest.php
+++ b/test/classes/Gis/GisMultiPolygonTest.php
@@ -214,7 +214,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function testGetShape(array $row_data, string $shape): void
     {
-        $this->assertEquals($this->object->getShape($row_data), $shape);
+        self::assertSame($this->object->getShape($row_data), $shape);
     }
 
     /**
@@ -336,7 +336,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))',
             'image',
@@ -344,8 +344,8 @@ class GisMultiPolygonTest extends GisGeomTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -367,7 +367,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -412,7 +412,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
         string $output
     ): void {
         $string = $this->object->prepareRowAsSvg($spatial, $label, $fillColor, $scaleData);
-        $this->assertEquals(1, preg_match($output, $string));
+        self::assertSame(1, preg_match($output, $string));
     }
 
     /**
@@ -464,16 +464,13 @@ class GisMultiPolygonTest extends GisGeomTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $fill_color,
-                $scale_data
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $fill_color,
+            $scale_data
+        ));
     }
 
     /**
diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php
index 1dd95028b2..e8bfed3be6 100644
--- a/test/classes/Gis/GisPointTest.php
+++ b/test/classes/Gis/GisPointTest.php
@@ -101,7 +101,7 @@ class GisPointTest extends GisGeomTestCase
      */
     public function testGetShape(array $row_data, string $shape): void
     {
-        $this->assertEquals($this->object->getShape($row_data), $shape);
+        self::assertSame($this->object->getShape($row_data), $shape);
     }
 
     /**
@@ -185,7 +185,7 @@ class GisPointTest extends GisGeomTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'POINT(12 35)',
             'image',
@@ -193,8 +193,8 @@ class GisPointTest extends GisGeomTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -216,7 +216,7 @@ class GisPointTest extends GisGeomTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $point_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -260,15 +260,12 @@ class GisPointTest extends GisGeomTestCase
         array $scaleData,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsSvg(
-                $spatial,
-                $label,
-                $pointColor,
-                $scaleData
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsSvg(
+            $spatial,
+            $label,
+            $pointColor,
+            $scaleData
+        ));
     }
 
     /**
@@ -314,16 +311,13 @@ class GisPointTest extends GisGeomTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $point_color,
-                $scale_data
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $point_color,
+            $scale_data
+        ));
     }
 
     /**
diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php
index f665c0a60e..9b152fb26a 100644
--- a/test/classes/Gis/GisPolygonTest.php
+++ b/test/classes/Gis/GisPolygonTest.php
@@ -198,7 +198,7 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function testArea(array $ring, float $area): void
     {
-        $this->assertEquals($this->object->area($ring), $area);
+        self::assertSame($this->object->area($ring), $area);
     }
 
     /**
@@ -280,10 +280,7 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function testIsPointInsidePolygon(array $point, array $polygon, bool $isInside): void
     {
-        $this->assertEquals(
-            $this->object->isPointInsidePolygon($point, $polygon),
-            $isInside
-        );
+        self::assertSame($this->object->isPointInsidePolygon($point, $polygon), $isInside);
     }
 
     /**
@@ -362,8 +359,8 @@ class GisPolygonTest extends GisGeomTestCase
     public function testGetPointOnSurface(array $ring): void
     {
         $point = $this->object->getPointOnSurface($ring);
-        $this->assertIsArray($point);
-        $this->assertTrue($this->object->isPointInsidePolygon($point, $ring));
+        self::assertIsArray($point);
+        self::assertTrue($this->object->isPointInsidePolygon($point, $ring));
     }
 
     /**
@@ -422,7 +419,7 @@ class GisPolygonTest extends GisGeomTestCase
     public function testPrepareRowAsPng(): void
     {
         $image = ImageWrapper::create(120, 150);
-        $this->assertNotNull($image);
+        self::assertNotNull($image);
         $return = $this->object->prepareRowAsPng(
             'POLYGON((123 0,23 30,17 63,123 0))',
             'image',
@@ -430,8 +427,8 @@ class GisPolygonTest extends GisGeomTestCase
             ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
             $image
         );
-        $this->assertEquals(120, $return->width());
-        $this->assertEquals(150, $return->height());
+        self::assertSame(120, $return->width());
+        self::assertSame(150, $return->height());
     }
 
     /**
@@ -453,7 +450,7 @@ class GisPolygonTest extends GisGeomTestCase
         TCPDF $pdf
     ): void {
         $return = $this->object->prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf);
-        $this->assertInstanceOf(TCPDF::class, $return);
+        self::assertInstanceOf(TCPDF::class, $return);
     }
 
     /**
@@ -498,7 +495,7 @@ class GisPolygonTest extends GisGeomTestCase
         string $output
     ): void {
         $string = $this->object->prepareRowAsSvg($spatial, $label, $fillColor, $scaleData);
-        $this->assertEquals(1, preg_match($output, $string));
+        self::assertSame(1, preg_match($output, $string));
     }
 
     /**
@@ -547,16 +544,13 @@ class GisPolygonTest extends GisGeomTestCase
         array $scale_data,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial,
-                $srid,
-                $label,
-                $fill_color,
-                $scale_data
-            )
-        );
+        self::assertSame($output, $this->object->prepareRowAsOl(
+            $spatial,
+            $srid,
+            $label,
+            $fill_color,
+            $scale_data
+        ));
     }
 
     /**
@@ -606,7 +600,7 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function testIsOuterRing(array $ring): void
     {
-        $this->assertTrue($this->object->isOuterRing($ring));
+        self::assertTrue($this->object->isOuterRing($ring));
     }
 
     /**
diff --git a/test/classes/Gis/GisVisualizationTest.php b/test/classes/Gis/GisVisualizationTest.php
index 8568f7581a..22c4577191 100644
--- a/test/classes/Gis/GisVisualizationTest.php
+++ b/test/classes/Gis/GisVisualizationTest.php
@@ -39,19 +39,16 @@ class GisVisualizationTest extends AbstractTestCase
                 ],
             ]
         );
-        $this->assertSame(
-            [
-                'scale' => 1,
-                'x' => -300.0,
-                'y' => -225.0,
-                'minX' => 0.0,
-                'maxX' => 0.0,
-                'minY' => 0.0,
-                'maxY' => 0.0,
-                'height' => 450,
-            ],
-            $dataSet
-        );
+        self::assertSame([
+            'scale' => 1,
+            'x' => -300.0,
+            'y' => -225.0,
+            'minX' => 0.0,
+            'maxX' => 0.0,
+            'minY' => 0.0,
+            'maxY' => 0.0,
+            'height' => 450,
+        ], $dataSet);
         $dataSet = $this->callFunction(
             $gis,
             GisVisualization::class,
@@ -66,20 +63,17 @@ class GisVisualizationTest extends AbstractTestCase
                 ],
             ]
         );
-        $this->assertSame(
-            [
-                'scale' => 2.1,
-                'x' => -45.35714285714286,
-                'y' => 42.85714285714286,
-                'minX' => 17.0,
-                'maxX' => 178.0,
-                'minY' => 50.0 ,
-                'maxY' => 250.0,
-                'height' => 450,
+        self::assertSame([
+            'scale' => 2.1,
+            'x' => -45.35714285714286,
+            'y' => 42.85714285714286,
+            'minX' => 17.0,
+            'maxX' => 178.0,
+            'minY' => 50.0 ,
+            'maxY' => 250.0,
+            'height' => 450,
 
-            ],
-            $dataSet
-        );
+        ], $dataSet);
 
         // Regression test for bug with 0.0 sentinel values
         $dataSet = $this->callFunction(
@@ -93,19 +87,16 @@ class GisVisualizationTest extends AbstractTestCase
                 ],
             ]
         );
-        $this->assertSame(
-            [
-                'scale' => 32.30769230769231,
-                'x' => -2.7857142857142865,
-                'y' => -0.4642857142857143,
-                'minX' => 0.0,
-                'maxX' => 13.0,
-                'minY' => 0.0,
-                'maxY' => 13.0,
-                'height' => 450,
-            ],
-            $dataSet
-        );
+        self::assertSame([
+            'scale' => 32.30769230769231,
+            'x' => -2.7857142857142865,
+            'y' => -0.4642857142857143,
+            'minX' => 0.0,
+            'maxX' => 13.0,
+            'minY' => 0.0,
+            'maxY' => 13.0,
+            'height' => 450,
+        ], $dataSet);
     }
 
     /**
@@ -128,7 +119,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals('SELECT ASTEXT(`abc`) AS `abc`, SRID(`abc`) AS `srid` FROM () AS `temp_gis`', $queryString);
+        self::assertSame('SELECT ASTEXT(`abc`) AS `abc`, SRID(`abc`) AS `srid` FROM () AS `temp_gis`', $queryString);
     }
 
     /**
@@ -151,7 +142,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT ST_ASTEXT(`abc`) AS `abc`, ST_SRID(`abc`) AS `srid` FROM () AS `temp_gis`',
             $queryString
         );
@@ -177,7 +168,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT ST_ASTEXT(`abc`) AS `abc`, ST_SRID(`abc`) AS `srid` FROM (SELECT 1 FROM foo) AS `temp_gis`',
             $queryString
         );
@@ -204,7 +195,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT `country name`, ST_ASTEXT(`country_geom`) AS `country_geom`,'
             . ' ST_SRID(`country_geom`) AS `srid` FROM () AS `temp_gis`',
             $queryString
@@ -231,7 +222,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT ST_ASTEXT(`abc`) AS `abc`, ST_SRID(`abc`) AS `srid` FROM () AS `temp_gis` LIMIT 0, 10',
             $queryString
         );
@@ -251,7 +242,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT ST_ASTEXT(`abc`) AS `abc`, ST_SRID(`abc`) AS `srid` FROM () AS `temp_gis` LIMIT 10, 15',
             $queryString
         );
@@ -277,7 +268,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT ST_ASTEXT(`abc`, \'axis-order=long-lat\') AS `abc`, ST_SRID(`abc`) AS `srid` FROM () AS `temp_gis`',
             $queryString
         );
@@ -303,7 +294,7 @@ class GisVisualizationTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT ST_ASTEXT(`abc`) AS `abc`, ST_SRID(`abc`) AS `srid` FROM () AS `temp_gis`',
             $queryString
         );
diff --git a/test/classes/GitTest.php b/test/classes/GitTest.php
index 8f407a8c28..7f81f65880 100644
--- a/test/classes/GitTest.php
+++ b/test/classes/GitTest.php
@@ -67,11 +67,11 @@ class GitTest extends AbstractTestCase
 
         $git_location = '';
 
-        $this->assertTrue($this->object->isGitRevision($git_location));
+        self::assertTrue($this->object->isGitRevision($git_location));
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
-        $this->assertEquals('.cachedgitlocation', $git_location);
+        self::assertSame('.cachedgitlocation', $git_location);
     }
 
     /**
@@ -80,9 +80,7 @@ class GitTest extends AbstractTestCase
     public function testIsGitRevisionSkipped(): void
     {
         $this->object = new Git(false);
-        $this->assertFalse(
-            $this->object->isGitRevision($git_location)
-        );
+        self::assertFalse($this->object->isGitRevision($git_location));
     }
 
     /**
@@ -92,31 +90,27 @@ class GitTest extends AbstractTestCase
      */
     public function testIsGitRevisionLocalGitDir(): void
     {
-        $this->assertFalse(
-            $this->object->isGitRevision()
-        );
+        self::assertFalse($this->object->isGitRevision());
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
         unset($_SESSION['git_location']);
         unset($_SESSION['is_git_revision']);
 
         mkdir($this->testDir . '.git');
 
-        $this->assertFalse(
-            $this->object->isGitRevision()
-        );
+        self::assertFalse($this->object->isGitRevision());
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
         unset($_SESSION['git_location']);
         unset($_SESSION['is_git_revision']);
 
         file_put_contents($this->testDir . '.git/config', '');
 
-        $this->assertTrue($this->object->isGitRevision());
+        self::assertTrue($this->object->isGitRevision());
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
         unlink($this->testDir . '.git/config');
         rmdir($this->testDir . '.git');
@@ -130,31 +124,27 @@ class GitTest extends AbstractTestCase
     public function testIsGitRevisionExternalGitDir(): void
     {
         file_put_contents($this->testDir . '.git', 'gitdir: ' . $this->testDir . '.customgitdir');
-        $this->assertFalse(
-            $this->object->isGitRevision()
-        );
+        self::assertFalse($this->object->isGitRevision());
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
         unset($_SESSION['git_location']);
         unset($_SESSION['is_git_revision']);
 
         mkdir($this->testDir . '.customgitdir');
 
-        $this->assertTrue($this->object->isGitRevision());
+        self::assertTrue($this->object->isGitRevision());
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
         unset($_SESSION['git_location']);
         unset($_SESSION['is_git_revision']);
 
         file_put_contents($this->testDir . '.git', 'random data here');
 
-        $this->assertFalse(
-            $this->object->isGitRevision()
-        );
+        self::assertFalse($this->object->isGitRevision());
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
 
         unlink($this->testDir . '.git');
         rmdir($this->testDir . '.customgitdir');
@@ -172,14 +162,14 @@ class GitTest extends AbstractTestCase
 
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertNull($commit);
+        self::assertFalse($this->object->hasGitInformation());
 
         file_put_contents($this->testDir . '.git/HEAD', 'ref: refs/remotes/origin/master');
 
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
+        self::assertNull($commit);
 
         file_put_contents(
             $this->testDir . '.git/packed-refs',
@@ -206,39 +196,39 @@ class GitTest extends AbstractTestCase
             $this->markTestSkipped('Unable to get remote commit information.');
         }
 
-        $this->assertIsArray($commit);
-        $this->assertArrayHasKey('hash', $commit);
-        $this->assertEquals('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']);
+        self::assertIsArray($commit);
+        self::assertArrayHasKey('hash', $commit);
+        self::assertSame('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']);
 
-        $this->assertArrayHasKey('branch', $commit);
-        $this->assertEquals('master', $commit['branch']);
+        self::assertArrayHasKey('branch', $commit);
+        self::assertSame('master', $commit['branch']);
 
-        $this->assertArrayHasKey('message', $commit);
-        $this->assertIsString($commit['message']);
+        self::assertArrayHasKey('message', $commit);
+        self::assertIsString($commit['message']);
 
-        $this->assertArrayHasKey('is_remote_commit', $commit);
-        $this->assertIsBool($commit['is_remote_commit']);
+        self::assertArrayHasKey('is_remote_commit', $commit);
+        self::assertIsBool($commit['is_remote_commit']);
 
-        $this->assertArrayHasKey('is_remote_branch', $commit);
-        $this->assertIsBool($commit['is_remote_branch']);
+        self::assertArrayHasKey('is_remote_branch', $commit);
+        self::assertIsBool($commit['is_remote_branch']);
 
-        $this->assertArrayHasKey('author', $commit);
-        $this->assertIsArray($commit['author']);
-        $this->assertArrayHasKey('name', $commit['author']);
-        $this->assertArrayHasKey('email', $commit['author']);
-        $this->assertArrayHasKey('date', $commit['author']);
-        $this->assertIsString($commit['author']['name']);
-        $this->assertIsString($commit['author']['email']);
-        $this->assertIsString($commit['author']['date']);
+        self::assertArrayHasKey('author', $commit);
+        self::assertIsArray($commit['author']);
+        self::assertArrayHasKey('name', $commit['author']);
+        self::assertArrayHasKey('email', $commit['author']);
+        self::assertArrayHasKey('date', $commit['author']);
+        self::assertIsString($commit['author']['name']);
+        self::assertIsString($commit['author']['email']);
+        self::assertIsString($commit['author']['date']);
 
-        $this->assertArrayHasKey('committer', $commit);
-        $this->assertIsArray($commit['committer']);
-        $this->assertArrayHasKey('name', $commit['committer']);
-        $this->assertArrayHasKey('email', $commit['committer']);
-        $this->assertArrayHasKey('date', $commit['committer']);
-        $this->assertIsString($commit['committer']['name']);
-        $this->assertIsString($commit['committer']['email']);
-        $this->assertIsString($commit['committer']['date']);
+        self::assertArrayHasKey('committer', $commit);
+        self::assertIsArray($commit['committer']);
+        self::assertArrayHasKey('name', $commit['committer']);
+        self::assertArrayHasKey('email', $commit['committer']);
+        self::assertArrayHasKey('date', $commit['committer']);
+        self::assertIsString($commit['committer']['name']);
+        self::assertIsString($commit['committer']['email']);
+        self::assertIsString($commit['committer']['date']);
     }
 
     /**
@@ -253,8 +243,8 @@ class GitTest extends AbstractTestCase
 
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertNull($commit);
+        self::assertFalse($this->object->hasGitInformation());
 
         file_put_contents($this->testDir . '.git/HEAD', 'ref: refs/remotes/origin/master');
         mkdir($this->testDir . '.git/refs/remotes/origin', 0777, true);
@@ -265,8 +255,8 @@ class GitTest extends AbstractTestCase
         mkdir($this->testDir . '.git/objects/pack', 0777, true);//default = 0777, recursive mode
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertNull($commit);
+        self::assertFalse($this->object->hasGitInformation());
 
         unlink($this->testDir . '.git/refs/remotes/origin/master');
         rmdir($this->testDir . '.git/refs/remotes/origin');
@@ -291,14 +281,14 @@ class GitTest extends AbstractTestCase
 
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertNull($commit);
+        self::assertFalse($this->object->hasGitInformation());
 
         file_put_contents($this->testDir . '.git/HEAD', 'ref: refs/remotes/origin/master');
 
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
+        self::assertNull($commit);
 
         file_put_contents(
             $this->testDir . '.git/packed-refs',
@@ -334,39 +324,39 @@ class GitTest extends AbstractTestCase
             $this->markTestSkipped('Unable to get remote commit information.');
         }
 
-        $this->assertIsArray($commit);
-        $this->assertArrayHasKey('hash', $commit);
-        $this->assertEquals('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']);
+        self::assertIsArray($commit);
+        self::assertArrayHasKey('hash', $commit);
+        self::assertSame('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']);
 
-        $this->assertArrayHasKey('branch', $commit);
-        $this->assertEquals('master', $commit['branch']);
+        self::assertArrayHasKey('branch', $commit);
+        self::assertSame('master', $commit['branch']);
 
-        $this->assertArrayHasKey('message', $commit);
-        $this->assertIsString($commit['message']);
+        self::assertArrayHasKey('message', $commit);
+        self::assertIsString($commit['message']);
 
-        $this->assertArrayHasKey('is_remote_commit', $commit);
-        $this->assertIsBool($commit['is_remote_commit']);
+        self::assertArrayHasKey('is_remote_commit', $commit);
+        self::assertIsBool($commit['is_remote_commit']);
 
-        $this->assertArrayHasKey('is_remote_branch', $commit);
-        $this->assertIsBool($commit['is_remote_branch']);
+        self::assertArrayHasKey('is_remote_branch', $commit);
+        self::assertIsBool($commit['is_remote_branch']);
 
-        $this->assertArrayHasKey('author', $commit);
-        $this->assertIsArray($commit['author']);
-        $this->assertArrayHasKey('name', $commit['author']);
-        $this->assertArrayHasKey('email', $commit['author']);
-        $this->assertArrayHasKey('date', $commit['author']);
-        $this->assertIsString($commit['author']['name']);
-        $this->assertIsString($commit['author']['email']);
-        $this->assertIsString($commit['author']['date']);
+        self::assertArrayHasKey('author', $commit);
+        self::assertIsArray($commit['author']);
+        self::assertArrayHasKey('name', $commit['author']);
+        self::assertArrayHasKey('email', $commit['author']);
+        self::assertArrayHasKey('date', $commit['author']);
+        self::assertIsString($commit['author']['name']);
+        self::assertIsString($commit['author']['email']);
+        self::assertIsString($commit['author']['date']);
 
-        $this->assertArrayHasKey('committer', $commit);
-        $this->assertIsArray($commit['committer']);
-        $this->assertArrayHasKey('name', $commit['committer']);
-        $this->assertArrayHasKey('email', $commit['committer']);
-        $this->assertArrayHasKey('date', $commit['committer']);
-        $this->assertIsString($commit['committer']['name']);
-        $this->assertIsString($commit['committer']['email']);
-        $this->assertIsString($commit['committer']['date']);
+        self::assertArrayHasKey('committer', $commit);
+        self::assertIsArray($commit['committer']);
+        self::assertArrayHasKey('name', $commit['committer']);
+        self::assertArrayHasKey('email', $commit['committer']);
+        self::assertArrayHasKey('date', $commit['committer']);
+        self::assertIsString($commit['committer']['name']);
+        self::assertIsString($commit['committer']['email']);
+        self::assertIsString($commit['committer']['date']);
     }
 
     /**
@@ -377,9 +367,9 @@ class GitTest extends AbstractTestCase
         $this->object = new Git(false);
         $commit = $this->object->checkGitRevision();
 
-        $this->assertNull($commit);
+        self::assertNull($commit);
 
-        $this->assertFalse($this->object->hasGitInformation());
+        self::assertFalse($this->object->hasGitInformation());
     }
 
     /**
@@ -390,9 +380,9 @@ class GitTest extends AbstractTestCase
         $_SESSION['git_location'] = 'customdir/.git';
         $_SESSION['is_git_revision'] = true;
         $gitFolder = '';
-        $this->assertTrue($this->object->isGitRevision($gitFolder));
+        self::assertTrue($this->object->isGitRevision($gitFolder));
 
-        $this->assertEquals($gitFolder, 'customdir/.git');
+        self::assertSame($gitFolder, 'customdir/.git');
     }
 
     /**
@@ -403,10 +393,10 @@ class GitTest extends AbstractTestCase
         $_SESSION['is_git_revision'] = false;
         $_SESSION['git_location'] = null;
         $gitFolder = 'defaultvaluebyref';
-        $this->assertFalse($this->object->isGitRevision($gitFolder));
+        self::assertFalse($this->object->isGitRevision($gitFolder));
 
         // Assert that the value is replaced by cached one
-        $this->assertEquals($gitFolder, null);
+        self::assertSame($gitFolder, null);
     }
 
     /**
@@ -417,10 +407,10 @@ class GitTest extends AbstractTestCase
         $_SESSION['is_git_revision'] = false;
         $_SESSION['git_location'] = 'randomdir/.git';
         $gitFolder = 'defaultvaluebyref';
-        $this->assertFalse($this->object->isGitRevision($gitFolder));
+        self::assertFalse($this->object->isGitRevision($gitFolder));
 
         // Assert that the value is replaced by cached one
-        $this->assertEquals($gitFolder, 'randomdir/.git');
+        self::assertSame($gitFolder, 'randomdir/.git');
     }
 
     /**
@@ -463,7 +453,7 @@ class GitTest extends AbstractTestCase
             ]
         );
 
-        $this->assertSame([
+        self::assertSame([
             [
                 'name' => 'William Desportes',
                 'email' => 'williamdes@wdes.fr',
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
index 4d21dfc611..585dd3fc19 100644
--- a/test/classes/HeaderTest.php
+++ b/test/classes/HeaderTest.php
@@ -50,10 +50,7 @@ class HeaderTest extends AbstractTestCase
     {
         $header = new Header();
         $header->disable();
-        $this->assertEquals(
-            '',
-            $header->getDisplay()
-        );
+        self::assertSame('', $header->getDisplay());
     }
 
     /**
@@ -63,10 +60,7 @@ class HeaderTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 0;
         $header = new Header();
-        $this->assertStringContainsString(
-            '<title>phpMyAdmin</title>',
-            $header->getDisplay()
-        );
+        self::assertStringContainsString('<title>phpMyAdmin</title>', $header->getDisplay());
     }
 
     /**
@@ -76,10 +70,7 @@ class HeaderTest extends AbstractTestCase
     {
         $header = new Header();
         $header->setBodyId('PMA_header_id');
-        $this->assertStringContainsString(
-            'PMA_header_id',
-            $header->getDisplay()
-        );
+        self::assertStringContainsString('PMA_header_id', $header->getDisplay());
     }
 
     /**
@@ -88,10 +79,7 @@ class HeaderTest extends AbstractTestCase
     public function testGetJsParams(): void
     {
         $header = new Header();
-        $this->assertArrayHasKey(
-            'common_query',
-            $header->getJsParams()
-        );
+        self::assertArrayHasKey('common_query', $header->getJsParams());
     }
 
     /**
@@ -100,10 +88,7 @@ class HeaderTest extends AbstractTestCase
     public function testGetJsParamsCode(): void
     {
         $header = new Header();
-        $this->assertStringContainsString(
-            'CommonParams.setAll',
-            $header->getJsParamsCode()
-        );
+        self::assertStringContainsString('CommonParams.setAll', $header->getJsParamsCode());
     }
 
     /**
@@ -112,10 +97,7 @@ class HeaderTest extends AbstractTestCase
     public function testGetMessage(): void
     {
         $header = new Header();
-        $this->assertStringContainsString(
-            'phpmyadminmessage',
-            $header->getMessage()
-        );
+        self::assertStringContainsString('phpmyadminmessage', $header->getMessage());
     }
 
     /**
@@ -129,7 +111,7 @@ class HeaderTest extends AbstractTestCase
         $header = new Header();
         $header->disableWarnings();
 
-        $this->assertFalse($reflection->getValue($header));
+        self::assertFalse($reflection->getValue($header));
     }
 
     /**
@@ -181,7 +163,7 @@ class HeaderTest extends AbstractTestCase
         }
 
         $headers = $this->callFunction($header, Header::class, 'getHttpHeaders', []);
-        $this->assertSame($expected, $headers);
+        self::assertSame($expected, $headers);
     }
 
     public static function providerForTestGetHttpHeaders(): array
@@ -253,19 +235,19 @@ class HeaderTest extends AbstractTestCase
         $consoleReflection = new ReflectionProperty(Header::class, 'console');
         $consoleReflection->setAccessible(true);
         $console = $consoleReflection->getValue($header);
-        $this->assertInstanceOf(Console::class, $console);
+        self::assertInstanceOf(Console::class, $console);
         $isAjax = new ReflectionProperty(Header::class, 'isAjax');
         $isAjax->setAccessible(true);
         $consoleIsAjax = new ReflectionProperty(Console::class, 'isAjax');
         $consoleIsAjax->setAccessible(true);
 
-        $this->assertFalse($isAjax->getValue($header));
-        $this->assertFalse($consoleIsAjax->getValue($console));
+        self::assertFalse($isAjax->getValue($header));
+        self::assertFalse($consoleIsAjax->getValue($console));
         $header->setAjax(true);
-        $this->assertTrue($isAjax->getValue($header));
-        $this->assertTrue($consoleIsAjax->getValue($console));
+        self::assertTrue($isAjax->getValue($header));
+        self::assertTrue($consoleIsAjax->getValue($console));
         $header->setAjax(false);
-        $this->assertFalse($isAjax->getValue($header));
-        $this->assertFalse($consoleIsAjax->getValue($console));
+        self::assertFalse($isAjax->getValue($header));
+        self::assertFalse($consoleIsAjax->getValue($console));
     }
 }
diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php
index 91a78def6c..c97245f68b 100644
--- a/test/classes/Html/GeneratorTest.php
+++ b/test/classes/Html/GeneratorTest.php
@@ -40,7 +40,7 @@ class GeneratorTest extends AbstractTestCase
     public function testGetDbLinkEmpty(): void
     {
         $GLOBALS['db'] = null;
-        $this->assertEmpty(Generator::getDbLink());
+        self::assertEmpty(Generator::getDbLink());
     }
 
     /**
@@ -54,19 +54,16 @@ class GeneratorTest extends AbstractTestCase
         $GLOBALS['db'] = 'test_db';
         $GLOBALS['server'] = 99;
         $database = $GLOBALS['db'];
-        $this->assertEquals(
-            '<a href="'
-            . Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'],
-                'database'
-            )
-            . '&db=' . $database
-            . '&server=99&lang=en" '
-            . 'title="Jump to database “'
-            . htmlspecialchars($database) . '”.">'
-            . htmlspecialchars($database) . '</a>',
-            Generator::getDbLink()
-        );
+        self::assertSame('<a href="'
+        . Util::getScriptNameForOption(
+            $GLOBALS['cfg']['DefaultTabDatabase'],
+            'database'
+        )
+        . '&db=' . $database
+        . '&server=99&lang=en" '
+        . 'title="Jump to database “'
+        . htmlspecialchars($database) . '”.">'
+        . htmlspecialchars($database) . '</a>', Generator::getDbLink());
     }
 
     /**
@@ -76,17 +73,14 @@ class GeneratorTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 99;
         $database = 'test_database';
-        $this->assertEquals(
-            '<a href="' . Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'],
-                'database'
-            )
-            . '&db=' . $database
-            . '&server=99&lang=en" title="Jump to database “'
-            . htmlspecialchars($database) . '”.">'
-            . htmlspecialchars($database) . '</a>',
-            Generator::getDbLink($database)
-        );
+        self::assertSame('<a href="' . Util::getScriptNameForOption(
+            $GLOBALS['cfg']['DefaultTabDatabase'],
+            'database'
+        )
+        . '&db=' . $database
+        . '&server=99&lang=en" title="Jump to database “'
+        . htmlspecialchars($database) . '”.">'
+        . htmlspecialchars($database) . '</a>', Generator::getDbLink($database));
     }
 
     /**
@@ -96,19 +90,16 @@ class GeneratorTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 99;
         $database = 'test&data\'base';
-        $this->assertEquals(
-            '<a href="'
-            . Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'],
-                'database'
-            )
-            . '&db='
-            . htmlspecialchars(urlencode($database))
-            . '&server=99&lang=en" title="Jump to database “'
-            . htmlspecialchars($database) . '”.">'
-            . htmlspecialchars($database) . '</a>',
-            Generator::getDbLink($database)
-        );
+        self::assertSame('<a href="'
+        . Util::getScriptNameForOption(
+            $GLOBALS['cfg']['DefaultTabDatabase'],
+            'database'
+        )
+        . '&db='
+        . htmlspecialchars(urlencode($database))
+        . '&server=99&lang=en" title="Jump to database “'
+        . htmlspecialchars($database) . '”.">'
+        . htmlspecialchars($database) . '</a>', Generator::getDbLink($database));
     }
 
     /**
@@ -118,10 +109,7 @@ class GeneratorTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['ActionLinksMode'] = 'text';
 
-        $this->assertEquals(
-            '<span class="text-nowrap"></span>',
-            Generator::getIcon('b_comment')
-        );
+        self::assertSame('<span class="text-nowrap"></span>', Generator::getIcon('b_comment'));
     }
 
     /**
@@ -131,7 +119,7 @@ class GeneratorTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
 
-        $this->assertEquals(
+        self::assertSame(
             '<span class="text-nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment"></span>',
             Generator::getIcon('b_comment')
         );
@@ -145,12 +133,9 @@ class GeneratorTest extends AbstractTestCase
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
         $alternate_text = 'alt_str';
 
-        $this->assertEquals(
-            '<span class="text-nowrap"><img src="themes/dot.gif" title="'
-            . $alternate_text . '" alt="' . $alternate_text
-            . '" class="icon ic_b_comment"></span>',
-            Generator::getIcon('b_comment', $alternate_text)
-        );
+        self::assertSame('<span class="text-nowrap"><img src="themes/dot.gif" title="'
+        . $alternate_text . '" alt="' . $alternate_text
+        . '" class="icon ic_b_comment"></span>', Generator::getIcon('b_comment', $alternate_text));
     }
 
     /**
@@ -163,7 +148,7 @@ class GeneratorTest extends AbstractTestCase
 
         // Here we are checking for an icon embedded inside a span (i.e not a menu
         // bar icon
-        $this->assertEquals(
+        self::assertSame(
             '<span class="text-nowrap"><img src="themes/dot.gif" title="'
             . $alternate_text . '" alt="' . $alternate_text
             . '" class="icon ic_b_comment">&nbsp;' . $alternate_text . '</span>',
@@ -186,10 +171,7 @@ class GeneratorTest extends AbstractTestCase
             . '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
             . __('Documentation') . '" class="icon ic_b_help"></a>';
 
-        $this->assertEquals(
-            $expected,
-            Generator::showPHPDocumentation($target)
-        );
+        self::assertSame($expected, Generator::showPHPDocumentation($target));
     }
 
     /**
@@ -215,7 +197,7 @@ class GeneratorTest extends AbstractTestCase
                 ],
                 $params
             );
-            $this->assertEquals($match, $result);
+            self::assertSame($match, $result);
         } finally {
             $GLOBALS['cfg']['LinkLengthLimit'] = $restore;
         }
@@ -346,21 +328,15 @@ class GeneratorTest extends AbstractTestCase
 
     public function testFormatSql(): void
     {
-        $this->assertEquals(
-            '<code class="sql" dir="ltr"><pre>' . "\n"
-            . 'SELECT 1 &lt; 2' . "\n"
-            . '</pre></code>',
-            Generator::formatSql('SELECT 1 < 2')
-        );
+        self::assertSame('<code class="sql" dir="ltr"><pre>' . "\n"
+        . 'SELECT 1 &lt; 2' . "\n"
+        . '</pre></code>', Generator::formatSql('SELECT 1 < 2'));
 
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 6;
 
-        $this->assertEquals(
-            '<code class="sql" dir="ltr"><pre>' . "\n"
-            . 'SELECT[...]' . "\n"
-            . '</pre></code>',
-            Generator::formatSql('SELECT 1 < 2', true)
-        );
+        self::assertSame('<code class="sql" dir="ltr"><pre>' . "\n"
+        . 'SELECT[...]' . "\n"
+        . '</pre></code>', Generator::formatSql('SELECT 1 < 2', true));
     }
 
     /**
@@ -384,10 +360,7 @@ class GeneratorTest extends AbstractTestCase
             'ssl' => false,
             'host' => '127.0.0.1',
         ];
-        $this->assertEquals(
-            $sslNotUsed,
-            Generator::getServerSSL()
-        );
+        self::assertSame($sslNotUsed, Generator::getServerSSL());
 
         $cfg['Server'] = [
             'ssl' => false,
@@ -395,10 +368,7 @@ class GeneratorTest extends AbstractTestCase
         ];
         $cfg['MysqlSslWarningSafeHosts'] = ['localhost', '127.0.0.1'];
 
-        $this->assertEquals(
-            $sslNotUsedCaution,
-            Generator::getServerSSL()
-        );
+        self::assertSame($sslNotUsedCaution, Generator::getServerSSL());
 
         $cfg['Server'] = [
             'ssl' => false,
@@ -406,10 +376,7 @@ class GeneratorTest extends AbstractTestCase
         ];
         $cfg['MysqlSslWarningSafeHosts'] = ['localhost', '127.0.0.1', 'custom.host'];
 
-        $this->assertEquals(
-            $sslNotUsed,
-            Generator::getServerSSL()
-        );
+        self::assertSame($sslNotUsed, Generator::getServerSSL());
 
         $cfg['Server'] = [
             'ssl' => false,
@@ -417,10 +384,7 @@ class GeneratorTest extends AbstractTestCase
             'host' => 'custom.host',
         ];
 
-        $this->assertEquals(
-            $sslNotUsed,
-            Generator::getServerSSL()
-        );
+        self::assertSame($sslNotUsed, Generator::getServerSSL());
 
         $cfg['Server'] = [
             'ssl' => true,
@@ -428,13 +392,10 @@ class GeneratorTest extends AbstractTestCase
             'host' => 'custom.host',
         ];
 
-        $this->assertEquals(
-            '<span class="text-danger">SSL is used with disabled verification</span>'
-            . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
-            . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
-            . ' class="icon ic_b_help"></a>',
-            Generator::getServerSSL()
-        );
+        self::assertSame('<span class="text-danger">SSL is used with disabled verification</span>'
+        . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
+        . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
+        . ' class="icon ic_b_help"></a>', Generator::getServerSSL());
 
         $cfg['Server'] = [
             'ssl' => true,
@@ -442,13 +403,10 @@ class GeneratorTest extends AbstractTestCase
             'host' => 'custom.host',
         ];
 
-        $this->assertEquals(
-            '<span class="text-danger">SSL is used without certification authority</span>'
-            . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
-            . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
-            . ' class="icon ic_b_help"></a>',
-            Generator::getServerSSL()
-        );
+        self::assertSame('<span class="text-danger">SSL is used without certification authority</span>'
+        . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
+        . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
+        . ' class="icon ic_b_help"></a>', Generator::getServerSSL());
 
         $cfg['Server'] = [
             'ssl' => true,
@@ -457,13 +415,10 @@ class GeneratorTest extends AbstractTestCase
             'host' => 'custom.host',
         ];
 
-        $this->assertEquals(
-            '<span class="">SSL is used</span>'
-            . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
-            . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
-            . ' class="icon ic_b_help"></a>',
-            Generator::getServerSSL()
-        );
+        self::assertSame('<span class="">SSL is used</span>'
+        . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
+        . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
+        . ' class="icon ic_b_help"></a>', Generator::getServerSSL());
     }
 
     /**
@@ -483,7 +438,7 @@ class GeneratorTest extends AbstractTestCase
     ): void {
         $result = Generator::getDefaultFunctionForField($field, $insertMode);
 
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
     }
 
     /**
@@ -569,9 +524,9 @@ SELECT 1;
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, Generator::getMessage('Message [em]one[/em].'));
-        $this->assertArrayNotHasKey('using_bookmark_message', $GLOBALS);
-        $this->assertArrayNotHasKey('special_message', $GLOBALS);
+        self::assertSame($expected, Generator::getMessage('Message [em]one[/em].'));
+        self::assertArrayNotHasKey('using_bookmark_message', $GLOBALS);
+        self::assertArrayNotHasKey('special_message', $GLOBALS);
         SessionCache::remove('profiling_supported');
     }
 
@@ -603,8 +558,8 @@ $sql = "EXPLAIN SELECT 1;";
 HTML;
         // phpcs:enable
 
-        $this->assertSame($expected, Generator::getMessage(Message::success('Message [em]one[/em].')));
-        $this->assertArrayNotHasKey('special_message', $GLOBALS);
+        self::assertSame($expected, Generator::getMessage(Message::success('Message [em]one[/em].')));
+        self::assertArrayNotHasKey('special_message', $GLOBALS);
         SessionCache::remove('profiling_supported');
     }
 }
diff --git a/test/classes/Html/MySQLDocumentationTest.php b/test/classes/Html/MySQLDocumentationTest.php
index 9057667c5c..11d8581cc7 100644
--- a/test/classes/Html/MySQLDocumentationTest.php
+++ b/test/classes/Html/MySQLDocumentationTest.php
@@ -17,7 +17,7 @@ class MySQLDocumentationTest extends AbstractTestCase
         $GLOBALS['server'] = '99';
         $GLOBALS['cfg']['ServerDefault'] = 1;
 
-        $this->assertEquals(
+        self::assertSame(
             '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen'
             . '%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="themes/dot.gif"'
             . ' title="Documentation" alt="Documentation" class="icon ic_b_help"></a>',
diff --git a/test/classes/Html/SecurityTest.php b/test/classes/Html/SecurityTest.php
index ef7d56ff56..6dcac7b4ed 100644
--- a/test/classes/Html/SecurityTest.php
+++ b/test/classes/Html/SecurityTest.php
@@ -30,52 +30,43 @@ class SecurityTest extends AbstractTestCase
 
     public function testInjectCodeUsingTemplate(): void
     {
-        $this->assertSame(
-            '?db=%3Cscript%3Ealert%28%27%26%3D%21%3A%3B%27%29%3B%3C%2Fscr'
-            . 'ipt%3E&amp;table=%26mytable%3E1%3F&amp;server=12'
-            . "\n"
-            . '?db=%22%27%22%3E%3Ciframe+onload%3Dalert%281%29%3E%D1%88%D0%B5%D0%BB%D0%BB%D1%8B'
-            . '&amp;table=%26mytable%3E1%3F&amp;server=12&amp;%3Cscript%3E%26%3D=%3C%2Fscript%3E'
-            . "\n",
-            $this->template->render('test/add_data', [
-                'variable1' => Url::getCommon([
-                    'db' => '<script>alert(\'&=!:;\');</script>',
-                    'table' => '&mytable>1?',
-                    'server' => 12,
-                ]),
-                'variable2' => Url::getCommonRaw([
-                    'db' => '"\'"><iframe onload=alert(1)>шеллы',
-                    'table' => '&mytable>1?',
-                    'server' => 12,
-                    '<script>&=' => '</script>',
-                ]),
-            ])
-        );
+        self::assertSame('?db=%3Cscript%3Ealert%28%27%26%3D%21%3A%3B%27%29%3B%3C%2Fscr'
+        . 'ipt%3E&amp;table=%26mytable%3E1%3F&amp;server=12'
+        . "\n"
+        . '?db=%22%27%22%3E%3Ciframe+onload%3Dalert%281%29%3E%D1%88%D0%B5%D0%BB%D0%BB%D1%8B'
+        . '&amp;table=%26mytable%3E1%3F&amp;server=12&amp;%3Cscript%3E%26%3D=%3C%2Fscript%3E'
+        . "\n", $this->template->render('test/add_data', [
+            'variable1' => Url::getCommon([
+                'db' => '<script>alert(\'&=!:;\');</script>',
+                'table' => '&mytable>1?',
+                'server' => 12,
+            ]),
+            'variable2' => Url::getCommonRaw([
+                'db' => '"\'"><iframe onload=alert(1)>шеллы',
+                'table' => '&mytable>1?',
+                'server' => 12,
+                '<script>&=' => '</script>',
+            ]),
+        ]));
         $url1 = Url::getCommon([
             'db' => '<script>alert(\'&=!:;\');</script>',
             'table' => '&mytable>1?',
             'server' => 12,
         ]);
-        $this->assertSame(
-            '?db=%3Cscript%3Ealert%28%27%26%3D%21%3A%3B%27%29%3B%3C%2Fscr'
-            . 'ipt%3E&table=%26mytable%3E1%3F&server=12',
-            $url1
-        );
-        $this->assertSame(
-            $url1
-            . "\n"
-            . '?db=%22%27%22%3E%3Ciframe+onload%3Dalert%281%29%3E%D1%88%D0%B5%D0%BB%D0%BB%D1%8B'
-            . '&table=%26mytable%3E1%3F&server=12&%3Cscript%3E%26%3D=%3C%2Fscript%3E'
-            . "\n",
-            $this->template->render('test/raw_output', [
-                'variable1' => $url1,
-                'variable2' => Url::getCommonRaw([
-                    'db' => '"\'"><iframe onload=alert(1)>шеллы',
-                    'table' => '&mytable>1?',
-                    'server' => 12,
-                    '<script>&=' => '</script>',
-                ]),
-            ])
-        );
+        self::assertSame('?db=%3Cscript%3Ealert%28%27%26%3D%21%3A%3B%27%29%3B%3C%2Fscr'
+        . 'ipt%3E&table=%26mytable%3E1%3F&server=12', $url1);
+        self::assertSame($url1
+        . "\n"
+        . '?db=%22%27%22%3E%3Ciframe+onload%3Dalert%281%29%3E%D1%88%D0%B5%D0%BB%D0%BB%D1%8B'
+        . '&table=%26mytable%3E1%3F&server=12&%3Cscript%3E%26%3D=%3C%2Fscript%3E'
+        . "\n", $this->template->render('test/raw_output', [
+            'variable1' => $url1,
+            'variable2' => Url::getCommonRaw([
+                'db' => '"\'"><iframe onload=alert(1)>шеллы',
+                'table' => '&mytable>1?',
+                'server' => 12,
+                '<script>&=' => '</script>',
+            ]),
+        ]));
     }
 }
diff --git a/test/classes/Http/Factory/ServerRequestFactoryTest.php b/test/classes/Http/Factory/ServerRequestFactoryTest.php
index c356c06347..b71598b9b6 100644
--- a/test/classes/Http/Factory/ServerRequestFactoryTest.php
+++ b/test/classes/Http/Factory/ServerRequestFactoryTest.php
@@ -85,30 +85,13 @@ class ServerRequestFactoryTest extends AbstractTestCase
         $_SERVER['HTTP_HOST'] = 'phpmyadmin.local';
 
         $request = ServerRequestFactory::createFromGlobals();
-        $this->assertSame(
-            'GET',
-            $request->getMethod()
-        );
-        $this->assertSame(
-            'http://phpmyadmin.local/test-page.php?foo=bar&blob=baz',
-            $request->getUri()->__toString()
-        );
-        $this->assertFalse(
-            $request->isPost()
-        );
-        $this->assertSame(
-            'default',
-            $request->getParam('not-exists', 'default')
-        );
-        $this->assertSame(
-            'bar',
-            $request->getParam('foo')
-        );
-        $this->assertSame(
-            'baz',
-            $request->getParam('blob')
-        );
-        $this->assertSame([
+        self::assertSame('GET', $request->getMethod());
+        self::assertSame('http://phpmyadmin.local/test-page.php?foo=bar&blob=baz', $request->getUri()->__toString());
+        self::assertFalse($request->isPost());
+        self::assertSame('default', $request->getParam('not-exists', 'default'));
+        self::assertSame('bar', $request->getParam('foo'));
+        self::assertSame('baz', $request->getParam('blob'));
+        self::assertSame([
             'foo' => 'bar',
             'blob' => 'baz',
         ], $request->getQueryParams());
@@ -146,48 +129,28 @@ class ServerRequestFactoryTest extends AbstractTestCase
 
         $request = new ServerRequest($serverRequest);
 
-        $this->assertSame(
-            ['application/x-www-form-urlencoded'],
-            $request->getHeader('Content-Type')
-        );
-        $this->assertSame(
-            'POST',
-            $request->getMethod()
-        );
-        $this->assertSame(
-            'http://phpmyadmin.local/test-page.php?foo=bar&blob=baz',
-            $request->getUri()->__toString()
-        );
-        $this->assertTrue(
-            $request->isPost()
-        );
-        $this->assertSame(
-            'default',
-            $request->getParam('not-exists', 'default')
-        );
-        $this->assertSame(
-            'bar',
-            $request->getParam('foo')
-        );
-        $this->assertSame(
-            'baz',
-            $request->getParam('blob')
-        );
-        $this->assertSame([
+        self::assertSame(['application/x-www-form-urlencoded'], $request->getHeader('Content-Type'));
+        self::assertSame('POST', $request->getMethod());
+        self::assertSame('http://phpmyadmin.local/test-page.php?foo=bar&blob=baz', $request->getUri()->__toString());
+        self::assertTrue($request->isPost());
+        self::assertSame('default', $request->getParam('not-exists', 'default'));
+        self::assertSame('bar', $request->getParam('foo'));
+        self::assertSame('baz', $request->getParam('blob'));
+        self::assertSame([
             'foo' => 'bar',
             'blob' => 'baz',
         ], $request->getQueryParams());
 
-        $this->assertSame([
+        self::assertSame([
             'input1' => 'value1',
             'input2' => 'value2',
             'input3' => '',
         ], $request->getParsedBody());
 
-        $this->assertNull($request->getParsedBodyParam('foo'));
-        $this->assertSame('value1', $request->getParsedBodyParam('input1'));
-        $this->assertSame('value2', $request->getParsedBodyParam('input2'));
-        $this->assertSame('', $request->getParsedBodyParam('input3', 'default'));
+        self::assertNull($request->getParsedBodyParam('foo'));
+        self::assertSame('value1', $request->getParsedBodyParam('input1'));
+        self::assertSame('value2', $request->getParsedBodyParam('input2'));
+        self::assertSame('', $request->getParsedBodyParam('input3', 'default'));
     }
 
     /**
@@ -200,11 +163,11 @@ class ServerRequestFactoryTest extends AbstractTestCase
         $this->runOrSkip($className, $humanName);
 
         $serverRequestFactory = new $className();
-        $this->assertInstanceOf(ServerRequestFactoryInterface::class, $serverRequestFactory);
+        self::assertInstanceOf(ServerRequestFactoryInterface::class, $serverRequestFactory);
 
         $factory = new ServerRequestFactory(
             $serverRequestFactory
         );
-        $this->assertInstanceOf(ServerRequestFactory::class, $factory);
+        self::assertInstanceOf(ServerRequestFactory::class, $factory);
     }
 }
diff --git a/test/classes/Import/AjaxTest.php b/test/classes/Import/AjaxTest.php
index 12ae3247a9..f01a97a1b9 100644
--- a/test/classes/Import/AjaxTest.php
+++ b/test/classes/Import/AjaxTest.php
@@ -14,6 +14,6 @@ class AjaxTest extends TestCase
 {
     public function testNopluginCheck(): void
     {
-        $this->assertTrue(Ajax::nopluginCheck());
+        self::assertTrue(Ajax::nopluginCheck());
     }
 }
diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php
index 474f2817e9..71cd8d06d9 100644
--- a/test/classes/ImportTest.php
+++ b/test/classes/ImportTest.php
@@ -41,35 +41,35 @@ class ImportTest extends AbstractTestCase
         $maximum_time = 0;
         $timeout_passed = false;
 
-        $this->assertFalse($this->import->checkTimeout());
+        self::assertFalse($this->import->checkTimeout());
 
         //Reinit values.
         $timestamp = time();
         $maximum_time = 0;
         $timeout_passed = true;
 
-        $this->assertFalse($this->import->checkTimeout());
+        self::assertFalse($this->import->checkTimeout());
 
         //Reinit values.
         $timestamp = time();
         $maximum_time = 30;
         $timeout_passed = true;
 
-        $this->assertTrue($this->import->checkTimeout());
+        self::assertTrue($this->import->checkTimeout());
 
         //Reinit values.
         $timestamp = time() - 15;
         $maximum_time = 30;
         $timeout_passed = false;
 
-        $this->assertFalse($this->import->checkTimeout());
+        self::assertFalse($this->import->checkTimeout());
 
         //Reinit values.
         $timestamp = time() - 60;
         $maximum_time = 30;
         $timeout_passed = false;
 
-        $this->assertTrue($this->import->checkTimeout());
+        self::assertTrue($this->import->checkTimeout());
     }
 
     /**
@@ -77,61 +77,40 @@ class ImportTest extends AbstractTestCase
      */
     public function testLookForUse(): void
     {
-        $this->assertEquals(
-            [
-                null,
-                null,
-            ],
-            $this->import->lookForUse(null, null, null)
-        );
+        self::assertSame([
+            null,
+            null,
+        ], $this->import->lookForUse(null, null, null));
 
-        $this->assertEquals(
-            [
-                'myDb',
-                null,
-            ],
-            $this->import->lookForUse(null, 'myDb', null)
-        );
+        self::assertSame([
+            'myDb',
+            null,
+        ], $this->import->lookForUse(null, 'myDb', null));
 
-        $this->assertEquals(
-            [
-                'myDb',
-                true,
-            ],
-            $this->import->lookForUse(null, 'myDb', true)
-        );
+        self::assertSame([
+            'myDb',
+            true,
+        ], $this->import->lookForUse(null, 'myDb', true));
 
-        $this->assertEquals(
-            [
-                'myDb',
-                true,
-            ],
-            $this->import->lookForUse('select 1 from myTable', 'myDb', true)
-        );
+        self::assertSame([
+            'myDb',
+            true,
+        ], $this->import->lookForUse('select 1 from myTable', 'myDb', true));
 
-        $this->assertEquals(
-            [
-                'anotherDb',
-                true,
-            ],
-            $this->import->lookForUse('use anotherDb', 'myDb', false)
-        );
+        self::assertSame([
+            'anotherDb',
+            true,
+        ], $this->import->lookForUse('use anotherDb', 'myDb', false));
 
-        $this->assertEquals(
-            [
-                'anotherDb',
-                true,
-            ],
-            $this->import->lookForUse('use anotherDb', 'myDb', true)
-        );
+        self::assertSame([
+            'anotherDb',
+            true,
+        ], $this->import->lookForUse('use anotherDb', 'myDb', true));
 
-        $this->assertEquals(
-            [
-                'anotherDb',
-                true,
-            ],
-            $this->import->lookForUse('use `anotherDb`;', 'myDb', true)
-        );
+        self::assertSame([
+            'anotherDb',
+            true,
+        ], $this->import->lookForUse('use `anotherDb`;', 'myDb', true));
     }
 
     /**
@@ -144,7 +123,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testGetColumnAlphaName(string $expected, int $num): void
     {
-        $this->assertEquals($expected, $this->import->getColumnAlphaName($num));
+        self::assertSame($expected, $this->import->getColumnAlphaName($num));
     }
 
     /**
@@ -192,7 +171,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testGetColumnNumberFromName(int $expected, string $name): void
     {
-        $this->assertEquals($expected, $this->import->getColumnNumberFromName($name));
+        self::assertSame($expected, $this->import->getColumnNumberFromName($name));
     }
 
     /**
@@ -240,7 +219,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testGetDecimalPrecision(int $expected, string $size): void
     {
-        $this->assertEquals($expected, $this->import->getDecimalPrecision($size));
+        self::assertSame($expected, $this->import->getDecimalPrecision($size));
     }
 
     /**
@@ -280,7 +259,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testGetDecimalScale(int $expected, string $size): void
     {
-        $this->assertEquals($expected, $this->import->getDecimalScale($size));
+        self::assertSame($expected, $this->import->getDecimalScale($size));
     }
 
     /**
@@ -320,7 +299,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testGetDecimalSize(array $expected, string $cell): void
     {
-        $this->assertEquals($expected, $this->import->getDecimalSize($cell));
+        self::assertSame($expected, $this->import->getDecimalSize($cell));
     }
 
     /**
@@ -379,7 +358,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testDetectType(int $expected, ?int $type, ?string $cell): void
     {
-        $this->assertEquals($expected, $this->import->detectType($type, $cell));
+        self::assertSame($expected, $this->import->detectType($type, $cell));
     }
 
     /**
@@ -485,7 +464,7 @@ class ImportTest extends AbstractTestCase
 
         $sqlQuery = 'UPDATE `table_1` AS t1, `table_2` t2 SET `table_1`.`id` = `table_2`.`id` WHERE 1';
 
-        $this->assertTrue($this->import->checkIfRollbackPossible($sqlQuery));
+        self::assertTrue($this->import->checkIfRollbackPossible($sqlQuery));
     }
 
     /**
@@ -541,7 +520,7 @@ class ImportTest extends AbstractTestCase
      */
     public function testSkipByteOrderMarksFromContents(string $input, string $cleanContents): void
     {
-        $this->assertEquals($cleanContents, $this->import->skipByteOrderMarksFromContents($input));
+        self::assertSame($cleanContents, $this->import->skipByteOrderMarksFromContents($input));
     }
 
     /**
@@ -557,39 +536,39 @@ class ImportTest extends AbstractTestCase
 
         $this->import->runQuery($query, $full, $sqlData);
 
-        $this->assertSame([], $sqlData);
-        $this->assertSame([
+        self::assertSame([], $sqlData);
+        self::assertSame([
             'sql' => 'SELECT 1;',
             'full' => 'SELECT 1;',
         ], $GLOBALS['import_run_buffer']);
-        $this->assertNull($GLOBALS['sql_query']);
-        $this->assertNull($GLOBALS['complete_query']);
-        $this->assertNull($GLOBALS['display_query']);
+        self::assertNull($GLOBALS['sql_query']);
+        self::assertNull($GLOBALS['complete_query']);
+        self::assertNull($GLOBALS['display_query']);
 
         $query = 'SELECT 2';
         $full = 'SELECT 2';
 
         $this->import->runQuery($query, $full, $sqlData);
 
-        $this->assertSame([
+        self::assertSame([
             'valid_sql' => ['SELECT 1;'],
             'valid_full' => ['SELECT 1;'],
             'valid_queries' => 1,
         ], $sqlData);
-        $this->assertSame([
+        self::assertSame([
             'sql' => 'SELECT 2;',
             'full' => 'SELECT 2;',
         ], $GLOBALS['import_run_buffer']);
-        $this->assertSame('SELECT 1;', $GLOBALS['sql_query']);
-        $this->assertSame('SELECT 1;', $GLOBALS['complete_query']);
-        $this->assertSame('SELECT 1;', $GLOBALS['display_query']);
+        self::assertSame('SELECT 1;', $GLOBALS['sql_query']);
+        self::assertSame('SELECT 1;', $GLOBALS['complete_query']);
+        self::assertSame('SELECT 1;', $GLOBALS['display_query']);
 
         $query = '';
         $full = '';
 
         $this->import->runQuery($query, $full, $sqlData);
 
-        $this->assertSame([
+        self::assertSame([
             'valid_sql' => [
                 'SELECT 1;',
                 'SELECT 2;',
@@ -601,9 +580,9 @@ class ImportTest extends AbstractTestCase
             'valid_queries' => 2,
         ], $sqlData);
 
-        $this->assertArrayNotHasKey('import_run_buffer', $GLOBALS);
-        $this->assertSame('SELECT 2;', $GLOBALS['sql_query']);
-        $this->assertSame('SELECT 1;SELECT 2;', $GLOBALS['complete_query']);
-        $this->assertSame('SELECT 1;SELECT 2;', $GLOBALS['display_query']);
+        self::assertArrayNotHasKey('import_run_buffer', $GLOBALS);
+        self::assertSame('SELECT 2;', $GLOBALS['sql_query']);
+        self::assertSame('SELECT 1;SELECT 2;', $GLOBALS['complete_query']);
+        self::assertSame('SELECT 1;SELECT 2;', $GLOBALS['display_query']);
     }
 }
diff --git a/test/classes/IndexColumnTest.php b/test/classes/IndexColumnTest.php
index 3ab72db02e..7bc1c190dc 100644
--- a/test/classes/IndexColumnTest.php
+++ b/test/classes/IndexColumnTest.php
@@ -22,30 +22,30 @@ class IndexColumnTest extends TestCase
 
     public function testGetNull(): void
     {
-        $this->assertEquals('', $this->object->getNull());
-        $this->assertEquals('No', $this->object->getNull(true));
+        self::assertSame('', $this->object->getNull());
+        self::assertSame('No', $this->object->getNull(true));
         $this->object->set(['Null' => 'YES']);
-        $this->assertEquals('YES', $this->object->getNull());
-        $this->assertEquals('Yes', $this->object->getNull(true));
+        self::assertSame('YES', $this->object->getNull());
+        self::assertSame('Yes', $this->object->getNull(true));
     }
 
     public function testGetSeqInIndex(): void
     {
-        $this->assertEquals(1, $this->object->getSeqInIndex());
+        self::assertSame(1, $this->object->getSeqInIndex());
         $this->object->set(['Seq_in_index' => 2]);
-        $this->assertEquals(2, $this->object->getSeqInIndex());
+        self::assertSame(2, $this->object->getSeqInIndex());
     }
 
     public function testGetSubPart(): void
     {
-        $this->assertNull($this->object->getSubPart());
+        self::assertNull($this->object->getSubPart());
         $this->object->set(['Sub_part' => 2]);
-        $this->assertEquals(2, $this->object->getSubPart());
+        self::assertSame(2, $this->object->getSubPart());
     }
 
     public function testGetCompareData(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             ['Column_name' => '', 'Seq_in_index' => 1, 'Collation' => null, 'Sub_part' => null, 'Null' => ''],
             $this->object->getCompareData()
         );
@@ -56,36 +56,33 @@ class IndexColumnTest extends TestCase
             'Sub_part' => 2,
             'Null' => 'NO',
         ]);
-        $this->assertEquals(
-            [
-                'Column_name' => 'name',
-                'Seq_in_index' => 2,
-                'Collation' => 'collation',
-                'Sub_part' => 2,
-                'Null' => 'NO',
-            ],
-            $object->getCompareData()
-        );
+        self::assertSame([
+            'Column_name' => 'name',
+            'Seq_in_index' => 2,
+            'Collation' => 'collation',
+            'Sub_part' => 2,
+            'Null' => 'NO',
+        ], $object->getCompareData());
     }
 
     public function testGetName(): void
     {
-        $this->assertEquals('', $this->object->getName());
+        self::assertSame('', $this->object->getName());
         $this->object->set(['Column_name' => 'name']);
-        $this->assertEquals('name', $this->object->getName());
+        self::assertSame('name', $this->object->getName());
     }
 
     public function testGetCardinality(): void
     {
-        $this->assertNull($this->object->getCardinality());
+        self::assertNull($this->object->getCardinality());
         $this->object->set(['Cardinality' => 2]);
-        $this->assertEquals(2, $this->object->getCardinality());
+        self::assertSame(2, $this->object->getCardinality());
     }
 
     public function testGetCollation(): void
     {
-        $this->assertNull($this->object->getCollation());
+        self::assertNull($this->object->getCollation());
         $this->object->set(['Collation' => 'collation']);
-        $this->assertEquals('collation', $this->object->getCollation());
+        self::assertSame('collation', $this->object->getCollation());
     }
 }
diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php
index 4109fcda72..bc11be233c 100644
--- a/test/classes/IndexTest.php
+++ b/test/classes/IndexTest.php
@@ -62,38 +62,14 @@ class IndexTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $index = new Index($this->params);
-        $this->assertEquals(
-            'PMA_Index_comment',
-            $index->getComment()
-        );
-        $this->assertEquals(
-            'PMA_Comment',
-            $index->getRemarks()
-        );
-        $this->assertEquals(
-            'PMA_Index_choice',
-            $index->getChoice()
-        );
-        $this->assertEquals(
-            'PMA_Packed',
-            $index->getPacked()
-        );
-        $this->assertEquals(
-            'PMA_Non_unique',
-            $index->getNonUnique()
-        );
-        $this->assertStringContainsString(
-            'PMA_Comment',
-            $index->getComments()
-        );
-        $this->assertStringContainsString(
-            'PMA_Index_comment',
-            $index->getComments()
-        );
-        $this->assertEquals(
-            'PMA_Index_choice',
-            $index->getChoice()
-        );
+        self::assertSame('PMA_Index_comment', $index->getComment());
+        self::assertSame('PMA_Comment', $index->getRemarks());
+        self::assertSame('PMA_Index_choice', $index->getChoice());
+        self::assertSame('PMA_Packed', $index->getPacked());
+        self::assertSame('PMA_Non_unique', $index->getNonUnique());
+        self::assertStringContainsString('PMA_Comment', $index->getComments());
+        self::assertStringContainsString('PMA_Index_comment', $index->getComments());
+        self::assertSame('PMA_Index_choice', $index->getChoice());
     }
 
     /**
@@ -103,13 +79,8 @@ class IndexTest extends AbstractTestCase
     {
         $this->params['Non_unique'] = '0';
         $index = new Index($this->params);
-        $this->assertTrue(
-            $index->isUnique()
-        );
-        $this->assertEquals(
-            'Yes',
-            $index->isUnique(true)
-        );
+        self::assertTrue($index->isUnique());
+        self::assertSame('Yes', $index->isUnique(true));
     }
 
     /**
@@ -119,13 +90,10 @@ class IndexTest extends AbstractTestCase
     {
         $index = new Index();
         $index->addColumns($this->params['columns']);
-        $this->assertTrue($index->hasColumn('column1'));
-        $this->assertTrue($index->hasColumn('column2'));
-        $this->assertTrue($index->hasColumn('column3'));
-        $this->assertEquals(
-            3,
-            $index->getColumnCount()
-        );
+        self::assertTrue($index->hasColumn('column1'));
+        self::assertTrue($index->hasColumn('column2'));
+        self::assertTrue($index->hasColumn('column3'));
+        self::assertSame(3, $index->getColumnCount());
     }
 
     /**
@@ -135,10 +103,7 @@ class IndexTest extends AbstractTestCase
     {
         $index = new Index();
         $index->setName('PMA_name');
-        $this->assertEquals(
-            'PMA_name',
-            $index->getName()
-        );
+        self::assertSame('PMA_name', $index->getName());
     }
 
     public function testColumns(): void
@@ -148,21 +113,9 @@ class IndexTest extends AbstractTestCase
 
         $index_columns = $index->getColumns();
         $index_column = $index_columns['column1'];
-        $this->assertEquals(
-            'column1',
-            $index_column->getName()
-        );
-        $this->assertEquals(
-            'index1',
-            $index_column->getSeqInIndex()
-        );
-        $this->assertEquals(
-            'Collation1',
-            $index_column->getCollation()
-        );
-        $this->assertEquals(
-            'Cardinality1',
-            $index_column->getCardinality()
-        );
+        self::assertSame('column1', $index_column->getName());
+        self::assertSame('index1', $index_column->getSeqInIndex());
+        self::assertSame('Collation1', $index_column->getCollation());
+        self::assertSame('Cardinality1', $index_column->getCardinality());
     }
 }
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 3a3a961027..18924242f5 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -120,19 +120,16 @@ class InsertEditTest extends AbstractTestCase
             'localhost'
         );
 
-        $this->assertEquals(
-            [
-                'db' => 'dbname',
-                'table' => 'tablename',
-                'goto' => 'index.php',
-                'err_url' => 'localhost',
-                'sql_query' => 'SELECT a',
-                'where_clause[foo]' => 'bar',
-                'where_clause[1]' => 'test',
-                'clause_is_unique' => false,
-            ],
-            $result
-        );
+        self::assertSame([
+            'db' => 'dbname',
+            'table' => 'tablename',
+            'goto' => 'index.php',
+            'err_url' => 'localhost',
+            'sql_query' => 'SELECT a',
+            'where_clause[foo]' => 'bar',
+            'where_clause[1]' => 'test',
+            'clause_is_unique' => false,
+        ], $result);
     }
 
     /**
@@ -157,19 +154,16 @@ class InsertEditTest extends AbstractTestCase
             'localhost'
         );
 
-        $this->assertEquals(
-            [
-                'db' => 'dbname',
-                'table' => 'tablename',
-                'goto' => 'index.php',
-                'err_url' => 'localhost',
-                'sql_query' => 'SELECT a',
-                'where_clause[foo]' => 'bar',
-                'where_clause[1]' => 'test',
-                'clause_is_unique' => false,
-            ],
-            $result
-        );
+        self::assertSame([
+            'db' => 'dbname',
+            'table' => 'tablename',
+            'goto' => 'index.php',
+            'err_url' => 'localhost',
+            'sql_query' => 'SELECT a',
+            'where_clause[foo]' => 'bar',
+            'where_clause[1]' => 'test',
+            'clause_is_unique' => false,
+        ], $result);
     }
 
     /**
@@ -177,39 +171,30 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testGetWhereClauseArray(): void
     {
-        $this->assertEquals(
-            [],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getWhereClauseArray',
-                [null]
-            )
-        );
+        self::assertSame([], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getWhereClauseArray',
+            [null]
+        ));
 
-        $this->assertEquals(
-            [
-                1,
-                2,
-                3,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getWhereClauseArray',
-                [[1, 2, 3]]
-            )
-        );
+        self::assertSame([
+            1,
+            2,
+            3,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getWhereClauseArray',
+            [[1, 2, 3]]
+        ));
 
-        $this->assertEquals(
-            ['clause'],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getWhereClauseArray',
-                ['clause']
-            )
-        );
+        self::assertSame(['clause'], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getWhereClauseArray',
+            ['clause']
+        ));
     }
 
     /**
@@ -261,24 +246,21 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertSame(
+        self::assertSame([
             [
-                [
-                    'a=1',
-                    'b="fo\\\\o"',
-                ],
-                [
-                    $resultStub1,
-                    $resultStub2,
-                ],
-                [
-                    ['assoc1'],
-                    ['assoc2'],
-                ],
-                false,
+                'a=1',
+                'b="fo\\\\o"',
             ],
-            $result
-        );
+            [
+                $resultStub1,
+                $resultStub2,
+            ],
+            [
+                ['assoc1'],
+                ['assoc2'],
+            ],
+            false,
+        ], $result);
     }
 
     /**
@@ -318,7 +300,7 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         // case 2
         $GLOBALS['cfg']['ShowSQL'] = false;
@@ -348,7 +330,7 @@ class InsertEditTest extends AbstractTestCase
 
         $response->setValue(null, $restoreInstance);
 
-        $this->assertFalse($result);
+        self::assertFalse($result);
     }
 
     public static function dataProviderConfigValueInsertRows(): array
@@ -421,13 +403,10 @@ class InsertEditTest extends AbstractTestCase
             ['table', 'db']
         );
 
-        $this->assertEquals(
-            [
-                $resultStub,
-                $rowsValue,
-            ],
-            $result
-        );
+        self::assertSame([
+            $resultStub,
+            $rowsValue,
+        ], $result);
     }
 
     /**
@@ -443,14 +422,11 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->urlParamsInEditMode([1], $where_clause_array);
 
-        $this->assertEquals(
-            [
-                '0' => 1,
-                'where_clause' => 'bar=2',
-                'sql_query' => 'SELECT 1',
-            ],
-            $result
-        );
+        self::assertSame([
+            '0' => 1,
+            'where_clause' => 'bar=2',
+            'sql_query' => 'SELECT 1',
+        ], $result);
     }
 
     /**
@@ -464,42 +440,42 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->showTypeOrFunction('function', $url_params, false);
 
-        $this->assertStringContainsString('index.php?route=/table/change', $result);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('index.php?route=/table/change', $result);
+        self::assertStringContainsString(
             'ShowFunctionFields=1&ShowFieldTypesInDataEditView=1&goto=index.php%3Froute%3D%2Fsql',
             $result
         );
-        $this->assertStringContainsString('Function', $result);
+        self::assertStringContainsString('Function', $result);
 
         // case 2
         $result = $this->insertEdit->showTypeOrFunction('function', $url_params, true);
 
-        $this->assertStringContainsString('index.php?route=/table/change', $result);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('index.php?route=/table/change', $result);
+        self::assertStringContainsString(
             'ShowFunctionFields=0&ShowFieldTypesInDataEditView=1&goto=index.php%3Froute%3D%2Fsql',
             $result
         );
-        $this->assertStringContainsString('Function', $result);
+        self::assertStringContainsString('Function', $result);
 
         // case 3
         $result = $this->insertEdit->showTypeOrFunction('type', $url_params, false);
 
-        $this->assertStringContainsString('index.php?route=/table/change', $result);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('index.php?route=/table/change', $result);
+        self::assertStringContainsString(
             'ShowFunctionFields=1&ShowFieldTypesInDataEditView=1&goto=index.php%3Froute%3D%2Fsql',
             $result
         );
-        $this->assertStringContainsString('Type', $result);
+        self::assertStringContainsString('Type', $result);
 
         // case 4
         $result = $this->insertEdit->showTypeOrFunction('type', $url_params, true);
 
-        $this->assertStringContainsString('index.php?route=/table/change', $result);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('index.php?route=/table/change', $result);
+        self::assertStringContainsString(
             'ShowFunctionFields=1&ShowFieldTypesInDataEditView=0&goto=index.php%3Froute%3D%2Fsql',
             $result
         );
-        $this->assertStringContainsString('Type', $result);
+        self::assertStringContainsString('Type', $result);
     }
 
     /**
@@ -524,25 +500,25 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals($result['Field_md5'], '4342210df36bf2ff2c4e2a997a6d4089');
+        self::assertSame($result['Field_md5'], '4342210df36bf2ff2c4e2a997a6d4089');
 
-        $this->assertEquals($result['True_Type'], 'float');
+        self::assertSame($result['True_Type'], 'float');
 
-        $this->assertEquals($result['len'], 100);
+        self::assertSame($result['len'], 100);
 
-        $this->assertEquals($result['Field_title'], '1&lt;2');
+        self::assertSame($result['Field_title'], '1&lt;2');
 
-        $this->assertEquals($result['is_binary'], false);
+        self::assertSame($result['is_binary'], false);
 
-        $this->assertEquals($result['is_blob'], false);
+        self::assertSame($result['is_blob'], false);
 
-        $this->assertEquals($result['is_char'], false);
+        self::assertSame($result['is_char'], false);
 
-        $this->assertEquals($result['pma_type'], 'float(10, 1)');
+        self::assertSame($result['pma_type'], 'float(10, 1)');
 
-        $this->assertEquals($result['wrap'], ' text-nowrap');
+        self::assertSame($result['wrap'], ' text-nowrap');
 
-        $this->assertEquals($result['Field'], '1<2');
+        self::assertSame($result['Field'], '1<2');
     }
 
     /**
@@ -553,18 +529,15 @@ class InsertEditTest extends AbstractTestCase
         $column = [];
         $column['Field'] = 'f1<';
 
-        $this->assertEquals(
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getColumnTitle',
-                [
-                    $column,
-                    [],
-                ]
-            ),
-            'f1&lt;'
-        );
+        self::assertSame($this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getColumnTitle',
+            [
+                $column,
+                [],
+            ]
+        ), 'f1&lt;');
 
         $comments = [];
         $comments['f1<'] = 'comment>';
@@ -581,9 +554,9 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString('title="comment&gt;"', $result);
+        self::assertStringContainsString('title="comment&gt;"', $result);
 
-        $this->assertStringContainsString('f1&lt;', $result);
+        self::assertStringContainsString('f1&lt;', $result);
     }
 
     /**
@@ -598,16 +571,16 @@ class InsertEditTest extends AbstractTestCase
         ];
 
         $column['Type'] = 'binaryfoo';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'Binaryfoo';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'varbinaryfoo';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'barbinaryfoo';
-        $this->assertFalse($this->insertEdit->isColumn($column, $types));
+        self::assertFalse($this->insertEdit->isColumn($column, $types));
 
         $types = [
             'char',
@@ -615,13 +588,13 @@ class InsertEditTest extends AbstractTestCase
         ];
 
         $column['Type'] = 'char(10)';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'VarChar(20)';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'foochar';
-        $this->assertFalse($this->insertEdit->isColumn($column, $types));
+        self::assertFalse($this->insertEdit->isColumn($column, $types));
 
         $types = [
             'blob',
@@ -631,22 +604,22 @@ class InsertEditTest extends AbstractTestCase
         ];
 
         $column['Type'] = 'blob';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'bloB';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'mediumBloB';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'tinyblobabc';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'longblob';
-        $this->assertTrue($this->insertEdit->isColumn($column, $types));
+        self::assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'foolongblobbar';
-        $this->assertFalse($this->insertEdit->isColumn($column, $types));
+        self::assertFalse($this->insertEdit->isColumn($column, $types));
     }
 
     /**
@@ -656,116 +629,98 @@ class InsertEditTest extends AbstractTestCase
     {
         $column = [];
         $column['True_Type'] = 'set';
-        $this->assertEquals(
+        self::assertSame([
+            'set',
+            '',
+            false,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getEnumSetAndTimestampColumns',
             [
-                'set',
-                '',
+                $column,
                 false,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ]
-            )
-        );
+            ]
+        ));
 
         $column['True_Type'] = 'enum';
-        $this->assertEquals(
+        self::assertSame([
+            'enum',
+            '',
+            false,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getEnumSetAndTimestampColumns',
             [
-                'enum',
-                '',
+                $column,
                 false,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ]
-            )
-        );
+            ]
+        ));
 
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
-        $this->assertEquals(
+        self::assertSame([
+            'date',
+            ' text-nowrap',
+            true,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getEnumSetAndTimestampColumns',
             [
-                'date',
-                ' text-nowrap',
+                $column,
+                false,
+            ]
+        ));
+
+        $column['True_Type'] = 'timestamp';
+        $column['Type'] = 'date';
+        self::assertSame([
+            'date',
+            ' text-nowrap',
+            false,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getEnumSetAndTimestampColumns',
+            [
+                $column,
                 true,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ]
-            )
-        );
-
-        $column['True_Type'] = 'timestamp';
-        $column['Type'] = 'date';
-        $this->assertEquals(
-            [
-                'date',
-                ' text-nowrap',
-                false,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    true,
-                ]
-            )
-        );
+            ]
+        ));
 
         $column['True_Type'] = 'SET';
         $column['Type'] = 'num';
-        $this->assertEquals(
+        self::assertSame([
+            'num',
+            ' text-nowrap',
+            false,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getEnumSetAndTimestampColumns',
             [
-                'num',
-                ' text-nowrap',
+                $column,
                 false,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ]
-            )
-        );
+            ]
+        ));
 
         $column['True_Type'] = '';
         $column['Type'] = 'num';
-        $this->assertEquals(
+        self::assertSame([
+            'num',
+            ' text-nowrap',
+            false,
+        ], $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getEnumSetAndTimestampColumns',
             [
-                'num',
-                ' text-nowrap',
+                $column,
                 false,
-            ],
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ]
-            )
-        );
+            ]
+        ));
     }
 
     /**
@@ -780,67 +735,55 @@ class InsertEditTest extends AbstractTestCase
         $column['Field'] = 'f';
         $column['True_Type'] = 'enum';
         $column['Type'] = 'ababababababababababa';
-        $this->assertEquals(
-            '1',
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    [],
-                ]
-            )
-        );
+        self::assertSame('1', $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getNullifyCodeForNullColumn',
+            [
+                $column,
+                $foreigners,
+                [],
+            ]
+        ));
 
         $column['True_Type'] = 'enum';
         $column['Type'] = 'abababababababababab';
-        $this->assertEquals(
-            '2',
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    [],
-                ]
-            )
-        );
+        self::assertSame('2', $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getNullifyCodeForNullColumn',
+            [
+                $column,
+                $foreigners,
+                [],
+            ]
+        ));
 
         $column['True_Type'] = 'set';
-        $this->assertEquals(
-            '3',
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    [],
-                ]
-            )
-        );
+        self::assertSame('3', $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getNullifyCodeForNullColumn',
+            [
+                $column,
+                $foreigners,
+                [],
+            ]
+        ));
 
         $column['True_Type'] = '';
         $foreigners['f'] = true;
         $foreignData['foreign_link'] = '';
-        $this->assertEquals(
-            '4',
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    $foreignData,
-                ]
-            )
-        );
+        self::assertSame('4', $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getNullifyCodeForNullColumn',
+            [
+                $column,
+                $foreigners,
+                $foreignData,
+            ]
+        ));
     }
 
     /**
@@ -879,12 +822,9 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString(
-            '<textarea name="fieldsb" class="char charField" '
-            . 'data-maxlength="10" rows="7" cols="1" dir="abc/" '
-            . 'id="field_1_3" tabindex="2" data-type="CHAR">',
-            $result
-        );
+        self::assertStringContainsString('<textarea name="fieldsb" class="char charField" '
+        . 'data-maxlength="10" rows="7" cols="1" dir="abc/" '
+        . 'id="field_1_3" tabindex="2" data-type="CHAR">', $result);
     }
 
     /**
@@ -903,19 +843,16 @@ class InsertEditTest extends AbstractTestCase
             'getColumnEnumValues',
             [$enum_set_values]
         );
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    'plain' => '<abc>',
-                    'html' => '&lt;abc&gt;',
-                ],
-                [
-                    'plain' => '"foo"',
-                    'html' => '&quot;foo&quot;',
-                ],
+                'plain' => '<abc>',
+                'html' => '&lt;abc&gt;',
             ],
-            $result
-        );
+            [
+                'plain' => '"foo"',
+                'html' => '&quot;foo&quot;',
+            ],
+        ], $result);
     }
 
     /**
@@ -938,22 +875,19 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame([
             [
                 [
-                    [
-                        'plain' => 'a',
-                        'html' => 'a',
-                    ],
-                    [
-                        'plain' => '<',
-                        'html' => '&lt;',
-                    ],
+                    'plain' => 'a',
+                    'html' => 'a',
+                ],
+                [
+                    'plain' => '<',
+                    'html' => '&lt;',
                 ],
-                2,
             ],
-            $result
-        );
+            2,
+        ], $result);
 
         $column['values'] = [
             1,
@@ -970,16 +904,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    1,
-                    2,
-                ],
-                3,
+                1,
+                2,
             ],
-            $result
-        );
+            3,
+        ], $result);
     }
 
     /**
@@ -1009,11 +940,8 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
-            . ' class="textfield datefield" c tabindex="25" id="field_0_3">',
-            $result
-        );
+        self::assertSame('<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
+        . ' class="textfield datefield" c tabindex="25" id="field_0_3">', $result);
 
         // case 2 datetime
         $column['pma_type'] = 'datetime';
@@ -1035,11 +963,8 @@ class InsertEditTest extends AbstractTestCase
                 false,
             ]
         );
-        $this->assertEquals(
-            '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
-            . ' class="textfield datetimefield" c tabindex="25" id="field_0_3">',
-            $result
-        );
+        self::assertSame('<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
+        . ' class="textfield datetimefield" c tabindex="25" id="field_0_3">', $result);
 
         // case 3 timestamp
         $column['pma_type'] = 'timestamp';
@@ -1061,11 +986,8 @@ class InsertEditTest extends AbstractTestCase
                 false,
             ]
         );
-        $this->assertEquals(
-            '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
-            . ' class="textfield datetimefield" c tabindex="25" id="field_0_3">',
-            $result
-        );
+        self::assertSame('<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
+        . ' class="textfield datetimefield" c tabindex="25" id="field_0_3">', $result);
     }
 
     /**
@@ -1085,13 +1007,10 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                "(Max: 256B)\n",
-                256,
-            ],
-            $result
-        );
+        self::assertSame([
+            "(Max: 256B)\n",
+            256,
+        ], $result);
 
         // case 2
         $GLOBALS['config']->set('max_upload_size', 250);
@@ -1106,13 +1025,10 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                "(Max: 250B)\n",
-                250,
-            ],
-            $result
-        );
+        self::assertSame([
+            "(Max: 250B)\n",
+            250,
+        ], $result);
     }
 
     /**
@@ -1159,14 +1075,11 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            "a\n\na\n"
-            . '<textarea name="fieldsb" class="char charField" '
-            . 'data-maxlength="25" rows="7" cols="1" dir="/" '
-            . 'id="field_1_3" c tabindex="34" data-type="CHAR">'
-            . '&lt;</textarea>',
-            $result
-        );
+        self::assertSame("a\n\na\n"
+        . '<textarea name="fieldsb" class="char charField" '
+        . 'data-maxlength="25" rows="7" cols="1" dir="/" '
+        . 'id="field_1_3" c tabindex="34" data-type="CHAR">'
+        . '&lt;</textarea>', $result);
 
         // case 2: (else)
         $column['is_char'] = false;
@@ -1195,14 +1108,11 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            "a\n"
-            . '<input type="text" name="fieldsb" value="&lt;" size="20" data-type="'
-            . 'DATE" class="textfield datetimefield" c tabindex="34" id="field_1_3"'
-            . '><input type="hidden" name="auto_incrementb" value="1">'
-            . '<input type="hidden" name="fields_typeb" value="timestamp">',
-            $result
-        );
+        self::assertSame("a\n"
+        . '<input type="text" name="fieldsb" value="&lt;" size="20" data-type="'
+        . 'DATE" class="textfield datetimefield" c tabindex="34" id="field_1_3"'
+        . '><input type="hidden" name="auto_incrementb" value="1">'
+        . '<input type="hidden" name="fields_typeb" value="timestamp">', $result);
 
         // case 3: (else -> datetime)
         $column['pma_type'] = 'datetime';
@@ -1230,7 +1140,7 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString('<input type="hidden" name="fields_typeb" value="datetime">', $result);
+        self::assertStringContainsString('<input type="hidden" name="fields_typeb" value="datetime">', $result);
 
         // case 4: (else -> date)
         $column['pma_type'] = 'date';
@@ -1258,7 +1168,7 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString('<input type="hidden" name="fields_typeb" value="date">', $result);
+        self::assertStringContainsString('<input type="hidden" name="fields_typeb" value="date">', $result);
 
         // case 5: (else -> bit)
         $column['True_Type'] = 'bit';
@@ -1286,7 +1196,7 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString('<input type="hidden" name="fields_typeb" value="bit">', $result);
+        self::assertStringContainsString('<input type="hidden" name="fields_typeb" value="bit">', $result);
 
         // case 6: (else -> uuid)
         $column['True_Type'] = 'uuid';
@@ -1314,7 +1224,7 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString('<input type="hidden" name="fields_typeb" value="uuid">', $result);
+        self::assertStringContainsString('<input type="hidden" name="fields_typeb" value="uuid">', $result);
     }
 
     /**
@@ -1328,36 +1238,30 @@ class InsertEditTest extends AbstractTestCase
         $GLOBALS['cfg']['MinSizeForInputField'] = 30;
         $GLOBALS['cfg']['MaxSizeForInputField'] = 40;
 
-        $this->assertEquals(
-            40,
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getColumnSize',
-                [
-                    $column,
-                    $spec_in_brackets,
-                ]
-            )
-        );
+        self::assertSame(40, $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getColumnSize',
+            [
+                $column,
+                $spec_in_brackets,
+            ]
+        ));
 
-        $this->assertEquals('textarea', $GLOBALS['cfg']['CharEditing']);
+        self::assertSame('textarea', $GLOBALS['cfg']['CharEditing']);
 
         // case 2
         $column['is_char'] = false;
         $column['len'] = 20;
-        $this->assertEquals(
-            30,
-            $this->callFunction(
-                $this->insertEdit,
-                InsertEdit::class,
-                'getColumnSize',
-                [
-                    $column,
-                    $spec_in_brackets,
-                ]
-            )
-        );
+        self::assertSame(30, $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getColumnSize',
+            [
+                $column,
+                $spec_in_brackets,
+            ]
+        ));
     }
 
     /**
@@ -1374,34 +1278,34 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->getContinueInsertionForm('tbl', 'db', $where_clause_array, 'localhost');
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<form id="continueForm" method="post" action="' . Url::getFromRoute('/table/replace')
             . '" name="continueForm">',
             $result
         );
 
-        $this->assertStringContainsString('<input type="hidden" name="db" value="db">', $result);
+        self::assertStringContainsString('<input type="hidden" name="db" value="db">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="table" value="tbl">', $result);
+        self::assertStringContainsString('<input type="hidden" name="table" value="tbl">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="goto" value="index.php">', $result);
+        self::assertStringContainsString('<input type="hidden" name="goto" value="index.php">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="err_url" value="localhost">', $result);
+        self::assertStringContainsString('<input type="hidden" name="err_url" value="localhost">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="sql_query" value="SELECT 1">', $result);
+        self::assertStringContainsString('<input type="hidden" name="sql_query" value="SELECT 1">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="where_clause[0]" value="a&lt;b">', $result);
+        self::assertStringContainsString('<input type="hidden" name="where_clause[0]" value="a&lt;b">', $result);
     }
 
     public function testIsWhereClauseNumeric(): void
     {
-        $this->assertFalse(InsertEdit::isWhereClauseNumeric(null));
-        $this->assertFalse(InsertEdit::isWhereClauseNumeric(''));
-        $this->assertFalse(InsertEdit::isWhereClauseNumeric([]));
-        $this->assertTrue(InsertEdit::isWhereClauseNumeric('`actor`.`actor_id` = 1'));
-        $this->assertTrue(InsertEdit::isWhereClauseNumeric(['`actor`.`actor_id` = 1']));
-        $this->assertFalse(InsertEdit::isWhereClauseNumeric('`actor`.`first_name` = \'value\''));
-        $this->assertFalse(InsertEdit::isWhereClauseNumeric(['`actor`.`first_name` = \'value\'']));
+        self::assertFalse(InsertEdit::isWhereClauseNumeric(null));
+        self::assertFalse(InsertEdit::isWhereClauseNumeric(''));
+        self::assertFalse(InsertEdit::isWhereClauseNumeric([]));
+        self::assertTrue(InsertEdit::isWhereClauseNumeric('`actor`.`actor_id` = 1'));
+        self::assertTrue(InsertEdit::isWhereClauseNumeric(['`actor`.`actor_id` = 1']));
+        self::assertFalse(InsertEdit::isWhereClauseNumeric('`actor`.`first_name` = \'value\''));
+        self::assertFalse(InsertEdit::isWhereClauseNumeric(['`actor`.`first_name` = \'value\'']));
     }
 
     /**
@@ -1423,11 +1327,11 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->parseString($result);
 
-        $this->assertStringContainsString('index.php?route=/table/change', $result);
+        self::assertStringContainsString('index.php?route=/table/change', $result);
 
-        $this->assertStringContainsString('ShowFunctionFields=1&ShowFieldTypesInDataEditView=0', $result);
+        self::assertStringContainsString('ShowFunctionFields=1&ShowFieldTypesInDataEditView=0', $result);
 
-        $this->assertStringContainsString('ShowFunctionFields=0&ShowFieldTypesInDataEditView=1', $result);
+        self::assertStringContainsString('ShowFunctionFields=0&ShowFieldTypesInDataEditView=1', $result);
     }
 
     /**
@@ -1456,16 +1360,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                true,
-                null,
-                null,
-                null,
-                '<input type="hidden" name="fields_preva" value="">',
-            ],
-            $result
-        );
+        self::assertSame([
+            true,
+            null,
+            null,
+            null,
+            '<input type="hidden" name="fields_preva" value="">',
+        ], $result);
 
         // Case 2 (bit)
         unset($_POST['default_action']);
@@ -1488,16 +1389,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                false,
-                '',
-                '00000000000001111011',
-                null,
-                '<input type="hidden" name="fields_preva" value="123">',
-            ],
-            $result
-        );
+        self::assertSame([
+            false,
+            '',
+            '00000000000001111011',
+            null,
+            '<input type="hidden" name="fields_preva" value="123">',
+        ], $result);
 
         $current_row['f'] = 'abcd';
         $result = $this->callFunction(
@@ -1514,16 +1412,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                false,
-                '',
-                'abcd',
-                null,
-                '<input type="hidden" name="fields_preva" value="abcd">',
-            ],
-            $result
-        );
+        self::assertSame([
+            false,
+            '',
+            'abcd',
+            null,
+            '<input type="hidden" name="fields_preva" value="abcd">',
+        ], $result);
 
         // Case 3 (bit)
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
@@ -1551,16 +1446,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                false,
-                '',
-                "'',",
-                null,
-                '<input type="hidden" name="fields_preva" value="\'\',">',
-            ],
-            $result
-        );
+        self::assertSame([
+            false,
+            '',
+            "'',",
+            null,
+            '<input type="hidden" name="fields_preva" value="\'\',">',
+        ], $result);
 
         // Case 4 (else)
         $column['is_binary'] = false;
@@ -1585,16 +1477,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                false,
-                '3131303031',
-                '3131303031',
-                '3131303031',
-                '<input type="hidden" name="fields_preva" value="3131303031">',
-            ],
-            $result
-        );
+        self::assertSame([
+            false,
+            '3131303031',
+            '3131303031',
+            '3131303031',
+            '<input type="hidden" name="fields_preva" value="3131303031">',
+        ], $result);
 
         // Case 5
         $current_row['f'] = "11001\x00";
@@ -1613,16 +1502,13 @@ class InsertEditTest extends AbstractTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                false,
-                '313130303100',
-                '313130303100',
-                '313130303100',
-                '<input type="hidden" name="fields_preva" value="313130303100">',
-            ],
-            $result
-        );
+        self::assertSame([
+            false,
+            '313130303100',
+            '313130303100',
+            '313130303100',
+            '<input type="hidden" name="fields_preva" value="313130303100">',
+        ], $result);
     }
 
     /**
@@ -1649,10 +1535,7 @@ class InsertEditTest extends AbstractTestCase
             [$column]
         );
 
-        $this->assertEquals(
-            $expected,
-            $result
-        );
+        self::assertSame($expected, $result);
     }
 
     /**
@@ -1782,15 +1665,12 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
-        $this->assertEquals(
-            [
-                ['LIMIT 1'],
-                true,
-                true,
-                false,
-            ],
-            $result
-        );
+        self::assertSame([
+            ['LIMIT 1'],
+            true,
+            true,
+            false,
+        ], $result);
 
         // case 2 (else)
         unset($_POST['where_clause']);
@@ -1800,18 +1680,15 @@ class InsertEditTest extends AbstractTestCase
         ];
         $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    'a',
-                    'c',
-                ],
-                false,
-                true,
-                false,
+                'a',
+                'c',
             ],
-            $result
-        );
+            false,
+            true,
+            false,
+        ], $result);
     }
 
     /**
@@ -1853,7 +1730,7 @@ class InsertEditTest extends AbstractTestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
         $this->insertEdit->setSessionForEditNext('`a` = 2');
 
-        $this->assertEquals('CONCAT(`table`.`orgname`) IS NULL', $_SESSION['edit_next']);
+        self::assertSame('CONCAT(`table`.`orgname`) IS NULL', $_SESSION['edit_next']);
     }
 
     /**
@@ -1864,38 +1741,23 @@ class InsertEditTest extends AbstractTestCase
         $GLOBALS['goto'] = '123.php';
         $GLOBALS['table'] = '';
 
-        $this->assertEquals(
-            '/database/sql',
-            $this->insertEdit->getGotoInclude('index')
-        );
+        self::assertSame('/database/sql', $this->insertEdit->getGotoInclude('index'));
 
         $GLOBALS['table'] = 'tbl';
-        $this->assertEquals(
-            '/table/sql',
-            $this->insertEdit->getGotoInclude('index')
-        );
+        self::assertSame('/table/sql', $this->insertEdit->getGotoInclude('index'));
 
         $GLOBALS['goto'] = 'index.php?route=/database/sql';
 
-        $this->assertEquals(
-            '/database/sql',
-            $this->insertEdit->getGotoInclude('index')
-        );
+        self::assertSame('/database/sql', $this->insertEdit->getGotoInclude('index'));
 
-        $this->assertEquals('', $GLOBALS['table']);
+        self::assertSame('', $GLOBALS['table']);
 
         $GLOBALS['goto'] = 'index.php?route=/sql&server=2';
 
-        $this->assertEquals(
-            '/sql',
-            $this->insertEdit->getGotoInclude('index')
-        );
+        self::assertSame('/sql', $this->insertEdit->getGotoInclude('index'));
 
         $_POST['after_insert'] = 'new_insert';
-        $this->assertEquals(
-            '/table/change',
-            $this->insertEdit->getGotoInclude('index')
-        );
+        self::assertSame('/table/change', $this->insertEdit->getGotoInclude('index'));
     }
 
     /**
@@ -1904,16 +1766,10 @@ class InsertEditTest extends AbstractTestCase
     public function testGetErrorUrl(): void
     {
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $this->assertEquals(
-            'index.php?route=/table/change&lang=en',
-            $this->insertEdit->getErrorUrl([])
-        );
+        self::assertSame('index.php?route=/table/change&lang=en', $this->insertEdit->getErrorUrl([]));
 
         $_POST['err_url'] = 'localhost';
-        $this->assertEquals(
-            'localhost',
-            $this->insertEdit->getErrorUrl([])
-        );
+        self::assertSame('localhost', $this->insertEdit->getErrorUrl([]));
     }
 
     /**
@@ -1932,12 +1788,12 @@ class InsertEditTest extends AbstractTestCase
             2,
         ];
 
-        $this->assertEquals(
+        self::assertSame(
             ['INSERT IGNORE INTO `table` (a, b) VALUES (1), (2)'],
             $this->insertEdit->buildSqlQuery(true, $query_fields, $value_sets)
         );
 
-        $this->assertEquals(
+        self::assertSame(
             ['INSERT INTO `table` (a, b) VALUES (1), (2)'],
             $this->insertEdit->buildSqlQuery(false, $query_fields, $value_sets)
         );
@@ -1959,9 +1815,9 @@ class InsertEditTest extends AbstractTestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
         $result = $this->insertEdit->executeSqlQuery([], $query);
 
-        $this->assertEquals(['sql_query' => 'SELECT * FROM `test_db`.`test_table`;'], $result[0]);
-        $this->assertEquals([], $result[3]);
-        $this->assertEquals('SELECT * FROM `test_db`.`test_table`;', $result[5]);
+        self::assertSame(['sql_query' => 'SELECT * FROM `test_db`.`test_table`;'], $result[0]);
+        self::assertSame([], $result[3]);
+        self::assertSame('SELECT * FROM `test_db`.`test_table`;', $result[5]);
     }
 
     /**
@@ -1980,9 +1836,9 @@ class InsertEditTest extends AbstractTestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
         $result = $this->insertEdit->executeSqlQuery([], $query);
 
-        $this->assertEquals(['sql_query' => 'SELECT * FROM `test_db`.`test_table`;'], $result[0]);
-        $this->assertEquals([], $result[3]);
-        $this->assertEquals('SELECT * FROM `test_db`.`test_table`;', $result[5]);
+        self::assertSame(['sql_query' => 'SELECT * FROM `test_db`.`test_table`;'], $result[0]);
+        self::assertSame([], $result[3]);
+        self::assertSame('SELECT * FROM `test_db`.`test_table`;', $result[5]);
     }
 
     /**
@@ -2013,7 +1869,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(['Error: #1001 Message 1', 'Warning: #1002 Message 2'], $result);
+        self::assertSame(['Error: #1001 Message 1', 'Warning: #1002 Message 2'], $result);
     }
 
     /**
@@ -2053,7 +1909,7 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->getDisplayValueForForeignTableColumn('=1', $map, 'f');
 
-        $this->assertEquals(2, $result);
+        self::assertEquals(2, $result);
     }
 
     /**
@@ -2072,24 +1928,18 @@ class InsertEditTest extends AbstractTestCase
 
         $sqlSignature = Core::signSqlQuery('SELECT * FROM `information_schema`.`TABLES` WHERE `f`=1');
 
-        $this->assertEquals(
-            '<a href="index.php?route=/sql&db=information_schema&table=TABLES&pos=0&'
-            . 'sql_signature=' . $sqlSignature . '&'
-            . 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
-            . '+%60f%60%3D1&lang=en" title="a&gt;">b&lt;</a>',
-            $result
-        );
+        self::assertSame('<a href="index.php?route=/sql&db=information_schema&table=TABLES&pos=0&'
+        . 'sql_signature=' . $sqlSignature . '&'
+        . 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
+        . '+%60f%60%3D1&lang=en" title="a&gt;">b&lt;</a>', $result);
 
         $_SESSION['tmpval']['relational_display'] = 'D';
         $result = $this->insertEdit->getLinkForRelationalDisplayField($map, 'f', '=1', 'a>', 'b<');
 
-        $this->assertEquals(
-            '<a href="index.php?route=/sql&db=information_schema&table=TABLES&pos=0&'
-            . 'sql_signature=' . $sqlSignature . '&'
-            . 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
-            . '+%60f%60%3D1&lang=en" title="b&lt;">a&gt;</a>',
-            $result
-        );
+        self::assertSame('<a href="index.php?route=/sql&db=information_schema&table=TABLES&pos=0&'
+        . 'sql_signature=' . $sqlSignature . '&'
+        . 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
+        . '+%60f%60%3D1&lang=en" title="b&lt;">a&gt;</a>', $result);
     }
 
     /**
@@ -2120,13 +1970,10 @@ class InsertEditTest extends AbstractTestCase
             'transformation'
         );
 
-        $this->assertEquals(
-            [
-                'a' => 'b',
-                'transformations' => ['cnameoption ,, quoted'],
-            ],
-            $result
-        );
+        self::assertSame([
+            'a' => 'b',
+            'transformations' => ['cnameoption ,, quoted'],
+        ], $result);
     }
 
     /**
@@ -2151,19 +1998,16 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    1,
-                    'foo',
-                ],
-                [
-                    2,
-                    '`fld`',
-                ],
+                1,
+                'foo',
             ],
-            $result
-        );
+            [
+                2,
+                '`fld`',
+            ],
+        ], $result);
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name,
@@ -2180,16 +2024,13 @@ class InsertEditTest extends AbstractTestCase
             ['a']
         );
 
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    1,
-                    '`fld` = foo',
-                ],
-                [2],
+                1,
+                '`fld` = foo',
             ],
-            $result
-        );
+            [2],
+        ], $result);
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name,
@@ -2206,13 +2047,10 @@ class InsertEditTest extends AbstractTestCase
             ['a']
         );
 
-        $this->assertEquals(
-            [
-                [1],
-                [2],
-            ],
-            $result
-        );
+        self::assertSame([
+            [1],
+            [2],
+        ], $result);
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name,
@@ -2229,16 +2067,13 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    1,
-                    '`fld` = foo',
-                ],
-                [2],
+                1,
+                '`fld` = foo',
             ],
-            $result
-        );
+            [2],
+        ], $result);
 
         // Test to see if a zero-string is not ignored
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
@@ -2256,13 +2091,10 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
-            [
-                ["`fld` = '0'"],
-                [],
-            ],
-            $result
-        );
+        self::assertSame([
+            ["`fld` = '0'"],
+            [],
+        ], $result);
 
         // Can only happen when table contains blob field that was left unchanged during edit
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
@@ -2280,13 +2112,10 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
-            [
-                [],
-                [],
-            ],
-            $result
-        );
+        self::assertSame([
+            [],
+            [],
+        ], $result);
 
         // Test to see if a field will be set to null when it wasn't null previously
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
@@ -2304,13 +2133,10 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
-            [
-                ['`fld` = NULL'],
-                [],
-            ],
-            $result
-        );
+        self::assertSame([
+            ['`fld` = NULL'],
+            [],
+        ], $result);
 
         // Test to see if a field will be ignored if it was null previously
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
@@ -2328,13 +2154,10 @@ class InsertEditTest extends AbstractTestCase
             ['on']
         );
 
-        $this->assertEquals(
-            [
-                [],
-                [],
-            ],
-            $result
-        );
+        self::assertSame([
+            [],
+            [],
+        ], $result);
 
         // Test to see if a field will be ignored if it the value is unchanged
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
@@ -2352,13 +2175,10 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
-            [
-                [],
-                [],
-            ],
-            $result
-        );
+        self::assertSame([
+            [],
+            [],
+        ], $result);
 
         // Test to see if a field can be set to NULL
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
@@ -2376,13 +2196,10 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals(
-            [
-                ['`fld` = NULL'],
-                [],
-            ],
-            $result
-        );
+        self::assertSame([
+            ['`fld` = NULL'],
+            [],
+        ], $result);
     }
 
     /**
@@ -2412,7 +2229,7 @@ class InsertEditTest extends AbstractTestCase
             '0'
         );
 
-        $this->assertEquals("'uuid1234'", $result);
+        self::assertSame("'uuid1234'", $result);
 
         // case 3
         $multi_edit_funcs = ['AES_ENCRYPT'];
@@ -2427,7 +2244,7 @@ class InsertEditTest extends AbstractTestCase
             ['func'],
             '0'
         );
-        $this->assertEquals("AES_ENCRYPT('\\'','')", $result);
+        self::assertSame("AES_ENCRYPT('\\'','')", $result);
 
         // case 4
         $multi_edit_funcs = ['func'];
@@ -2442,7 +2259,7 @@ class InsertEditTest extends AbstractTestCase
             ['func'],
             '0'
         );
-        $this->assertEquals("func('\\'')", $result);
+        self::assertSame("func('\\'')", $result);
 
         // case 5
         $multi_edit_funcs = ['RAND'];
@@ -2456,7 +2273,7 @@ class InsertEditTest extends AbstractTestCase
             ['RAND'],
             '0'
         );
-        $this->assertEquals('RAND()', $result);
+        self::assertSame('RAND()', $result);
 
         // case 6
         $multi_edit_funcs = ['PHP_PASSWORD_HASH'];
@@ -2470,7 +2287,7 @@ class InsertEditTest extends AbstractTestCase
             [],
             '0'
         );
-        $this->assertTrue(password_verify("a'c", mb_substr($result, 1, -1)));
+        self::assertTrue(password_verify("a'c", mb_substr($result, 1, -1)));
 
         // case 7 / 8 / 9 / 10
         $gisParams = [
@@ -2485,22 +2302,22 @@ class InsertEditTest extends AbstractTestCase
         ];
         // case 7
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
-        $this->assertEquals('ST_GeomFromText(\'POINT(3 4)\',4326)', $result);
+        self::assertSame('ST_GeomFromText(\'POINT(3 4)\',4326)', $result);
 
         // case 8
         $gisParams[3] = 'POINT(3 4),4326';
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
-        $this->assertEquals('ST_GeomFromText(\'POINT(3 4)\',4326)', $result);
+        self::assertSame('ST_GeomFromText(\'POINT(3 4)\',4326)', $result);
 
         // case 9
         $gisParams[3] = "'POINT(3 4)'";
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
-        $this->assertEquals('ST_GeomFromText(\'POINT(3 4)\')', $result);
+        self::assertSame('ST_GeomFromText(\'POINT(3 4)\')', $result);
 
         // case 10
         $gisParams[3] = 'POINT(3 4)';
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
-        $this->assertEquals('ST_GeomFromText(\'POINT(3 4)\')', $result);
+        self::assertSame('ST_GeomFromText(\'POINT(3 4)\')', $result);
     }
 
     /**
@@ -2527,7 +2344,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('123', $result);
+        self::assertSame('123', $result);
 
         // case 2
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2547,7 +2364,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('NULL', $result);
+        self::assertSame('NULL', $result);
 
         // case 3
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2567,7 +2384,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals("''", $result);
+        self::assertSame("''", $result);
 
         // case 4
         $_POST['fields']['multi_edit'][0][0] = [];
@@ -2588,7 +2405,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals("''", $result);
+        self::assertSame("''", $result);
 
         // case 5
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2608,7 +2425,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('0x313031', $result);
+        self::assertSame('0x313031', $result);
 
         // case 6
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2628,7 +2445,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('', $result);
+        self::assertSame('', $result);
 
         // case 7
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2648,7 +2465,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals("b'00010'", $result);
+        self::assertSame("b'00010'", $result);
 
         // case 7
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2668,7 +2485,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals("'20\\'12'", $result);
+        self::assertSame("'20\\'12'", $result);
 
         // case 8
         $_POST['fields']['multi_edit'][0][0] = [];
@@ -2689,7 +2506,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('NULL', $result);
+        self::assertSame('NULL', $result);
 
         // case 9
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2709,7 +2526,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals("''", $result);
+        self::assertSame("''", $result);
 
         // case 10
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2729,7 +2546,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('uuid()', $result);
+        self::assertSame('uuid()', $result);
 
         // case 11
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
@@ -2749,7 +2566,7 @@ class InsertEditTest extends AbstractTestCase
             []
         );
 
-        $this->assertEquals('uuid()', $result);
+        self::assertSame('uuid()', $result);
     }
 
     /**
@@ -2789,17 +2606,17 @@ class InsertEditTest extends AbstractTestCase
 
         $this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData('db', 'table', 'a', $extra_data);
 
-        $this->assertFalse($extra_data['isNeedToRecheck']);
+        self::assertFalse($extra_data['isNeedToRecheck']);
 
         $this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData('db', 'table', 'a', $extra_data);
 
-        $this->assertEquals('123', $extra_data['truncatableFieldValue']);
-        $this->assertTrue($extra_data['isNeedToRecheck']);
+        self::assertSame('123', $extra_data['truncatableFieldValue']);
+        self::assertTrue($extra_data['isNeedToRecheck']);
 
         $this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData('db', 'table', 'a', $extra_data);
 
-        $this->assertEquals('2013-08-28 06:34:14.000000', $extra_data['truncatableFieldValue']);
-        $this->assertTrue($extra_data['isNeedToRecheck']);
+        self::assertSame('2013-08-28 06:34:14.000000', $extra_data['truncatableFieldValue']);
+        self::assertTrue($extra_data['isNeedToRecheck']);
     }
 
     /**
@@ -2828,13 +2645,10 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->getTableColumns('db', 'table');
 
-        $this->assertEquals(
-            [
-                ['a' => 'b', 'c' => 'd'],
-                ['e' => 'f', 'g' => 'h'],
-            ],
-            $result
-        );
+        self::assertSame([
+            ['a' => 'b', 'c' => 'd'],
+            ['e' => 'f', 'g' => 'h'],
+        ], $result);
     }
 
     /**
@@ -2876,19 +2690,16 @@ class InsertEditTest extends AbstractTestCase
 
         $result = $this->insertEdit->determineInsertOrEdit('1', 'db', 'table');
 
-        $this->assertEquals(
-            [
-                false,
-                null,
-                [1],
-                null,
-                [$resultStub],
-                [[]],
-                false,
-                'edit_next',
-            ],
-            $result
-        );
+        self::assertEquals([
+            false,
+            null,
+            [1],
+            null,
+            [$resultStub],
+            [[]],
+            false,
+            'edit_next',
+        ], $result);
 
         // case 2
         unset($_POST['where_clause']);
@@ -2899,22 +2710,19 @@ class InsertEditTest extends AbstractTestCase
 
         $response->setValue(null, $restoreInstance);
 
-        $this->assertEquals(
+        self::assertSame([
+            true,
+            null,
+            [],
+            null,
+            $resultStub,
             [
-                true,
-                null,
-                [],
-                null,
-                $resultStub,
-                [
-                    false,
-                    false,
-                ],
                 false,
-                'edit_next',
+                false,
             ],
-            $result
-        );
+            false,
+            'edit_next',
+        ], $result);
     }
 
     /**
@@ -2953,17 +2761,11 @@ class InsertEditTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
-        $this->assertEquals(
-            [],
-            $this->insertEdit->getCommentsMap('db', 'table')
-        );
+        self::assertSame([], $this->insertEdit->getCommentsMap('db', 'table'));
 
         $GLOBALS['cfg']['ShowPropertyComments'] = true;
 
-        $this->assertEquals(
-            ['d' => 'b'],
-            $this->insertEdit->getCommentsMap('db', 'table')
-        );
+        self::assertSame(['d' => 'b'], $this->insertEdit->getCommentsMap('db', 'table'));
     }
 
     /**
@@ -2975,15 +2777,9 @@ class InsertEditTest extends AbstractTestCase
             . ' id="insert_ignore_1"><label for="insert_ignore_1">'
             . 'Ignore</label><br>' . "\n";
         $checked = 'checked="checked" ';
-        $this->assertEquals(
-            sprintf($expected, $checked),
-            $this->insertEdit->getHtmlForIgnoreOption(1)
-        );
+        self::assertSame(sprintf($expected, $checked), $this->insertEdit->getHtmlForIgnoreOption(1));
 
-        $this->assertEquals(
-            sprintf($expected, ''),
-            $this->insertEdit->getHtmlForIgnoreOption(1, false)
-        );
+        self::assertSame(sprintf($expected, ''), $this->insertEdit->getHtmlForIgnoreOption(1, false));
     }
 
     /**
@@ -3049,20 +2845,17 @@ class InsertEditTest extends AbstractTestCase
 
         $actual = $this->parseString($actual);
 
-        $this->assertStringContainsString('col', $actual);
-        $this->assertStringContainsString('<option>AES_ENCRYPT</option>', $actual);
-        $this->assertStringContainsString('<span class="column_type" dir="ltr">varchar(20)</span>', $actual);
-        $this->assertStringContainsString('<tr class="noclick">', $actual);
-        $this->assertStringContainsString('<span class="default_value hide">', $actual);
-        $this->assertStringContainsString('<img src="" width="150" height="100" alt="Image preview here">', $actual);
-        $this->assertStringContainsString(
-            '<input type="file" '
-            . 'name="fields_upload[d89e2ddb530bb8953b290ab0793aecb0]" '
-            . 'accept="image/*" '
-            . 'class="image-upload"'
-            . '>',
-            $actual
-        );
+        self::assertStringContainsString('col', $actual);
+        self::assertStringContainsString('<option>AES_ENCRYPT</option>', $actual);
+        self::assertStringContainsString('<span class="column_type" dir="ltr">varchar(20)</span>', $actual);
+        self::assertStringContainsString('<tr class="noclick">', $actual);
+        self::assertStringContainsString('<span class="default_value hide">', $actual);
+        self::assertStringContainsString('<img src="" width="150" height="100" alt="Image preview here">', $actual);
+        self::assertStringContainsString('<input type="file" '
+        . 'name="fields_upload[d89e2ddb530bb8953b290ab0793aecb0]" '
+        . 'accept="image/*" '
+        . 'class="image-upload"'
+        . '>', $actual);
 
         // Test w/o input_transformation
         $table_column = [
@@ -3110,52 +2903,37 @@ class InsertEditTest extends AbstractTestCase
 
         $actual = $this->parseString($actual);
 
-        $this->assertStringContainsString('qwerty', $actual);
-        $this->assertStringContainsString('<option>UUID</option>', $actual);
-        $this->assertStringContainsString('<span class="column_type" dir="ltr">datetime</span>', $actual);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('qwerty', $actual);
+        self::assertStringContainsString('<option>UUID</option>', $actual);
+        self::assertStringContainsString('<span class="column_type" dir="ltr">datetime</span>', $actual);
+        self::assertStringContainsString(
             '<input type="text" name="fields[a][0][d8578edf8458ce06fbc5bb76a58c5ca4]" value="12-10-14.000000"',
             $actual
         );
 
-        $this->assertStringContainsString(
-            '<select name="funcs[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]"'
-            . ' onchange="return verificationsAfterFieldChange(\'d8578edf8458ce06fbc5bb76a58c5ca4\','
-            . ' \'0\', \'datetime\')" id="field_1_1">',
-            $actual
-        );
-        $this->assertStringContainsString('<option>DATE</option>', $actual);
+        self::assertStringContainsString('<select name="funcs[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]"'
+        . ' onchange="return verificationsAfterFieldChange(\'d8578edf8458ce06fbc5bb76a58c5ca4\','
+        . ' \'0\', \'datetime\')" id="field_1_1">', $actual);
+        self::assertStringContainsString('<option>DATE</option>', $actual);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="hidden" name="fields_null_prev[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]">',
             $actual
         );
 
-        $this->assertStringContainsString(
-            '<input type="checkbox" class="checkbox_null"'
-            . ' name="fields_null[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" id="field_1_2"'
-            . ' aria-label="Use the NULL value for this column.">',
-            $actual
-        );
+        self::assertStringContainsString('<input type="checkbox" class="checkbox_null"'
+        . ' name="fields_null[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" id="field_1_2"'
+        . ' aria-label="Use the NULL value for this column.">', $actual);
 
-        $this->assertStringContainsString(
-            '<input type="hidden" class="nullify_code"'
-            . ' name="nullify_code[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" value="5"',
-            $actual
-        );
+        self::assertStringContainsString('<input type="hidden" class="nullify_code"'
+        . ' name="nullify_code[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" value="5"', $actual);
 
-        $this->assertStringContainsString(
-            '<input type="hidden" class="hashed_field"'
-            . ' name="hashed_field[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" '
-            . 'value="d8578edf8458ce06fbc5bb76a58c5ca4">',
-            $actual
-        );
+        self::assertStringContainsString('<input type="hidden" class="hashed_field"'
+        . ' name="hashed_field[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" '
+        . 'value="d8578edf8458ce06fbc5bb76a58c5ca4">', $actual);
 
-        $this->assertStringContainsString(
-            '<input type="hidden" class="multi_edit"'
-            . ' name="multi_edit[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" value="[multi_edit][0]"',
-            $actual
-        );
+        self::assertStringContainsString('<input type="hidden" class="multi_edit"'
+        . ' name="multi_edit[multi_edit][0][d8578edf8458ce06fbc5bb76a58c5ca4]" value="[multi_edit][0]"', $actual);
     }
 
     /**
@@ -3213,14 +2991,14 @@ class InsertEditTest extends AbstractTestCase
             [],
             ['wc']
         );
-        $this->assertStringContainsString('test', $actual);
-        $this->assertStringContainsString('<th>Column</th>', $actual);
-        $this->assertStringContainsString('<a', $actual);
-        $this->assertStringContainsString('<th class="w-50">Value</th>', $actual);
-        $this->assertStringContainsString('<span class="column_type" dir="ltr">longtext</span>', $actual);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('test', $actual);
+        self::assertStringContainsString('<th>Column</th>', $actual);
+        self::assertStringContainsString('<a', $actual);
+        self::assertStringContainsString('<th class="w-50">Value</th>', $actual);
+        self::assertStringContainsString('<span class="column_type" dir="ltr">longtext</span>', $actual);
+        self::assertStringContainsString(
             '<textarea name="fields[multi_edit][0][098f6bcd4621d373cade4e832627b4f6]" id="field_1_3"'
-                . ' data-type="CHAR" dir="ltr" rows="20" cols="22"',
+            . ' data-type="CHAR" dir="ltr" rows="20" cols="22"',
             $actual
         );
     }
@@ -3293,8 +3071,8 @@ class InsertEditTest extends AbstractTestCase
             [],
             ['wc']
         );
-        $this->assertStringContainsString('foo', $actual);
-        $this->assertStringNotContainsString('bar', $actual);
+        self::assertStringContainsString('foo', $actual);
+        self::assertStringNotContainsString('bar', $actual);
 
         // insert
         $table_columns = [
@@ -3354,14 +3132,14 @@ class InsertEditTest extends AbstractTestCase
             [],
             ['wc']
         );
-        $this->assertStringContainsString('foo', $actual);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('foo', $actual);
+        self::assertStringContainsString(
             '<textarea name="fields[multi_edit][0][37b51d194a7513e45b56f6524f2d51f2]"',
             $actual
         );
-        $this->assertStringContainsString(
-            '<a href="#" ><span class="text-nowrap"><img src="themes/dot.gif" title="Edit/Insert"' .
-            ' alt="Edit/Insert" class="icon ic_b_edit">&nbsp;Edit/Insert</span></a>',
+        self::assertStringContainsString(
+            '<a href="#" ><span class="text-nowrap"><img src="themes/dot.gif" title="Edit/Insert"'
+            . ' alt="Edit/Insert" class="icon ic_b_edit">&nbsp;Edit/Insert</span></a>',
             $actual
         );
     }
diff --git a/test/classes/InternalRelationsTest.php b/test/classes/InternalRelationsTest.php
index a77540ceae..d68689650d 100644
--- a/test/classes/InternalRelationsTest.php
+++ b/test/classes/InternalRelationsTest.php
@@ -15,19 +15,19 @@ class InternalRelationsTest extends TestCase
     public function testGetInformationSchema(): void
     {
         $tables = InternalRelations::getInformationSchema();
-        $this->assertIsArray($tables);
+        self::assertIsArray($tables);
         foreach ($tables as $tableName => $table) {
-            $this->assertIsString($tableName);
-            $this->assertIsArray($table);
+            self::assertIsString($tableName);
+            self::assertIsArray($table);
             foreach ($table as $fieldName => $field) {
-                $this->assertIsString($fieldName);
-                $this->assertIsArray($field);
-                $this->assertArrayHasKey('foreign_db', $field);
-                $this->assertArrayHasKey('foreign_table', $field);
-                $this->assertArrayHasKey('foreign_field', $field);
-                $this->assertIsString($field['foreign_db']);
-                $this->assertIsString($field['foreign_table']);
-                $this->assertIsString($field['foreign_field']);
+                self::assertIsString($fieldName);
+                self::assertIsArray($field);
+                self::assertArrayHasKey('foreign_db', $field);
+                self::assertArrayHasKey('foreign_table', $field);
+                self::assertArrayHasKey('foreign_field', $field);
+                self::assertIsString($field['foreign_db']);
+                self::assertIsString($field['foreign_table']);
+                self::assertIsString($field['foreign_field']);
             }
         }
     }
@@ -35,19 +35,19 @@ class InternalRelationsTest extends TestCase
     public function testGetMySql(): void
     {
         $tables = InternalRelations::getMySql();
-        $this->assertIsArray($tables);
+        self::assertIsArray($tables);
         foreach ($tables as $tableName => $table) {
-            $this->assertIsString($tableName);
-            $this->assertIsArray($table);
+            self::assertIsString($tableName);
+            self::assertIsArray($table);
             foreach ($table as $fieldName => $field) {
-                $this->assertIsString($fieldName);
-                $this->assertIsArray($field);
-                $this->assertArrayHasKey('foreign_db', $field);
-                $this->assertArrayHasKey('foreign_table', $field);
-                $this->assertArrayHasKey('foreign_field', $field);
-                $this->assertIsString($field['foreign_db']);
-                $this->assertIsString($field['foreign_table']);
-                $this->assertIsString($field['foreign_field']);
+                self::assertIsString($fieldName);
+                self::assertIsArray($field);
+                self::assertArrayHasKey('foreign_db', $field);
+                self::assertArrayHasKey('foreign_table', $field);
+                self::assertArrayHasKey('foreign_field', $field);
+                self::assertIsString($field['foreign_db']);
+                self::assertIsString($field['foreign_table']);
+                self::assertIsString($field['foreign_field']);
             }
         }
     }
diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php
index 15be0af0b0..e6ab9a87ec 100644
--- a/test/classes/IpAllowDenyTest.php
+++ b/test/classes/IpAllowDenyTest.php
@@ -62,10 +62,7 @@ class IpAllowDenyTest extends AbstractTestCase
             $_SERVER['TEST_FORWARDED_HEADER'] = $header;
         }
 
-        $this->assertEquals(
-            $expected,
-            Core::getIp()
-        );
+        self::assertSame($expected, Core::getIp());
 
         unset($_SERVER['REMOTE_ADDR']);
         unset($_SERVER['TEST_FORWARDED_HEADER']);
@@ -128,62 +125,42 @@ class IpAllowDenyTest extends AbstractTestCase
         //IPV4 testing
         $testRange = '255.255.0.0/8';
         $ipToTest = '10.0.0.0';
-        $this->assertFalse(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertFalse($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
 
         $testRange = '255.255.0.0/4';
         $ipToTest = '255.3.0.0';
-        $this->assertTrue(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertTrue($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
 
         $testRange = '255.255.0.[0-10]';
         $ipToTest = '255.3.0.3';
-        $this->assertFalse(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertFalse($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
         $ipToTest = '255.3.0.12';
-        $this->assertFalse(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertFalse($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
 
         //IPV6 testing
         //not range
         $ipToTest = '2001:4998:c:a0d:0000:0000:4998:1020';
         $testRange = '2001:4998:c:a0d:0000:0000:4998:1020';
-        $this->assertTrue(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertTrue($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
         $ipToTest = '2001:4998:c:a0d:0000:0000:4998:1020';
         $testRange = '2001:4998:c:a0d:0000:0000:4998:2020';
-        $this->assertFalse(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertFalse($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
 
         //range
         $ipToTest = '2001:4998:c:a0d:0000:0000:4998:1020';
         $testRange = '2001:4998:c:a0d:0000:0000:4998:[1001-2010]';
-        $this->assertTrue(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertTrue($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
         $ipToTest = '2001:4998:c:a0d:0000:0000:4998:3020';
         $testRange = '2001:4998:c:a0d:0000:0000:4998:[1001-2010]';
-        $this->assertFalse(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertFalse($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
 
         //CDIR
         $ipToTest = '2001:4998:c:a0d:0000:0000:4998:1020';
         $testRange = '2001:4998:c:a0d:0000:0000:4998:[1001-2010]';
-        $this->assertTrue(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertTrue($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
         $ipToTest = '2001:4998:c:a0d:0000:0000:4998:1000';
         $testRange = '2001:4998:c:a0d:0000:0000:4998:3020/24';
-        $this->assertFalse(
-            $this->ipAllowDeny->ipMaskTest($testRange, $ipToTest)
-        );
+        self::assertFalse($this->ipAllowDeny->ipMaskTest($testRange, $ipToTest));
     }
 
     /**
@@ -192,44 +169,26 @@ class IpAllowDenyTest extends AbstractTestCase
     public function testAllowDeny(): void
     {
         $_SERVER['REMOTE_ADDR'] = '';
-        $this->assertFalse(
-            $this->ipAllowDeny->allow()
-        );
+        self::assertFalse($this->ipAllowDeny->allow());
 
         $_SERVER['REMOTE_ADDR'] = '255.0.1.0';
-        $this->assertTrue(
-            $this->ipAllowDeny->allow()
-        );
+        self::assertTrue($this->ipAllowDeny->allow());
         $_SERVER['REMOTE_ADDR'] = '10.0.0.0';
-        $this->assertFalse(
-            $this->ipAllowDeny->allow()
-        );
+        self::assertFalse($this->ipAllowDeny->allow());
 
         $_SERVER['REMOTE_ADDR'] = '255.255.0.1';
-        $this->assertTrue(
-            $this->ipAllowDeny->deny()
-        );
+        self::assertTrue($this->ipAllowDeny->deny());
         $_SERVER['REMOTE_ADDR'] = '255.124.0.5';
-        $this->assertTrue(
-            $this->ipAllowDeny->deny()
-        );
+        self::assertTrue($this->ipAllowDeny->deny());
         $_SERVER['REMOTE_ADDR'] = '122.124.0.5';
-        $this->assertFalse(
-            $this->ipAllowDeny->deny()
-        );
+        self::assertFalse($this->ipAllowDeny->deny());
 
         //IPV6
         $_SERVER['REMOTE_ADDR'] = '2001:4998:c:a0d:0000:0000:4998:1020';
-        $this->assertTrue(
-            $this->ipAllowDeny->allow()
-        );
+        self::assertTrue($this->ipAllowDeny->allow());
         $_SERVER['REMOTE_ADDR'] = '2001:4998:c:a0d:0000:0000:4998:1000';
-        $this->assertFalse(
-            $this->ipAllowDeny->allow()
-        );
+        self::assertFalse($this->ipAllowDeny->allow());
         $_SERVER['REMOTE_ADDR'] = '2001:4998:c:a0d:0000:0000:4998:1020';
-        $this->assertTrue(
-            $this->ipAllowDeny->allow()
-        );
+        self::assertTrue($this->ipAllowDeny->allow());
     }
 }
diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php
index fa40b7382e..d8367f669b 100644
--- a/test/classes/LanguageTest.php
+++ b/test/classes/LanguageTest.php
@@ -56,8 +56,8 @@ class LanguageTest extends AbstractTestCase
 
         $langs = $this->manager->availableLocales();
 
-        $this->assertCount(2, $langs);
-        $this->assertContains('cs', $langs);
+        self::assertCount(2, $langs);
+        self::assertContains('cs', $langs);
         $GLOBALS['config']->set('FilterLanguages', '');
     }
 
@@ -70,8 +70,8 @@ class LanguageTest extends AbstractTestCase
 
         $langs = $this->manager->availableLocales();
 
-        $this->assertContains('cs', $langs);
-        $this->assertContains('en', $langs);
+        self::assertContains('cs', $langs);
+        self::assertContains('en', $langs);
     }
 
     /**
@@ -80,8 +80,8 @@ class LanguageTest extends AbstractTestCase
     public function testList(): void
     {
         $langs = $this->manager->listLocaleDir();
-        $this->assertContains('cs', $langs);
-        $this->assertContains('en', $langs);
+        self::assertContains('cs', $langs);
+        self::assertContains('en', $langs);
     }
 
     /**
@@ -90,11 +90,11 @@ class LanguageTest extends AbstractTestCase
     public function testLanguages(): void
     {
         $langs = $this->manager->availableLanguages();
-        $this->assertGreaterThan(1, count($langs));
+        self::assertGreaterThan(1, count($langs));
 
         /* Ensure we have name for every language */
         foreach ($langs as $lang) {
-            $this->assertNotEquals(
+            self::assertNotEquals(
                 $lang->getCode(),
                 strtolower($lang->getEnglishName()),
                 'Maybe this language does not exist in LanguageManager class'
@@ -110,12 +110,12 @@ class LanguageTest extends AbstractTestCase
     {
         $GLOBALS['config']->set('FilterLanguages', '');
         $czech = $this->manager->getLanguage('cs');
-        $this->assertNotFalse($czech);
-        $this->assertEquals('cs_CZ', $czech->getMySQLLocale());
+        self::assertNotFalse($czech);
+        self::assertSame('cs_CZ', $czech->getMySQLLocale());
 
         $azerbaijani = $this->manager->getLanguage('az');
-        $this->assertNotFalse($azerbaijani);
-        $this->assertEquals('', $azerbaijani->getMySQLLocale());
+        self::assertNotFalse($azerbaijani);
+        self::assertSame('', $azerbaijani->getMySQLLocale());
     }
 
     /**
@@ -124,7 +124,7 @@ class LanguageTest extends AbstractTestCase
     public function testSortedLanguages(): void
     {
         $langs = $this->manager->sortedLanguages();
-        $this->assertGreaterThan(1, count($langs));
+        self::assertGreaterThan(1, count($langs));
     }
 
     /**
@@ -134,11 +134,11 @@ class LanguageTest extends AbstractTestCase
     {
         $GLOBALS['config']->set('FilterLanguages', '');
         $lang = $this->manager->getLanguage('cs');
-        $this->assertNotFalse($lang);
-        $this->assertEquals('Czech', $lang->getEnglishName());
-        $this->assertEquals('Čeština', $lang->getNativeName());
+        self::assertNotFalse($lang);
+        self::assertSame('Czech', $lang->getEnglishName());
+        self::assertSame('Čeština', $lang->getNativeName());
         $lang = $this->manager->getLanguage('nonexisting');
-        $this->assertFalse($lang);
+        self::assertFalse($lang);
     }
 
     /**
@@ -182,7 +182,7 @@ class LanguageTest extends AbstractTestCase
 
         $lang = $this->manager->selectLanguage();
 
-        $this->assertEquals($expect, $lang->getCode());
+        self::assertSame($expect, $lang->getCode());
 
         $GLOBALS['config']->set('Lang', '');
         $_POST['lang'] = '';
@@ -239,17 +239,14 @@ class LanguageTest extends AbstractTestCase
         $GLOBALS['config']->set('FilterLanguages', '');
         /* We should be able to set the language */
         $lang = $this->manager->getLanguage($locale);
-        $this->assertNotFalse($lang);
+        self::assertNotFalse($lang);
         $lang->activate();
 
         /* Grab some texts */
-        $this->assertStringContainsString('%s', _ngettext('%s table', '%s tables', 10));
-        $this->assertStringContainsString('%s', _ngettext('%s table', '%s tables', 1));
+        self::assertStringContainsString('%s', _ngettext('%s table', '%s tables', 10));
+        self::assertStringContainsString('%s', _ngettext('%s table', '%s tables', 1));
 
-        $this->assertEquals(
-            $locale,
-            $this->manager->getCurrentLanguage()->getCode()
-        );
+        self::assertSame($locale, $this->manager->getCurrentLanguage()->getCode());
     }
 
     /**
diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php
index 47078a94b5..3d6665a24b 100644
--- a/test/classes/LinterTest.php
+++ b/test/classes/LinterTest.php
@@ -28,9 +28,9 @@ class LinterTest extends AbstractTestCase
      */
     public function testGetLines(): void
     {
-        $this->assertEquals([0], Linter::getLines(''));
-        $this->assertEquals([0, 2], Linter::getLines("a\nb"));
-        $this->assertEquals([0, 4, 7], Linter::getLines("abc\nde\n"));
+        self::assertSame([0], Linter::getLines(''));
+        self::assertSame([0, 2], Linter::getLines("a\nb"));
+        self::assertSame([0, 4, 7], Linter::getLines("abc\nde\n"));
     }
 
     /**
@@ -49,34 +49,22 @@ class LinterTest extends AbstractTestCase
         //      ( a, 0), ( b, 1), ( c, 2), (\n, 3),
         //      ( d, 4), ( e, 5), (\n, 6),
         //      (\n, 7).
-        $this->assertEquals(
-            [
-                1,
-                0,
-            ],
-            Linter::findLineNumberAndColumn([0, 4, 7], 4)
-        );
-        $this->assertEquals(
-            [
-                1,
-                1,
-            ],
-            Linter::findLineNumberAndColumn([0, 4, 7], 5)
-        );
-        $this->assertEquals(
-            [
-                1,
-                2,
-            ],
-            Linter::findLineNumberAndColumn([0, 4, 7], 6)
-        );
-        $this->assertEquals(
-            [
-                2,
-                0,
-            ],
-            Linter::findLineNumberAndColumn([0, 4, 7], 7)
-        );
+        self::assertSame([
+            1,
+            0,
+        ], Linter::findLineNumberAndColumn([0, 4, 7], 4));
+        self::assertSame([
+            1,
+            1,
+        ], Linter::findLineNumberAndColumn([0, 4, 7], 5));
+        self::assertSame([
+            1,
+            2,
+        ], Linter::findLineNumberAndColumn([0, 4, 7], 6));
+        self::assertSame([
+            2,
+            0,
+        ], Linter::findLineNumberAndColumn([0, 4, 7], 7));
     }
 
     /**
@@ -89,7 +77,7 @@ class LinterTest extends AbstractTestCase
      */
     public function testLint(array $expected, string $query): void
     {
-        $this->assertEquals($expected, Linter::lint($query));
+        self::assertSame($expected, Linter::lint($query));
     }
 
     /**
diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php
index bf45751b4a..9f0ff9750f 100644
--- a/test/classes/ListDatabaseTest.php
+++ b/test/classes/ListDatabaseTest.php
@@ -36,7 +36,7 @@ class ListDatabaseTest extends AbstractTestCase
     public function testEmpty(): void
     {
         $arr = new ListDatabase();
-        $this->assertEquals('', $arr->getEmpty());
+        self::assertSame('', $arr->getEmpty());
     }
 
     /**
@@ -45,7 +45,7 @@ class ListDatabaseTest extends AbstractTestCase
     public function testExists(): void
     {
         $arr = new ListDatabase();
-        $this->assertTrue($arr->exists('single_db'));
+        self::assertTrue($arr->exists('single_db'));
     }
 
     public function testGetList(): void
@@ -53,26 +53,20 @@ class ListDatabaseTest extends AbstractTestCase
         $arr = new ListDatabase();
 
         $GLOBALS['db'] = 'db';
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    'name' => 'single_db',
-                    'is_selected' => false,
-                ],
+                'name' => 'single_db',
+                'is_selected' => false,
             ],
-            $arr->getList()
-        );
+        ], $arr->getList());
 
         $GLOBALS['db'] = 'single_db';
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    'name' => 'single_db',
-                    'is_selected' => true,
-                ],
+                'name' => 'single_db',
+                'is_selected' => true,
             ],
-            $arr->getList()
-        );
+        ], $arr->getList());
     }
 
     /**
@@ -81,15 +75,12 @@ class ListDatabaseTest extends AbstractTestCase
     public function testCheckHideDatabase(): void
     {
         $GLOBALS['cfg']['Server']['hide_db'] = 'single\\_db';
-        $this->assertEquals(
-            $this->callFunction(
-                $this->object,
-                ListDatabase::class,
-                'checkHideDatabase',
-                []
-            ),
-            ''
-        );
+        self::assertEquals($this->callFunction(
+            $this->object,
+            ListDatabase::class,
+            'checkHideDatabase',
+            []
+        ), '');
     }
 
     /**
@@ -98,15 +89,9 @@ class ListDatabaseTest extends AbstractTestCase
     public function testGetDefault(): void
     {
         $GLOBALS['db'] = '';
-        $this->assertEquals(
-            $this->object->getDefault(),
-            ''
-        );
+        self::assertSame($this->object->getDefault(), '');
 
         $GLOBALS['db'] = 'mysql';
-        $this->assertEquals(
-            $this->object->getDefault(),
-            'mysql'
-        );
+        self::assertSame($this->object->getDefault(), 'mysql');
     }
 }
diff --git a/test/classes/LoggingTest.php b/test/classes/LoggingTest.php
index 5b252a75a6..ca6c1e0d58 100644
--- a/test/classes/LoggingTest.php
+++ b/test/classes/LoggingTest.php
@@ -15,8 +15,8 @@ class LoggingTest extends AbstractTestCase
     {
         $_SERVER['REMOTE_ADDR'] = '0.0.0.0';
         $log = Logging::getLogMessage('user', 'ok');
-        $this->assertEquals('user authenticated: user from 0.0.0.0', $log);
+        self::assertSame('user authenticated: user from 0.0.0.0', $log);
         $log = Logging::getLogMessage('user', 'error');
-        $this->assertEquals('user denied: user (error) from 0.0.0.0', $log);
+        self::assertSame('user denied: user (error) from 0.0.0.0', $log);
     }
 }
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index 3298ee5c85..3eb0c3b4b9 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -35,10 +35,7 @@ class MenuTest extends AbstractTestCase
     public function testServer(): void
     {
         $menu = new Menu($this->dbi, '', '');
-        $this->assertStringContainsString(
-            'floating_menubar',
-            $menu->getDisplay()
-        );
+        self::assertStringContainsString('floating_menubar', $menu->getDisplay());
     }
 
     /**
@@ -47,10 +44,7 @@ class MenuTest extends AbstractTestCase
     public function testDatabase(): void
     {
         $menu = new Menu($this->dbi, 'pma_test', '');
-        $this->assertStringContainsString(
-            'floating_menubar',
-            $menu->getDisplay()
-        );
+        self::assertStringContainsString('floating_menubar', $menu->getDisplay());
     }
 
     /**
@@ -59,10 +53,7 @@ class MenuTest extends AbstractTestCase
     public function testTable(): void
     {
         $menu = new Menu($this->dbi, 'pma_test', 'table1');
-        $this->assertStringContainsString(
-            'floating_menubar',
-            $menu->getDisplay()
-        );
+        self::assertStringContainsString('floating_menubar', $menu->getDisplay());
     }
 
     /**
@@ -72,9 +63,6 @@ class MenuTest extends AbstractTestCase
     {
         $menu = new Menu($this->dbi, 'pma_test', '');
         $menu->setTable('table1');
-        $this->assertStringContainsString(
-            'table1',
-            $menu->getDisplay()
-        );
+        self::assertStringContainsString('table1', $menu->getDisplay());
     }
 }
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 445adf0d0f..cc97c4b641 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -32,7 +32,7 @@ class MessageTest extends AbstractTestCase
     public function testToString(): void
     {
         $this->object->setMessage('test<&>', true);
-        $this->assertEquals('test&lt;&amp;&gt;', (string) $this->object);
+        self::assertSame('test&lt;&amp;&gt;', (string) $this->object);
     }
 
     /**
@@ -41,11 +41,8 @@ class MessageTest extends AbstractTestCase
     public function testSuccess(): void
     {
         $this->object = new Message('test<&>', Message::SUCCESS);
-        $this->assertEquals($this->object, Message::success('test<&>'));
-        $this->assertEquals(
-            'Your SQL query has been executed successfully.',
-            Message::success()->getString()
-        );
+        self::assertEquals($this->object, Message::success('test<&>'));
+        self::assertSame('Your SQL query has been executed successfully.', Message::success()->getString());
     }
 
     /**
@@ -54,8 +51,8 @@ class MessageTest extends AbstractTestCase
     public function testError(): void
     {
         $this->object = new Message('test<&>', Message::ERROR);
-        $this->assertEquals($this->object, Message::error('test<&>'));
-        $this->assertEquals('Error', Message::error()->getString());
+        self::assertEquals($this->object, Message::error('test<&>'));
+        self::assertSame('Error', Message::error()->getString());
     }
 
     /**
@@ -64,7 +61,7 @@ class MessageTest extends AbstractTestCase
     public function testNotice(): void
     {
         $this->object = new Message('test<&>', Message::NOTICE);
-        $this->assertEquals($this->object, Message::notice('test<&>'));
+        self::assertEquals($this->object, Message::notice('test<&>'));
     }
 
     /**
@@ -76,7 +73,7 @@ class MessageTest extends AbstractTestCase
         $this->object->setMessage('test<&>');
         $this->object->setBBCode(false);
 
-        $this->assertEquals($this->object, Message::rawError('test<&>'));
+        self::assertEquals($this->object, Message::rawError('test<&>'));
     }
 
     /**
@@ -88,7 +85,7 @@ class MessageTest extends AbstractTestCase
         $this->object->setMessage('test<&>');
         $this->object->setBBCode(false);
 
-        $this->assertEquals($this->object, Message::rawNotice('test<&>'));
+        self::assertEquals($this->object, Message::rawNotice('test<&>'));
     }
 
     /**
@@ -100,7 +97,7 @@ class MessageTest extends AbstractTestCase
         $this->object->setMessage('test<&>');
         $this->object->setBBCode(false);
 
-        $this->assertEquals($this->object, Message::rawSuccess('test<&>'));
+        self::assertEquals($this->object, Message::rawSuccess('test<&>'));
     }
 
     /**
@@ -108,8 +105,8 @@ class MessageTest extends AbstractTestCase
      */
     public function testIsSuccess(): void
     {
-        $this->assertFalse($this->object->isSuccess());
-        $this->assertTrue($this->object->isSuccess(true));
+        self::assertFalse($this->object->isSuccess());
+        self::assertTrue($this->object->isSuccess(true));
     }
 
     /**
@@ -117,10 +114,10 @@ class MessageTest extends AbstractTestCase
      */
     public function testIsNotice(): void
     {
-        $this->assertTrue($this->object->isNotice());
+        self::assertTrue($this->object->isNotice());
         $this->object->isError(true);
-        $this->assertFalse($this->object->isNotice());
-        $this->assertTrue($this->object->isNotice(true));
+        self::assertFalse($this->object->isNotice());
+        self::assertTrue($this->object->isNotice(true));
     }
 
     /**
@@ -128,8 +125,8 @@ class MessageTest extends AbstractTestCase
      */
     public function testIsError(): void
     {
-        $this->assertFalse($this->object->isError());
-        $this->assertTrue($this->object->isError(true));
+        self::assertFalse($this->object->isError());
+        self::assertTrue($this->object->isError(true));
     }
 
     /**
@@ -138,9 +135,9 @@ class MessageTest extends AbstractTestCase
     public function testSetMessage(): void
     {
         $this->object->setMessage('test&<>', false);
-        $this->assertEquals('test&<>', $this->object->getMessage());
+        self::assertSame('test&<>', $this->object->getMessage());
         $this->object->setMessage('test&<>', true);
-        $this->assertEquals('test&amp;&lt;&gt;', $this->object->getMessage());
+        self::assertSame('test&amp;&lt;&gt;', $this->object->getMessage());
     }
 
     /**
@@ -149,9 +146,9 @@ class MessageTest extends AbstractTestCase
     public function testSetString(): void
     {
         $this->object->setString('test&<>', false);
-        $this->assertEquals('test&<>', $this->object->getString());
+        self::assertSame('test&<>', $this->object->getString());
         $this->object->setString('test&<>', true);
-        $this->assertEquals('test&amp;&lt;&gt;', $this->object->getString());
+        self::assertSame('test&amp;&lt;&gt;', $this->object->getString());
     }
 
     /**
@@ -160,27 +157,18 @@ class MessageTest extends AbstractTestCase
     public function testAddParam(): void
     {
         $this->object->addParam(Message::notice('test'));
-        $this->assertEquals(
-            [Message::notice('test')],
-            $this->object->getParams()
-        );
+        self::assertEquals([Message::notice('test')], $this->object->getParams());
         $this->object->addParam('test');
-        $this->assertEquals(
-            [
-                Message::notice('test'),
-                'test',
-            ],
-            $this->object->getParams()
-        );
+        self::assertEquals([
+            Message::notice('test'),
+            'test',
+        ], $this->object->getParams());
         $this->object->addParam('test');
-        $this->assertEquals(
-            [
-                Message::notice('test'),
-                'test',
-                Message::notice('test'),
-            ],
-            $this->object->getParams()
-        );
+        self::assertEquals([
+            Message::notice('test'),
+            'test',
+            Message::notice('test'),
+        ], $this->object->getParams());
     }
 
     /**
@@ -192,10 +180,7 @@ class MessageTest extends AbstractTestCase
         $this->object->addParamHtml('<a href="">');
         $this->object->addParam('user<>');
         $this->object->addParamHtml('</a>');
-        $this->assertEquals(
-            'Hello <a href="">user&lt;&gt;</a>',
-            $this->object->getMessage()
-        );
+        self::assertSame('Hello <a href="">user&lt;&gt;</a>', $this->object->getMessage());
     }
 
     /**
@@ -204,22 +189,16 @@ class MessageTest extends AbstractTestCase
     public function testAddString(): void
     {
         $this->object->addText('test', '*');
-        $this->assertEquals(
-            [
-                '*',
-                Message::notice('test'),
-            ],
-            $this->object->getAddedMessages()
-        );
+        self::assertEquals([
+            '*',
+            Message::notice('test'),
+        ], $this->object->getAddedMessages());
         $this->object->addText('test', '');
-        $this->assertEquals(
-            [
-                '*',
-                Message::notice('test'),
-                Message::notice('test'),
-            ],
-            $this->object->getAddedMessages()
-        );
+        self::assertEquals([
+            '*',
+            Message::notice('test'),
+            Message::notice('test'),
+        ], $this->object->getAddedMessages());
     }
 
     /**
@@ -228,24 +207,15 @@ class MessageTest extends AbstractTestCase
     public function testAddMessage(): void
     {
         $this->object->addText('test<>', '');
-        $this->assertEquals(
-            [Message::notice('test&lt;&gt;')],
-            $this->object->getAddedMessages()
-        );
+        self::assertEquals([Message::notice('test&lt;&gt;')], $this->object->getAddedMessages());
         $this->object->addHtml('<b>test</b>');
-        $this->assertEquals(
-            [
-                Message::notice('test&lt;&gt;'),
-                ' ',
-                Message::rawNotice('<b>test</b>'),
-            ],
-            $this->object->getAddedMessages()
-        );
+        self::assertEquals([
+            Message::notice('test&lt;&gt;'),
+            ' ',
+            Message::rawNotice('<b>test</b>'),
+        ], $this->object->getAddedMessages());
         $this->object->addMessage(Message::notice('test<>'));
-        $this->assertEquals(
-            'test&lt;&gt; <b>test</b> test<>',
-            $this->object->getMessage()
-        );
+        self::assertSame('test&lt;&gt; <b>test</b> test<>', $this->object->getMessage());
     }
 
     /**
@@ -259,14 +229,11 @@ class MessageTest extends AbstractTestCase
         $messages[] = new Message('Test3');
         $this->object->addMessages($messages, '');
 
-        $this->assertEquals(
-            [
-                Message::notice('Test1'),
-                Message::error('PMA_Test2'),
-                Message::notice('Test3'),
-            ],
-            $this->object->getAddedMessages()
-        );
+        self::assertEquals([
+            Message::notice('Test1'),
+            Message::error('PMA_Test2'),
+            Message::notice('Test3'),
+        ], $this->object->getAddedMessages());
     }
 
     /**
@@ -281,19 +248,13 @@ class MessageTest extends AbstractTestCase
         ];
         $this->object->addMessagesString($messages, '');
 
-        $this->assertEquals(
-            [
-                Message::notice('test1'),
-                Message::notice('test&lt;b&gt;'),
-                Message::notice('test2'),
-            ],
-            $this->object->getAddedMessages()
-        );
+        self::assertEquals([
+            Message::notice('test1'),
+            Message::notice('test&lt;b&gt;'),
+            Message::notice('test2'),
+        ], $this->object->getAddedMessages());
 
-        $this->assertEquals(
-            'test1test&lt;b&gt;test2',
-            $this->object->getMessage()
-        );
+        self::assertSame('test1test&lt;b&gt;test2', $this->object->getMessage());
     }
 
     /**
@@ -302,9 +263,9 @@ class MessageTest extends AbstractTestCase
     public function testSetParams(): void
     {
         $this->object->setParams(['test&<>']);
-        $this->assertEquals(['test&<>'], $this->object->getParams());
+        self::assertSame(['test&<>'], $this->object->getParams());
         $this->object->setParams(['test&<>'], true);
-        $this->assertEquals(['test&amp;&lt;&gt;'], $this->object->getParams());
+        self::assertSame(['test&amp;&lt;&gt;'], $this->object->getParams());
     }
 
     /**
@@ -313,17 +274,11 @@ class MessageTest extends AbstractTestCase
     public function testSanitize(): void
     {
         $this->object->setString('test&string<>', false);
-        $this->assertEquals(
+        self::assertSame('test&amp;string&lt;&gt;', Message::sanitize($this->object));
+        self::assertSame([
             'test&amp;string&lt;&gt;',
-            Message::sanitize($this->object)
-        );
-        $this->assertEquals(
-            [
-                'test&amp;string&lt;&gt;',
-                'test&amp;string&lt;&gt;',
-            ],
-            Message::sanitize([$this->object, $this->object])
-        );
+            'test&amp;string&lt;&gt;',
+        ], Message::sanitize([$this->object, $this->object]));
     }
 
     /**
@@ -390,7 +345,7 @@ class MessageTest extends AbstractTestCase
     public function testDecodeBB(string $actual, string $expected): void
     {
         unset($GLOBALS['server']);
-        $this->assertEquals($expected, Message::decodeBB($actual));
+        self::assertSame($expected, Message::decodeBB($actual));
     }
 
     /**
@@ -398,22 +353,10 @@ class MessageTest extends AbstractTestCase
      */
     public function testFormat(): void
     {
-        $this->assertEquals(
-            'test string',
-            Message::format('test string')
-        );
-        $this->assertEquals(
-            'test string',
-            Message::format('test string', 'a')
-        );
-        $this->assertEquals(
-            'test string',
-            Message::format('test string', [])
-        );
-        $this->assertEquals(
-            'test string',
-            Message::format('%s string', ['test'])
-        );
+        self::assertSame('test string', Message::format('test string'));
+        self::assertSame('test string', Message::format('test string', 'a'));
+        self::assertSame('test string', Message::format('test string', []));
+        self::assertSame('test string', Message::format('%s string', ['test']));
     }
 
     /**
@@ -423,10 +366,7 @@ class MessageTest extends AbstractTestCase
     {
         $this->object->setString('<&>test', false);
         $this->object->setMessage('<&>test', false);
-        $this->assertEquals(
-            md5(Message::NOTICE . '<&>test<&>test'),
-            $this->object->getHash()
-        );
+        self::assertSame(md5(Message::NOTICE . '<&>test<&>test'), $this->object->getHash());
     }
 
     /**
@@ -439,10 +379,7 @@ class MessageTest extends AbstractTestCase
         $this->object->setString('test string %s %s');
         $this->object->addParam('test param 1');
         $this->object->addParam('test param 2');
-        $this->assertEquals(
-            'test string test param 1 test param 2',
-            $this->object->getMessage()
-        );
+        self::assertSame('test string test param 1 test param 2', $this->object->getMessage());
     }
 
     /**
@@ -452,7 +389,7 @@ class MessageTest extends AbstractTestCase
     {
         $this->object->setMessage('');
         $this->object->setString('');
-        $this->assertEquals('', $this->object->getMessage());
+        self::assertSame('', $this->object->getMessage());
     }
 
     /**
@@ -462,12 +399,9 @@ class MessageTest extends AbstractTestCase
     public function testGetMessageWithMessageWithBBCode(): void
     {
         $this->object->setMessage('[kbd]test[/kbd] [doc@cfg_Example]test[/doc]');
-        $this->assertEquals(
-            '<kbd>test</kbd> <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.'
-            . 'net%2Fen%2Flatest%2Fconfig.html%23cfg_Example"'
-            . ' target="documentation">test</a>',
-            $this->object->getMessage()
-        );
+        self::assertSame('<kbd>test</kbd> <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.'
+        . 'net%2Fen%2Flatest%2Fconfig.html%23cfg_Example"'
+        . ' target="documentation">test</a>', $this->object->getMessage());
     }
 
     /**
@@ -475,11 +409,11 @@ class MessageTest extends AbstractTestCase
      */
     public function testGetLevel(): void
     {
-        $this->assertEquals('notice', $this->object->getLevel());
+        self::assertSame('notice', $this->object->getLevel());
         $this->object->setNumber(Message::SUCCESS);
-        $this->assertEquals('success', $this->object->getLevel());
+        self::assertSame('success', $this->object->getLevel());
         $this->object->setNumber(Message::ERROR);
-        $this->assertEquals('error', $this->object->getLevel());
+        self::assertSame('error', $this->object->getLevel());
     }
 
     /**
@@ -487,15 +421,12 @@ class MessageTest extends AbstractTestCase
      */
     public function testGetDisplay(): void
     {
-        $this->assertFalse($this->object->isDisplayed());
+        self::assertFalse($this->object->isDisplayed());
         $this->object->setMessage('Test Message');
-        $this->assertEquals(
-            '<div class="alert alert-primary" role="alert">' . "\n"
-            . '  <img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice"> Test Message' . "\n"
-            . '</div>' . "\n",
-            $this->object->getDisplay()
-        );
-        $this->assertTrue($this->object->isDisplayed());
+        self::assertSame('<div class="alert alert-primary" role="alert">' . "\n"
+        . '  <img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice"> Test Message' . "\n"
+        . '</div>' . "\n", $this->object->getDisplay());
+        self::assertTrue($this->object->isDisplayed());
     }
 
     /**
@@ -503,9 +434,9 @@ class MessageTest extends AbstractTestCase
      */
     public function testIsDisplayed(): void
     {
-        $this->assertFalse($this->object->isDisplayed(false));
-        $this->assertTrue($this->object->isDisplayed(true));
-        $this->assertTrue($this->object->isDisplayed(false));
+        self::assertFalse($this->object->isDisplayed(false));
+        self::assertTrue($this->object->isDisplayed(true));
+        self::assertTrue($this->object->isDisplayed(false));
     }
 
     /**
@@ -550,7 +481,7 @@ class MessageTest extends AbstractTestCase
         $this->object = new Message();
         $msg = $this->object->getMessageForAffectedRows($rows);
         $this->object->addMessage($msg);
-        $this->assertEquals($output, $this->object->getDisplay());
+        self::assertSame($output, $this->object->getDisplay());
     }
 
     /**
@@ -595,7 +526,7 @@ class MessageTest extends AbstractTestCase
         $this->object = new Message();
         $msg = $this->object->getMessageForInsertedRows($rows);
         $this->object->addMessage($msg);
-        $this->assertEquals($output, $this->object->getDisplay());
+        self::assertSame($output, $this->object->getDisplay());
     }
 
     /**
@@ -640,6 +571,6 @@ class MessageTest extends AbstractTestCase
         $this->object = new Message();
         $msg = $this->object->getMessageForDeletedRows($rows);
         $this->object->addMessage($msg);
-        $this->assertEquals($output, $this->object->getDisplay());
+        self::assertSame($output, $this->object->getDisplay());
     }
 }
diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php
index 3b5f10350d..6d9e1f91b3 100644
--- a/test/classes/MimeTest.php
+++ b/test/classes/MimeTest.php
@@ -23,10 +23,7 @@ class MimeTest extends AbstractTestCase
      */
     public function testDetect(string $test, string $output): void
     {
-        $this->assertEquals(
-            Mime::detect($test),
-            $output
-        );
+        self::assertSame(Mime::detect($test), $output);
     }
 
     /**
diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php
index 2bd6169455..9ea0a4c155 100644
--- a/test/classes/Navigation/NavigationTest.php
+++ b/test/classes/Navigation/NavigationTest.php
@@ -107,8 +107,8 @@ class NavigationTest extends AbstractTestCase
     public function testGetItemUnhideDialog(): void
     {
         $html = $this->object->getItemUnhideDialog('db');
-        $this->assertStringContainsString('<td>tableName</td>', $html);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('<td>tableName</td>', $html);
+        self::assertStringContainsString(
             '<a class="unhideNavItem ajax" href="' . Url::getFromRoute('/navigation') . '" data-post="'
             . 'unhideNavItem=1&itemType=table&'
             . 'itemName=tableName&dbName=db&lang=en">',
diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php
index 6b16dbaab5..ba177e0017 100644
--- a/test/classes/Navigation/NavigationTreeTest.php
+++ b/test/classes/Navigation/NavigationTreeTest.php
@@ -55,7 +55,7 @@ class NavigationTreeTest extends AbstractTestCase
     public function testRenderState(): void
     {
         $result = $this->object->renderState();
-        $this->assertStringContainsString('pma_quick_warp', $result);
+        self::assertStringContainsString('pma_quick_warp', $result);
     }
 
     /**
@@ -64,8 +64,8 @@ class NavigationTreeTest extends AbstractTestCase
     public function testRenderPath(): void
     {
         $result = $this->object->renderPath();
-        $this->assertIsString($result);
-        $this->assertStringContainsString('list_container', $result);
+        self::assertIsString($result);
+        self::assertStringContainsString('list_container', $result);
     }
 
     /**
@@ -74,7 +74,7 @@ class NavigationTreeTest extends AbstractTestCase
     public function testRenderDbSelect(): void
     {
         $result = $this->object->renderDbSelect();
-        $this->assertStringContainsString('pma_navigation_select_database', $result);
+        self::assertStringContainsString('pma_navigation_select_database', $result);
     }
 
     public function testDatabaseGrouping(): void
@@ -100,10 +100,10 @@ class NavigationTreeTest extends AbstractTestCase
 
         $object = new NavigationTree(new Template(), $this->dbi);
         $result = $object->renderState();
-        $this->assertStringContainsString('<li class="first navGroup">', $result);
-        $this->assertStringContainsString('functions' . "\n", $result);
-        $this->assertStringContainsString('<div class="list_container" style="display: none;">', $result);
-        $this->assertStringContainsString('functions__a', $result);
-        $this->assertStringContainsString('functions__b', $result);
+        self::assertStringContainsString('<li class="first navGroup">', $result);
+        self::assertStringContainsString('functions' . "\n", $result);
+        self::assertStringContainsString('<div class="list_container" style="display: none;">', $result);
+        self::assertStringContainsString('functions__a', $result);
+        self::assertStringContainsString('functions__b', $result);
     }
 }
diff --git a/test/classes/Navigation/NodeFactoryTest.php b/test/classes/Navigation/NodeFactoryTest.php
index 3e568db2e2..fd746a7b59 100644
--- a/test/classes/Navigation/NodeFactoryTest.php
+++ b/test/classes/Navigation/NodeFactoryTest.php
@@ -25,25 +25,25 @@ class NodeFactoryTest extends AbstractTestCase
     public function testDefaultNode(): void
     {
         $node = NodeFactory::getInstance();
-        $this->assertEquals('default', $node->name);
-        $this->assertEquals(Node::OBJECT, $node->type);
-        $this->assertFalse($node->isGroup);
+        self::assertSame('default', $node->name);
+        self::assertSame(Node::OBJECT, $node->type);
+        self::assertFalse($node->isGroup);
     }
 
     public function testDefaultContainer(): void
     {
         $node = NodeFactory::getInstance('Node', 'default', Node::CONTAINER);
-        $this->assertEquals('default', $node->name);
-        $this->assertEquals(Node::CONTAINER, $node->type);
-        $this->assertFalse($node->isGroup);
+        self::assertSame('default', $node->name);
+        self::assertSame(Node::CONTAINER, $node->type);
+        self::assertFalse($node->isGroup);
     }
 
     public function testGroupContainer(): void
     {
         $node = NodeFactory::getInstance('Node', 'default', Node::CONTAINER, true);
-        $this->assertEquals('default', $node->name);
-        $this->assertEquals(Node::CONTAINER, $node->type);
-        $this->assertTrue($node->isGroup);
+        self::assertSame('default', $node->name);
+        self::assertSame(Node::CONTAINER, $node->type);
+        self::assertTrue($node->isGroup);
     }
 
     /**
diff --git a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
index dc7faa2da9..e4c4c34dff 100644
--- a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
@@ -24,14 +24,11 @@ class NodeColumnContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeColumnContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
-                'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('columns', $parent->realName);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+            'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+        ], $parent->links);
+        self::assertSame('columns', $parent->realName);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php
index 783be7c7c1..4ac93a3ec1 100644
--- a/test/classes/Navigation/Nodes/NodeColumnTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnTest.php
@@ -24,20 +24,17 @@ class NodeColumnTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeColumn', ['name' => 'name', 'key' => 'key']);
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => [
-                    'route' => '/table/structure/change',
-                    'params' => ['change_column' => 1, 'db' => null, 'table' => null, 'field' => null],
-                ],
-                'icon' => [
-                    'route' => '/table/structure/change',
-                    'params' => ['change_column' => 1, 'db' => null, 'table' => null, 'field' => null],
-                ],
-                'title' => 'Structure',
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => [
+                'route' => '/table/structure/change',
+                'params' => ['change_column' => 1, 'db' => null, 'table' => null, 'field' => null],
             ],
-            $parent->links
-        );
+            'icon' => [
+                'route' => '/table/structure/change',
+                'params' => ['change_column' => 1, 'db' => null, 'table' => null, 'field' => null],
+            ],
+            'title' => 'Structure',
+        ], $parent->links);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
index 29980932a3..1145283168 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
@@ -67,13 +67,10 @@ class NodeDatabaseChildTest extends AbstractTestCase
             ->will($this->returnValue('itemType'));
         $html = $this->object->getHtmlForControlButtons();
 
-        $this->assertStringStartsWith('<span class="navItemControls">', $html);
-        $this->assertStringEndsWith('</span>', $html);
-        $this->assertStringContainsString(
-            '<a href="' . Url::getFromRoute('/navigation') . '" data-post="'
-            . 'hideNavItem=1&itemType=itemType&itemName=child'
-            . '&dbName=parent&lang=en" class="hideNavItem ajax">',
-            $html
-        );
+        self::assertStringStartsWith('<span class="navItemControls">', $html);
+        self::assertStringEndsWith('</span>', $html);
+        self::assertStringContainsString('<a href="' . Url::getFromRoute('/navigation') . '" data-post="'
+        . 'hideNavItem=1&itemType=itemType&itemName=child'
+        . '&dbName=parent&lang=en" class="hideNavItem ajax">', $html);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
index 84d3476516..b69a150c82 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
@@ -32,19 +32,16 @@ class NodeDatabaseTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeDatabase');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => [
-                    'route' => '/database/structure',
-                    'params' => ['db' => null],
-                ],
-                'icon' => ['route' => '/database/operations', 'params' => ['db' => null]],
-                'title' => 'Structure',
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => [
+                'route' => '/database/structure',
+                'params' => ['db' => null],
             ],
-            $parent->links
-        );
-        $this->assertStringContainsString('database', $parent->classes);
+            'icon' => ['route' => '/database/operations', 'params' => ['db' => null]],
+            'title' => 'Structure',
+        ], $parent->links);
+        self::assertStringContainsString('database', $parent->classes);
     }
 
     /**
@@ -53,26 +50,11 @@ class NodeDatabaseTest extends AbstractTestCase
     public function testGetPresence(): void
     {
         $parent = NodeFactory::getInstance('NodeDatabase');
-        $this->assertEquals(
-            2,
-            $parent->getPresence('tables')
-        );
-        $this->assertEquals(
-            0,
-            $parent->getPresence('views')
-        );
-        $this->assertEquals(
-            1,
-            $parent->getPresence('functions')
-        );
-        $this->assertEquals(
-            0,
-            $parent->getPresence('procedures')
-        );
-        $this->assertEquals(
-            0,
-            $parent->getPresence('events')
-        );
+        self::assertSame(2, $parent->getPresence('tables'));
+        self::assertSame(0, $parent->getPresence('views'));
+        self::assertSame(1, $parent->getPresence('functions'));
+        self::assertSame(0, $parent->getPresence('procedures'));
+        self::assertSame(0, $parent->getPresence('events'));
     }
 
     /**
@@ -83,18 +65,18 @@ class NodeDatabaseTest extends AbstractTestCase
         $parent = NodeFactory::getInstance('NodeDatabase');
 
         $tables = $parent->getData('tables', 0);
-        $this->assertContains('test1', $tables);
-        $this->assertContains('test2', $tables);
+        self::assertContains('test1', $tables);
+        self::assertContains('test2', $tables);
 
         $views = $parent->getData('views', 0);
-        $this->assertEmpty($views);
+        self::assertEmpty($views);
 
         $functions = $parent->getData('functions', 0);
-        $this->assertContains('testFunction', $functions);
-        $this->assertCount(1, $functions);
+        self::assertContains('testFunction', $functions);
+        self::assertCount(1, $functions);
 
-        $this->assertEmpty($parent->getData('procedures', 0));
-        $this->assertEmpty($parent->getData('events', 0));
+        self::assertEmpty($parent->getData('procedures', 0));
+        self::assertEmpty($parent->getData('events', 0));
     }
 
     /**
@@ -106,9 +88,6 @@ class NodeDatabaseTest extends AbstractTestCase
         $parent = NodeFactory::getInstance('NodeDatabase');
 
         $parent->setHiddenCount(3);
-        $this->assertEquals(
-            3,
-            $parent->getHiddenCount()
-        );
+        self::assertSame(3, $parent->getHiddenCount());
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
index 017d407694..c6e919f58f 100644
--- a/test/classes/Navigation/Nodes/NodeEventContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
@@ -27,14 +27,11 @@ class NodeEventContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeEventContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/database/events', 'params' => ['db' => null]],
-                'icon' => ['route' => '/database/events', 'params' => ['db' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('events', $parent->realName);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/database/events', 'params' => ['db' => null]],
+            'icon' => ['route' => '/database/events', 'params' => ['db' => null]],
+        ], $parent->links);
+        self::assertSame('events', $parent->realName);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php
index 39a5ba03e5..ce3cd2ee09 100644
--- a/test/classes/Navigation/Nodes/NodeEventTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventTest.php
@@ -27,19 +27,16 @@ class NodeEventTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeEvent');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => [
-                    'route' => '/database/events',
-                    'params' => ['edit_item' => 1, 'db' => null, 'item_name' => null],
-                ],
-                'icon' => [
-                    'route' => '/database/events',
-                    'params' => ['export_item' => 1, 'db' => null, 'item_name' => null],
-                ],
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => [
+                'route' => '/database/events',
+                'params' => ['edit_item' => 1, 'db' => null, 'item_name' => null],
             ],
-            $parent->links
-        );
+            'icon' => [
+                'route' => '/database/events',
+                'params' => ['export_item' => 1, 'db' => null, 'item_name' => null],
+            ],
+        ], $parent->links);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
index 2dc2733899..e67c8dae11 100644
--- a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
@@ -27,14 +27,11 @@ class NodeFunctionContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeFunctionContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/database/routines', 'params' => ['type' => 'FUNCTION', 'db' => null]],
-                'icon' => ['route' => '/database/routines', 'params' => ['type' => 'FUNCTION', 'db' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('functions', $parent->realName);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/database/routines', 'params' => ['type' => 'FUNCTION', 'db' => null]],
+            'icon' => ['route' => '/database/routines', 'params' => ['type' => 'FUNCTION', 'db' => null]],
+        ], $parent->links);
+        self::assertSame('functions', $parent->realName);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php
index be9e9cd892..7cc27fcd9f 100644
--- a/test/classes/Navigation/Nodes/NodeFunctionTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php
@@ -27,19 +27,16 @@ class NodeFunctionTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeFunction');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => [
-                    'route' => '/database/routines',
-                    'params' => ['item_type' => 'FUNCTION', 'edit_item' => 1, 'db' => null, 'item_name' => null],
-                ],
-                'icon' => [
-                    'route' => '/database/routines',
-                    'params' => ['item_type' => 'FUNCTION', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
-                ],
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => [
+                'route' => '/database/routines',
+                'params' => ['item_type' => 'FUNCTION', 'edit_item' => 1, 'db' => null, 'item_name' => null],
             ],
-            $parent->links
-        );
+            'icon' => [
+                'route' => '/database/routines',
+                'params' => ['item_type' => 'FUNCTION', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
+            ],
+        ], $parent->links);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
index d5769ae9c6..d371b5a0c7 100644
--- a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
@@ -27,14 +27,11 @@ class NodeIndexContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeIndexContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
-                'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('indexes', $parent->realName);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+            'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+        ], $parent->links);
+        self::assertSame('indexes', $parent->realName);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php
index a0db18b579..724433b98e 100644
--- a/test/classes/Navigation/Nodes/NodeIndexTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexTest.php
@@ -27,13 +27,10 @@ class NodeIndexTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeIndex');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/table/indexes', 'params' => ['db' => null, 'table' => null, 'index' => null]],
-                'icon' => ['route' => '/table/indexes', 'params' => ['db' => null, 'table' => null, 'index' => null]],
-            ],
-            $parent->links
-        );
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/table/indexes', 'params' => ['db' => null, 'table' => null, 'index' => null]],
+            'icon' => ['route' => '/table/indexes', 'params' => ['db' => null, 'table' => null, 'index' => null]],
+        ], $parent->links);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
index 3b431dd193..84aff43a67 100644
--- a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
@@ -27,14 +27,11 @@ class NodeProcedureContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeProcedureContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/database/routines', 'params' => ['type' => 'PROCEDURE', 'db' => null]],
-                'icon' => ['route' => '/database/routines', 'params' => ['type' => 'PROCEDURE', 'db' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('procedures', $parent->realName);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/database/routines', 'params' => ['type' => 'PROCEDURE', 'db' => null]],
+            'icon' => ['route' => '/database/routines', 'params' => ['type' => 'PROCEDURE', 'db' => null]],
+        ], $parent->links);
+        self::assertSame('procedures', $parent->realName);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php
index 79ab299be7..057a1f8d93 100644
--- a/test/classes/Navigation/Nodes/NodeProcedureTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php
@@ -27,19 +27,16 @@ class NodeProcedureTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeProcedure');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => [
-                    'route' => '/database/routines',
-                    'params' => ['item_type' => 'PROCEDURE', 'edit_item' => 1, 'db' => null, 'item_name' => null],
-                ],
-                'icon' => [
-                    'route' => '/database/routines',
-                    'params' => ['item_type' => 'PROCEDURE', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
-                ],
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => [
+                'route' => '/database/routines',
+                'params' => ['item_type' => 'PROCEDURE', 'edit_item' => 1, 'db' => null, 'item_name' => null],
             ],
-            $parent->links
-        );
+            'icon' => [
+                'route' => '/database/routines',
+                'params' => ['item_type' => 'PROCEDURE', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
+            ],
+        ], $parent->links);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
index ef0c7a27b0..6893fc9cc5 100644
--- a/test/classes/Navigation/Nodes/NodeTableContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
@@ -31,15 +31,12 @@ class NodeTableContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeTableContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'table', 'db' => null]],
-                'icon' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'table', 'db' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('tables', $parent->realName);
-        $this->assertStringContainsString('tableContainer', $parent->classes);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'table', 'db' => null]],
+            'icon' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'table', 'db' => null]],
+        ], $parent->links);
+        self::assertSame('tables', $parent->realName);
+        self::assertStringContainsString('tableContainer', $parent->classes);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php
index dd0921e019..ba74cabdc7 100644
--- a/test/classes/Navigation/Nodes/NodeTableTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableTest.php
@@ -36,17 +36,14 @@ class NodeTableTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeTable');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/sql', 'params' => ['pos' => 0, 'db' => null, 'table' => null]],
-                'icon' => ['route' => '/table/search', 'params' => ['db' => null, 'table' => null]],
-                'second_icon' => ['route' => '/table/change', 'params' => ['db' => null, 'table' => null]],
-                'title' => 'Browse',
-            ],
-            $parent->links
-        );
-        $this->assertStringContainsString('table', $parent->classes);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/sql', 'params' => ['pos' => 0, 'db' => null, 'table' => null]],
+            'icon' => ['route' => '/table/search', 'params' => ['db' => null, 'table' => null]],
+            'second_icon' => ['route' => '/table/change', 'params' => ['db' => null, 'table' => null]],
+            'title' => 'Browse',
+        ], $parent->links);
+        self::assertStringContainsString('table', $parent->classes);
     }
 
     /**
@@ -61,8 +58,8 @@ class NodeTableTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = $target;
         $node = NodeFactory::getInstance('NodeTable');
-        $this->assertEquals($imageName, $node->icon['image']);
-        $this->assertEquals($imageTitle, $node->icon['title']);
+        self::assertSame($imageName, $node->icon['image']);
+        self::assertSame($imageTitle, $node->icon['title']);
     }
 
     /**
diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php
index 241c08dc6c..3d99b2f8e6 100644
--- a/test/classes/Navigation/Nodes/NodeTest.php
+++ b/test/classes/Navigation/Nodes/NodeTest.php
@@ -34,14 +34,8 @@ class NodeTest extends AbstractTestCase
         $parent = NodeFactory::getInstance('Node', 'parent');
         $child = NodeFactory::getInstance('Node', 'child');
         $parent->addChild($child);
-        $this->assertEquals(
-            $parent->getChild($child->name),
-            $child
-        );
-        $this->assertEquals(
-            $parent->getChild($child->realName, true),
-            $child
-        );
+        self::assertSame($parent->getChild($child->name), $child);
+        self::assertSame($parent->getChild($child->realName, true), $child);
     }
 
     /**
@@ -50,12 +44,8 @@ class NodeTest extends AbstractTestCase
     public function testGetChildError(): void
     {
         $parent = NodeFactory::getInstance('Node', 'parent');
-        $this->assertNull(
-            $parent->getChild('foo')
-        );
-        $this->assertNull(
-            $parent->getChild('foo', true)
-        );
+        self::assertNull($parent->getChild('foo'));
+        self::assertNull($parent->getChild('foo', true));
     }
 
     /**
@@ -66,14 +56,9 @@ class NodeTest extends AbstractTestCase
         $parent = NodeFactory::getInstance('Node', 'parent');
         $child = NodeFactory::getInstance('Node', 'child');
         $parent->addChild($child);
-        $this->assertEquals(
-            $parent->getChild($child->name),
-            $child
-        );
+        self::assertSame($parent->getChild($child->name), $child);
         $parent->removeChild($child->name);
-        $this->assertNull(
-            $parent->getChild($child->name)
-        );
+        self::assertNull($parent->getChild($child->name));
     }
 
     public function testGetChild(): void
@@ -98,34 +83,16 @@ class NodeTest extends AbstractTestCase
         $emptyContainer = NodeFactory::getInstance('Node', 'empty', Node::CONTAINER);
         $child = NodeFactory::getInstance();
         // test with no children
-        $this->assertEquals(
-            $parent->hasChildren(true),
-            false
-        );
-        $this->assertEquals(
-            $parent->hasChildren(false),
-            false
-        );
+        self::assertSame($parent->hasChildren(true), false);
+        self::assertSame($parent->hasChildren(false), false);
         // test with an empty container
         $parent->addChild($emptyContainer);
-        $this->assertEquals(
-            $parent->hasChildren(true),
-            true
-        );
-        $this->assertEquals(
-            $parent->hasChildren(false),
-            false
-        );
+        self::assertSame($parent->hasChildren(true), true);
+        self::assertSame($parent->hasChildren(false), false);
         // test with a real child
         $parent->addChild($child);
-        $this->assertEquals(
-            $parent->hasChildren(true),
-            true
-        );
-        $this->assertEquals(
-            $parent->hasChildren(false),
-            true
-        );
+        self::assertSame($parent->hasChildren(true), true);
+        self::assertSame($parent->hasChildren(false), true);
     }
 
     /**
@@ -135,25 +102,25 @@ class NodeTest extends AbstractTestCase
     {
         // start with root node only
         $parent = NodeFactory::getInstance();
-        $this->assertEquals($parent->numChildren(), 0);
+        self::assertSame($parent->numChildren(), 0);
         // add a child
         $child = NodeFactory::getInstance();
         $parent->addChild($child);
-        $this->assertEquals($parent->numChildren(), 1);
+        self::assertSame($parent->numChildren(), 1);
         // add a direct grandchild, this one doesn't count as
         // it's not enclosed in a CONTAINER
         $child->addChild(NodeFactory::getInstance());
-        $this->assertEquals($parent->numChildren(), 1);
+        self::assertSame($parent->numChildren(), 1);
         // add a container, this one doesn't count wither
         $container = NodeFactory::getInstance('Node', 'default', Node::CONTAINER);
         $parent->addChild($container);
-        $this->assertEquals($parent->numChildren(), 1);
+        self::assertSame($parent->numChildren(), 1);
         // add a grandchild to container, this one counts
         $container->addChild(NodeFactory::getInstance());
-        $this->assertEquals($parent->numChildren(), 2);
+        self::assertSame($parent->numChildren(), 2);
         // add another grandchild to container, this one counts
         $container->addChild(NodeFactory::getInstance());
-        $this->assertEquals($parent->numChildren(), 3);
+        self::assertSame($parent->numChildren(), 3);
     }
 
     /**
@@ -162,20 +129,17 @@ class NodeTest extends AbstractTestCase
     public function testParents(): void
     {
         $parent = NodeFactory::getInstance();
-        $this->assertEquals($parent->parents(), []); // exclude self
-        $this->assertEquals($parent->parents(true), [$parent]); // include self
+        self::assertSame($parent->parents(), []); // exclude self
+        self::assertSame($parent->parents(true), [$parent]); // include self
 
         $child = NodeFactory::getInstance();
         $parent->addChild($child);
 
-        $this->assertEquals($child->parents(), [$parent]); // exclude self
-        $this->assertEquals(
-            $child->parents(true),
-            [
-                $child,
-                $parent,
-            ]
-        ); // include self
+        self::assertSame($child->parents(), [$parent]); // exclude self
+        self::assertSame($child->parents(true), [
+            $child,
+            $parent,
+        ]); // include self
     }
 
     /**
@@ -184,11 +148,11 @@ class NodeTest extends AbstractTestCase
     public function testRealParent(): void
     {
         $parent = NodeFactory::getInstance();
-        $this->assertFalse($parent->realParent());
+        self::assertFalse($parent->realParent());
 
         $child = NodeFactory::getInstance();
         $parent->addChild($child);
-        $this->assertEquals($child->realParent(), $parent);
+        self::assertSame($child->realParent(), $parent);
     }
 
     /**
@@ -200,7 +164,7 @@ class NodeTest extends AbstractTestCase
         $parent = NodeFactory::getInstance();
         $child = NodeFactory::getInstance();
         $parent->addChild($child);
-        $this->assertFalse($child->hasSiblings());
+        self::assertFalse($child->hasSiblings());
     }
 
     /**
@@ -215,7 +179,7 @@ class NodeTest extends AbstractTestCase
         $secondChild = NodeFactory::getInstance();
         $parent->addChild($secondChild);
         // Normal case; two Node:NODE type siblings
-        $this->assertTrue($firstChild->hasSiblings());
+        self::assertTrue($firstChild->hasSiblings());
 
         $parent = NodeFactory::getInstance();
         $firstChild = NodeFactory::getInstance();
@@ -223,12 +187,12 @@ class NodeTest extends AbstractTestCase
         $secondChild = NodeFactory::getInstance('Node', 'default', Node::CONTAINER);
         $parent->addChild($secondChild);
         // Empty Node::CONTAINER type node should not be considered in hasSiblings()
-        $this->assertFalse($firstChild->hasSiblings());
+        self::assertFalse($firstChild->hasSiblings());
 
         $grandChild = NodeFactory::getInstance();
         $secondChild->addChild($grandChild);
         // Node::CONTAINER type nodes with children are counted for hasSiblings()
-        $this->assertTrue($firstChild->hasSiblings());
+        self::assertTrue($firstChild->hasSiblings());
     }
 
     /**
@@ -246,9 +210,9 @@ class NodeTest extends AbstractTestCase
         $grandChild->addChild($greatGrandChild);
 
         // Should return false for node that are two levels deeps
-        $this->assertFalse($grandChild->hasSiblings());
+        self::assertFalse($grandChild->hasSiblings());
         // Should return true for node that are three levels deeps
-        $this->assertTrue($greatGrandChild->hasSiblings());
+        self::assertTrue($greatGrandChild->hasSiblings());
     }
 
     /**
@@ -261,13 +225,10 @@ class NodeTest extends AbstractTestCase
 
         // Vanilla case
         $node = NodeFactory::getInstance();
-        $this->assertEquals(
-            'WHERE TRUE ',
-            $method->invoke($node, 'SCHEMA_NAME')
-        );
+        self::assertSame('WHERE TRUE ', $method->invoke($node, 'SCHEMA_NAME'));
 
         // When a schema names is passed as search clause
-        $this->assertEquals(
+        self::assertSame(
             "WHERE TRUE AND `SCHEMA_NAME` LIKE '%schemaName%' ",
             $method->invoke($node, 'SCHEMA_NAME', 'schemaName')
         );
@@ -278,7 +239,7 @@ class NodeTest extends AbstractTestCase
 
         // When hide_db regular expression is present
         $GLOBALS['cfg']['Server']['hide_db'] = 'regexpHideDb';
-        $this->assertEquals(
+        self::assertSame(
             "WHERE TRUE AND `SCHEMA_NAME` NOT REGEXP 'regexpHideDb' ",
             $method->invoke($node, 'SCHEMA_NAME')
         );
@@ -286,7 +247,7 @@ class NodeTest extends AbstractTestCase
 
         // When only_db directive is present and it's a single db
         $GLOBALS['cfg']['Server']['only_db'] = 'stringOnlyDb';
-        $this->assertEquals(
+        self::assertSame(
             "WHERE TRUE AND ( `SCHEMA_NAME` LIKE 'stringOnlyDb' ) ",
             $method->invoke($node, 'SCHEMA_NAME')
         );
@@ -297,7 +258,7 @@ class NodeTest extends AbstractTestCase
             'onlyDbOne',
             'onlyDbTwo',
         ];
-        $this->assertEquals(
+        self::assertSame(
             'WHERE TRUE AND ( `SCHEMA_NAME` LIKE \'onlyDbOne\' OR `SCHEMA_NAME` LIKE \'onlyDbTwo\' ) ',
             $method->invoke($node, 'SCHEMA_NAME')
         );
diff --git a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
index 2817dc341c..4ce86600a7 100644
--- a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
@@ -27,14 +27,11 @@ class NodeTriggerContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeTriggerContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/database/triggers', 'params' => ['db' => null, 'table' => null]],
-                'icon' => ['route' => '/database/triggers', 'params' => ['db' => null, 'table' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('triggers', $parent->realName);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/database/triggers', 'params' => ['db' => null, 'table' => null]],
+            'icon' => ['route' => '/database/triggers', 'params' => ['db' => null, 'table' => null]],
+        ], $parent->links);
+        self::assertSame('triggers', $parent->realName);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php
index 37d94e9278..bc01dd36a1 100644
--- a/test/classes/Navigation/Nodes/NodeTriggerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php
@@ -27,19 +27,16 @@ class NodeTriggerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeTrigger');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => [
-                    'route' => '/database/triggers',
-                    'params' => ['edit_item' => 1, 'db' => null, 'item_name' => null],
-                ],
-                'icon' => [
-                    'route' => '/database/triggers',
-                    'params' => ['export_item' => 1, 'db' => null, 'item_name' => null],
-                ],
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => [
+                'route' => '/database/triggers',
+                'params' => ['edit_item' => 1, 'db' => null, 'item_name' => null],
             ],
-            $parent->links
-        );
+            'icon' => [
+                'route' => '/database/triggers',
+                'params' => ['export_item' => 1, 'db' => null, 'item_name' => null],
+            ],
+        ], $parent->links);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
index 9cbcd9b852..e4af33e19a 100644
--- a/test/classes/Navigation/Nodes/NodeViewContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
@@ -31,15 +31,12 @@ class NodeViewContainerTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeViewContainer');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'view', 'db' => null]],
-                'icon' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'view', 'db' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('views', $parent->realName);
-        $this->assertStringContainsString('viewContainer', $parent->classes);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'view', 'db' => null]],
+            'icon' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'view', 'db' => null]],
+        ], $parent->links);
+        self::assertSame('views', $parent->realName);
+        self::assertStringContainsString('viewContainer', $parent->classes);
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php
index f6158dae3f..ea2661a62d 100644
--- a/test/classes/Navigation/Nodes/NodeViewTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewTest.php
@@ -27,16 +27,13 @@ class NodeViewTest extends AbstractTestCase
     public function testConstructor(): void
     {
         $parent = NodeFactory::getInstance('NodeView');
-        $this->assertIsArray($parent->links);
-        $this->assertEquals(
-            [
-                'text' => ['route' => '/sql', 'params' => ['pos' => 0, 'db' => null, 'table' => null]],
-                'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
-            ],
-            $parent->links
-        );
-        $this->assertEquals('b_props', $parent->icon['image']);
-        $this->assertEquals('View', $parent->icon['title']);
-        $this->assertStringContainsString('view', $parent->classes);
+        self::assertIsArray($parent->links);
+        self::assertSame([
+            'text' => ['route' => '/sql', 'params' => ['pos' => 0, 'db' => null, 'table' => null]],
+            'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+        ], $parent->links);
+        self::assertSame('b_props', $parent->icon['image']);
+        self::assertSame('View', $parent->icon['title']);
+        self::assertStringContainsString('view', $parent->classes);
     }
 }
diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php
index d867021de4..0b39878ef9 100644
--- a/test/classes/NormalizationTest.php
+++ b/test/classes/NormalizationTest.php
@@ -123,11 +123,11 @@ class NormalizationTest extends AbstractTestCase
     {
         $db = 'PMA_db';
         $table = 'PMA_table';
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<option value="id">id [ integer ]</option>',
             $this->normalization->getHtmlForColumnsList($table, $db)
         );
-        $this->assertEquals(
+        self::assertSame(
             '<input type="checkbox" value="col1">col1 [ varchar(100) ]<br>',
             $this->normalization->getHtmlForColumnsList($table, $db, 'String', 'checkbox')
         );
@@ -153,7 +153,7 @@ class NormalizationTest extends AbstractTestCase
             new Template()
         );
         $result = $normalization->getHtmlForCreateNewColumn($numFields, $db, $table);
-        $this->assertStringContainsString('<table id="table_columns"', $result);
+        self::assertStringContainsString('<table id="table_columns"', $result);
     }
 
     /**
@@ -165,28 +165,22 @@ class NormalizationTest extends AbstractTestCase
         $table = 'PMA_table';
         $normalizedTo = '1nf';
         $result = $this->normalization->getHtmlFor1NFStep1($db, $table, $normalizedTo);
-        $this->assertStringContainsString(
-            "<h3 class='text-center'>"
-            . __('First step of normalization (1NF)') . '</h3>',
-            $result
-        );
-        $this->assertStringContainsString("<div id='mainContent'", $result);
-        $this->assertStringContainsString('<legend>' . __('Step 1.'), $result);
+        self::assertStringContainsString("<h3 class='text-center'>"
+        . __('First step of normalization (1NF)') . '</h3>', $result);
+        self::assertStringContainsString("<div id='mainContent'", $result);
+        self::assertStringContainsString('<legend>' . __('Step 1.'), $result);
 
-        $this->assertStringContainsString('<h4', $result);
+        self::assertStringContainsString('<h4', $result);
 
-        $this->assertStringContainsString('<p', $result);
+        self::assertStringContainsString('<p', $result);
 
-        $this->assertStringContainsString("<select id='selectNonAtomicCol'", $result);
+        self::assertStringContainsString("<select id='selectNonAtomicCol'", $result);
 
-        $this->assertStringContainsString(
-            $this->normalization->getHtmlForColumnsList(
-                $db,
-                $table,
-                _pgettext('string types', 'String')
-            ),
-            $result
-        );
+        self::assertStringContainsString($this->normalization->getHtmlForColumnsList(
+            $db,
+            $table,
+            _pgettext('string types', 'String')
+        ), $result);
     }
 
     /**
@@ -197,18 +191,18 @@ class NormalizationTest extends AbstractTestCase
         $db = 'PMA_db';
         $table = 'PMA_table1';
         $result = $this->normalization->getHtmlContentsFor1NFStep2($db, $table);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('hasPrimaryKey', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertStringContainsString('<a href="#" id="createPrimaryKey">', $result['subText']);
-        $this->assertStringContainsString('<a href="#" id="addNewPrimary">', $result['extra']);
-        $this->assertEquals('0', $result['hasPrimaryKey']);
-        $this->assertStringContainsString(__('Step 1.') . 2, $result['legendText']);
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('subText', $result);
+        self::assertArrayHasKey('hasPrimaryKey', $result);
+        self::assertArrayHasKey('extra', $result);
+        self::assertStringContainsString('<a href="#" id="createPrimaryKey">', $result['subText']);
+        self::assertStringContainsString('<a href="#" id="addNewPrimary">', $result['extra']);
+        self::assertSame('0', $result['hasPrimaryKey']);
+        self::assertStringContainsString(__('Step 1.') . 2, $result['legendText']);
         $result1 = $this->normalization->getHtmlContentsFor1NFStep2($db, 'PMA_table');
-        $this->assertEquals('1', $result1['hasPrimaryKey']);
+        self::assertSame('1', $result1['hasPrimaryKey']);
     }
 
     /**
@@ -219,17 +213,17 @@ class NormalizationTest extends AbstractTestCase
         $db = 'PMA_db';
         $table = 'PMA_table';
         $result = $this->normalization->getHtmlContentsFor1NFStep4($db, $table);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertStringContainsString(__('Step 1.') . 4, $result['legendText']);
-        $this->assertStringContainsString(
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('subText', $result);
+        self::assertArrayHasKey('extra', $result);
+        self::assertStringContainsString(__('Step 1.') . 4, $result['legendText']);
+        self::assertStringContainsString(
             $this->normalization->getHtmlForColumnsList($db, $table, 'all', 'checkbox'),
             $result['extra']
         );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input class="btn btn-secondary" type="submit" id="removeRedundant"',
             $result['extra']
         );
@@ -243,22 +237,22 @@ class NormalizationTest extends AbstractTestCase
         $db = 'PMA_db';
         $table = 'PMA_table';
         $result = $this->normalization->getHtmlContentsFor1NFStep3($db, $table);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertArrayHasKey('primary_key', $result);
-        $this->assertStringContainsString(__('Step 1.') . 3, $result['legendText']);
-        $this->assertStringContainsString(
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('subText', $result);
+        self::assertArrayHasKey('extra', $result);
+        self::assertArrayHasKey('primary_key', $result);
+        self::assertStringContainsString(__('Step 1.') . 3, $result['legendText']);
+        self::assertStringContainsString(
             $this->normalization->getHtmlForColumnsList($db, $table, 'all', 'checkbox'),
             $result['extra']
         );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input class="btn btn-secondary" type="submit" id="moveRepeatingGroup"',
             $result['extra']
         );
-        $this->assertEquals(json_encode(['id']), $result['primary_key']);
+        self::assertSame(json_encode(['id']), $result['primary_key']);
     }
 
     /**
@@ -269,18 +263,18 @@ class NormalizationTest extends AbstractTestCase
         $db = 'PMA_db';
         $table = 'PMA_table';
         $result = $this->normalization->getHtmlFor2NFstep1($db, $table);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertArrayHasKey('primary_key', $result);
-        $this->assertStringContainsString(__('Step 2.') . 1, $result['legendText']);
-        $this->assertEquals('id', $result['primary_key']);
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('subText', $result);
+        self::assertArrayHasKey('extra', $result);
+        self::assertArrayHasKey('primary_key', $result);
+        self::assertStringContainsString(__('Step 2.') . 1, $result['legendText']);
+        self::assertSame('id', $result['primary_key']);
         $result1 = $this->normalization->getHtmlFor2NFstep1($db, 'PMA_table2');
-        $this->assertEquals('id, col1', $result1['primary_key']);
-        $this->assertStringContainsString('<a href="#" id="showPossiblePd"', $result1['headText']);
-        $this->assertStringContainsString('<input type="checkbox" name="pd" value="id"', $result1['extra']);
+        self::assertSame('id, col1', $result1['primary_key']);
+        self::assertStringContainsString('<a href="#" id="showPossiblePd"', $result1['headText']);
+        self::assertStringContainsString('<input type="checkbox" name="pd" value="id"', $result1['extra']);
     }
 
     /**
@@ -291,7 +285,7 @@ class NormalizationTest extends AbstractTestCase
         $table = 'PMA_table';
         $partialDependencies = ['col1' => ['col2']];
         $result = $this->normalization->getHtmlForNewTables2NF($partialDependencies, $table);
-        $this->assertStringContainsString('<input type="text" name="col1"', $result);
+        self::assertStringContainsString('<input type="text" name="col1"', $result);
     }
 
     /**
@@ -306,18 +300,18 @@ class NormalizationTest extends AbstractTestCase
         $tablesName->col1 = 'PMA_table1';
         $partialDependencies = ['id' => ['col2']];
         $result = $this->normalization->createNewTablesFor2NF($partialDependencies, $tablesName, $table, $db);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('queryError', $result);
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('queryError', $result);
         $partialDependencies = [
             'id' => ['col2'],
             'col1' => ['col2'],
         ];
         $result1 = $this->normalization->createNewTablesFor2NF($partialDependencies, $tablesName, $table, $db);
-        $this->assertArrayHasKey('extra', $result1);
-        $this->assertEquals(__('End of step'), $result1['legendText']);
-        $this->assertEquals('', $result1['extra']);
+        self::assertArrayHasKey('extra', $result1);
+        self::assertSame(__('End of step'), $result1['legendText']);
+        self::assertSame('', $result1['extra']);
     }
 
     /**
@@ -330,14 +324,11 @@ class NormalizationTest extends AbstractTestCase
         $dependencies = new stdClass();
         $dependencies->col1 = ['col2'];
         $result = $this->normalization->getHtmlForNewTables3NF($dependencies, $tables, $db);
-        $this->assertEquals(
-            [
-                'html' => '',
-                'success' => true,
-                'newTables' => [],
-            ],
-            $result
-        );
+        self::assertEquals([
+            'html' => '',
+            'success' => true,
+            'newTables' => [],
+        ], $result);
         $tables = [
             'PMA_table' => [
                 'col1',
@@ -350,23 +341,20 @@ class NormalizationTest extends AbstractTestCase
             'col5',
         ];
         $result1 = $this->normalization->getHtmlForNewTables3NF($dependencies, $tables, $db);
-        $this->assertIsArray($result1);
-        $this->assertStringContainsString('<input type="text" name="PMA_table"', $result1['html']);
-        $this->assertEquals(
-            [
+        self::assertIsArray($result1);
+        self::assertStringContainsString('<input type="text" name="PMA_table"', $result1['html']);
+        self::assertSame([
+            'PMA_table' => [
                 'PMA_table' => [
-                    'PMA_table' => [
-                        'pk' => 'col1',
-                        'nonpk' => 'col2',
-                    ],
-                    'table2' => [
-                        'pk' => 'id',
-                        'nonpk' => 'col4, col5',
-                    ],
+                    'pk' => 'col1',
+                    'nonpk' => 'col2',
+                ],
+                'table2' => [
+                    'pk' => 'id',
+                    'nonpk' => 'col4, col5',
                 ],
             ],
-            $result1['newTables']
-        );
+        ], $result1['newTables']);
     }
 
     /**
@@ -388,15 +376,15 @@ class NormalizationTest extends AbstractTestCase
             ],
         ];
         $result = $this->normalization->createNewTablesFor3NF($newTables, $db);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('queryError', $result);
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('queryError', $result);
         $newTables1 = [];
         $result1 = $this->normalization->createNewTablesFor3NF($newTables1, $db);
-        $this->assertArrayHasKey('queryError', $result1);
-        $this->assertEquals(__('End of step'), $result1['legendText']);
-        $this->assertFalse($result1['queryError']);
+        self::assertArrayHasKey('queryError', $result1);
+        self::assertSame(__('End of step'), $result1['legendText']);
+        self::assertFalse($result1['queryError']);
     }
 
     /**
@@ -418,10 +406,10 @@ class NormalizationTest extends AbstractTestCase
             $table,
             $db
         );
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('queryError', $result);
-        $this->assertArrayHasKey('message', $result);
-        $this->assertInstanceOf(Message::class, $result['message']);
+        self::assertIsArray($result);
+        self::assertArrayHasKey('queryError', $result);
+        self::assertArrayHasKey('message', $result);
+        self::assertInstanceOf(Message::class, $result['message']);
     }
 
     /**
@@ -432,16 +420,16 @@ class NormalizationTest extends AbstractTestCase
         $db = 'PMA_db';
         $tables = ['PMA_table'];
         $result = $this->normalization->getHtmlFor3NFstep1($db, $tables);
-        $this->assertIsArray($result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertStringContainsString(__('Step 3.') . 1, $result['legendText']);
-        $this->assertStringContainsString('<form', $result['extra']);
-        $this->assertStringContainsString('<input type="checkbox" name="pd" value="col1"', $result['extra']);
+        self::assertIsArray($result);
+        self::assertArrayHasKey('legendText', $result);
+        self::assertArrayHasKey('headText', $result);
+        self::assertArrayHasKey('subText', $result);
+        self::assertArrayHasKey('extra', $result);
+        self::assertStringContainsString(__('Step 3.') . 1, $result['legendText']);
+        self::assertStringContainsString('<form', $result['extra']);
+        self::assertStringContainsString('<input type="checkbox" name="pd" value="col1"', $result['extra']);
         $result1 = $this->normalization->getHtmlFor3NFstep1($db, ['PMA_table2']);
-        $this->assertEquals('', $result1['subText']);
+        self::assertSame('', $result1['subText']);
     }
 
     /**
@@ -450,17 +438,14 @@ class NormalizationTest extends AbstractTestCase
     public function testgetHtmlForNormalizeTable(): void
     {
         $result = $this->normalization->getHtmlForNormalizeTable();
-        $this->assertStringContainsString(
-            '<form method="post" action="' . Url::getFromRoute('/normalization')
-            . '" name="normalize" id="normalizeTable"',
-            $result
-        );
-        $this->assertStringContainsString('<input type="hidden" name="step1" value="1">', $result);
+        self::assertStringContainsString('<form method="post" action="' . Url::getFromRoute('/normalization')
+        . '" name="normalize" id="normalizeTable"', $result);
+        self::assertStringContainsString('<input type="hidden" name="step1" value="1">', $result);
 
-        $this->assertStringContainsString('type="radio" name="normalizeTo"', $result);
-        $this->assertStringContainsString('id="normalizeToRadio1" value="1nf" checked>', $result);
-        $this->assertStringContainsString('id="normalizeToRadio2" value="2nf">', $result);
-        $this->assertStringContainsString('id="normalizeToRadio3" value="3nf">', $result);
+        self::assertStringContainsString('type="radio" name="normalizeTo"', $result);
+        self::assertStringContainsString('id="normalizeToRadio1" value="1nf" checked>', $result);
+        self::assertStringContainsString('id="normalizeToRadio2" value="2nf">', $result);
+        self::assertStringContainsString('id="normalizeToRadio3" value="3nf">', $result);
     }
 
     /**
@@ -471,8 +456,8 @@ class NormalizationTest extends AbstractTestCase
         $table = 'PMA_table2';
         $db = 'PMA_db';
         $result = $this->normalization->findPartialDependencies($table, $db);
-        $this->assertStringContainsString('<div class="dependencies_box"', $result);
-        $this->assertStringContainsString(__('No partial dependencies found!'), $result);
+        self::assertStringContainsString('<div class="dependencies_box"', $result);
+        self::assertStringContainsString(__('No partial dependencies found!'), $result);
     }
 
     /**
@@ -492,17 +477,14 @@ class NormalizationTest extends AbstractTestCase
             [$primaryKey]
         );
 
-        $this->assertEquals(
-            [
-                '',
-                'id',
-                'col1',
-                'col1,id',
-                'col2',
-                'col2,id',
-                'col2,col1',
-            ],
-            $result
-        );
+        self::assertSame([
+            '',
+            'id',
+            'col1',
+            'col1,id',
+            'col2',
+            'col2,id',
+            'col2,col1',
+        ], $result);
     }
 }
diff --git a/test/classes/OpenDocumentTest.php b/test/classes/OpenDocumentTest.php
index 3797be44d0..9cf9b32f7c 100644
--- a/test/classes/OpenDocumentTest.php
+++ b/test/classes/OpenDocumentTest.php
@@ -25,33 +25,33 @@ class OpenDocumentTest extends AbstractTestCase
             'application/vnd.oasis.opendocument.text',
             '<data>'
         );
-        $this->assertNotFalse($document);
+        self::assertNotFalse($document);
 
         $tmpFile = tempnam('./', 'open-document-test');
-        $this->assertNotFalse($tmpFile);
-        $this->assertNotFalse(file_put_contents($tmpFile, $document), 'The temp file should be written');
+        self::assertNotFalse($tmpFile);
+        self::assertNotFalse(file_put_contents($tmpFile, $document), 'The temp file should be written');
 
         $zipExtension = new ZipExtension(new ZipArchive());
-        $this->assertSame([
+        self::assertSame([
             'error' => '',
             'data' => 'application/vnd.oasis.opendocument.text',
         ], $zipExtension->getContents($tmpFile));
 
-        $this->assertSame([
+        self::assertSame([
             'error' => '',
             'data' => '<data>',
         ], $zipExtension->getContents($tmpFile, '/content\.xml/'));
 
         $dateTimeCreation = (new DateTime())->format('Y-m-d\TH:i');
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             // Do not use a full version or seconds could be out of sync and cause flaky test failures
             '<meta:creation-date>' . $dateTimeCreation,
             $zipExtension->getContents($tmpFile, '/meta\.xml/')['data']
         );
 
-        $this->assertSame(5, $zipExtension->getNumberOfFiles($tmpFile));
+        self::assertSame(5, $zipExtension->getNumberOfFiles($tmpFile));
         // Unset to close any file that were left open.
         unset($zipExtension);
-        $this->assertTrue(unlink($tmpFile));
+        self::assertTrue(unlink($tmpFile));
     }
 }
diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php
index 0df8426c36..c1781a232b 100644
--- a/test/classes/OperationsTest.php
+++ b/test/classes/OperationsTest.php
@@ -47,7 +47,7 @@ class OperationsTest extends AbstractTestCase
         $expected = array_merge($choices, $extraChoice);
 
         $actual = $this->object->getPartitionMaintenanceChoices();
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
diff --git a/test/classes/Partitioning/PartitionTest.php b/test/classes/Partitioning/PartitionTest.php
index 83105e1f13..aa62634bf2 100644
--- a/test/classes/Partitioning/PartitionTest.php
+++ b/test/classes/Partitioning/PartitionTest.php
@@ -16,13 +16,13 @@ class PartitionTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 1;
         $actual = Partition::getPartitionMethod('database', 'no_partition_method');
-        $this->assertNull($actual);
+        self::assertNull($actual);
     }
 
     public function testGetPartitionMethodWithRangeMethod(): void
     {
         $GLOBALS['server'] = 1;
         $actual = Partition::getPartitionMethod('database', 'range_partition_method');
-        $this->assertEquals('RANGE', $actual);
+        self::assertSame('RANGE', $actual);
     }
 }
diff --git a/test/classes/Partitioning/SubPartitionTest.php b/test/classes/Partitioning/SubPartitionTest.php
index d2db6fe693..7e9bf17619 100644
--- a/test/classes/Partitioning/SubPartitionTest.php
+++ b/test/classes/Partitioning/SubPartitionTest.php
@@ -27,13 +27,13 @@ class SubPartitionTest extends TestCase
             'PARTITION_COMMENT' => 'partition_comment',
         ];
         $object = new SubPartition($row);
-        $this->assertEquals('subpartition_name', $object->getName());
-        $this->assertEquals(1, $object->getOrdinal());
-        $this->assertEquals('subpartition_method', $object->getMethod());
-        $this->assertEquals('subpartition_expression', $object->getExpression());
-        $this->assertEquals(2, $object->getRows());
-        $this->assertEquals(3, $object->getDataLength());
-        $this->assertEquals(4, $object->getIndexLength());
-        $this->assertEquals('partition_comment', $object->getComment());
+        self::assertSame('subpartition_name', $object->getName());
+        self::assertSame(1, $object->getOrdinal());
+        self::assertSame('subpartition_method', $object->getMethod());
+        self::assertSame('subpartition_expression', $object->getExpression());
+        self::assertSame(2, $object->getRows());
+        self::assertSame(3, $object->getDataLength());
+        self::assertSame(4, $object->getIndexLength());
+        self::assertSame('partition_comment', $object->getComment());
     }
 }
diff --git a/test/classes/Partitioning/TablePartitionDefinitionTest.php b/test/classes/Partitioning/TablePartitionDefinitionTest.php
index cf0e7b44c4..2a620296c0 100644
--- a/test/classes/Partitioning/TablePartitionDefinitionTest.php
+++ b/test/classes/Partitioning/TablePartitionDefinitionTest.php
@@ -7,8 +7,6 @@ namespace PhpMyAdmin\Tests\Partitioning;
 use PhpMyAdmin\Partitioning\TablePartitionDefinition;
 use PHPUnit\Framework\TestCase;
 
-use function count;
-
 /**
  * @covers \PhpMyAdmin\Partitioning\TablePartitionDefinition
  */
@@ -141,7 +139,7 @@ class TablePartitionDefinitionTest extends TestCase
         $_POST['ignored_key'] = 'ignored_value';
 
         $actual = TablePartitionDefinition::getDetails();
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     /**
@@ -235,10 +233,10 @@ class TablePartitionDefinitionTest extends TestCase
         ];
 
         $actual = TablePartitionDefinition::getDetails($expected);
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
 
         $actual = TablePartitionDefinition::getDetails();
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -248,11 +246,11 @@ class TablePartitionDefinitionTest extends TestCase
     {
         $_POST = ['partition_count' => $partitionCountFromPost];
         $actual = TablePartitionDefinition::getDetails();
-        $this->assertArrayHasKey('partition_count', $actual);
-        $this->assertArrayHasKey('partitions', $actual);
-        $this->assertSame($partitionCount, $actual['partition_count']);
-        $this->assertIsArray($actual['partitions']);
-        $this->assertEquals($partitionCount, count($actual['partitions']));
+        self::assertArrayHasKey('partition_count', $actual);
+        self::assertArrayHasKey('partitions', $actual);
+        self::assertSame($partitionCount, $actual['partition_count']);
+        self::assertIsArray($actual['partitions']);
+        self::assertCount($partitionCount, $actual['partitions']);
     }
 
     /**
diff --git a/test/classes/PdfTest.php b/test/classes/PdfTest.php
index 3b3e9157bf..90507d9eb3 100644
--- a/test/classes/PdfTest.php
+++ b/test/classes/PdfTest.php
@@ -28,7 +28,7 @@ class PdfTest extends AbstractTestCase
     public function testBasic(): void
     {
         $arr = new Pdf();
-        $this->assertStringContainsString('PDF', $arr->getPDFData());
+        self::assertStringContainsString('PDF', $arr->getPDFData());
     }
 
     /**
@@ -40,7 +40,7 @@ class PdfTest extends AbstractTestCase
     {
         $arr = new Pdf();
         $arr->setAlias('{00}', '32');
-        $this->assertStringContainsString('PDF', $arr->getPDFData());
+        self::assertStringContainsString('PDF', $arr->getPDFData());
     }
 
     /**
@@ -63,6 +63,6 @@ class PdfTest extends AbstractTestCase
         $pdf->setMargins(0, 0);
         $pdf->setDrawColor(200, 200, 200);
         $pdf->Line(0, 0, 100, 100);
-        $this->assertStringContainsString('PDF', $pdf->getPDFData());
+        self::assertStringContainsString('PDF', $pdf->getPDFData());
     }
 }
diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
index e52e9f22f0..24e6b77b72 100644
--- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -49,9 +49,7 @@ class AuthenticationConfigTest extends AbstractTestCase
 
     public function testAuth(): void
     {
-        $this->assertTrue(
-            $this->object->showLoginForm()
-        );
+        self::assertTrue($this->object->showLoginForm());
     }
 
     public function testAuthCheck(): void
@@ -60,16 +58,12 @@ class AuthenticationConfigTest extends AbstractTestCase
             'user' => 'username',
             'password' => 'password',
         ];
-        $this->assertTrue(
-            $this->object->readCredentials()
-        );
+        self::assertTrue($this->object->readCredentials());
     }
 
     public function testAuthSetUser(): void
     {
-        $this->assertTrue(
-            $this->object->storeCredentials()
-        );
+        self::assertTrue($this->object->storeCredentials());
     }
 
     public function testAuthFails(): void
@@ -86,29 +80,20 @@ class AuthenticationConfigTest extends AbstractTestCase
         $this->object->showFailure('');
         $html = ob_get_clean();
 
-        $this->assertIsString($html);
+        self::assertIsString($html);
 
-        $this->assertStringContainsString(
-            'You probably did not create a configuration file. You might want ' .
-            'to use the <a href="setup/">setup script</a> to create one.',
-            $html
-        );
+        self::assertStringContainsString('You probably did not create a configuration file. You might want ' .
+        'to use the <a href="setup/">setup script</a> to create one.', $html);
 
-        $this->assertStringContainsString(
-            '<strong>MySQL said: </strong><a href="./url.php?url=https%3A%2F%2F' .
-            'dev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fserver-error-reference.html"' .
-            ' target="mysql_doc">' .
-            '<img src="themes/dot.gif" title="Documentation" alt="Documentation" ' .
-            'class="icon ic_b_help"></a>',
-            $html
-        );
+        self::assertStringContainsString('<strong>MySQL said: </strong><a href="./url.php?url=https%3A%2F%2F' .
+        'dev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fserver-error-reference.html"' .
+        ' target="mysql_doc">' .
+        '<img src="themes/dot.gif" title="Documentation" alt="Documentation" ' .
+        'class="icon ic_b_help"></a>', $html);
 
-        $this->assertStringContainsString('Cannot connect: invalid settings.', $html);
+        self::assertStringContainsString('Cannot connect: invalid settings.', $html);
 
-        $this->assertStringContainsString(
-            '<a href="index.php?route=/&server=0&lang=en" '
-            . 'class="btn btn-primary mt-1 mb-1 disableAjax">Retry to connect</a>',
-            $html
-        );
+        self::assertStringContainsString('<a href="index.php?route=/&server=0&lang=en" '
+        . 'class="btn btn-primary mt-1 mb-1 disableAjax">Retry to connect</a>', $html);
     }
 }
diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
index 84c9de9e61..3e8cc56c9e 100644
--- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -85,9 +85,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
             ->with('redirect_flag', '1');
 
         $GLOBALS['conn_error'] = true;
-        $this->assertTrue(
-            $this->object->showLoginForm()
-        );
+        self::assertTrue($this->object->showLoginForm());
     }
 
     private function getAuthErrorMockResponse(): void
@@ -202,45 +200,36 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $this->object->showLoginForm();
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString(' id="imLogo"', $result);
+        self::assertStringContainsString(' id="imLogo"', $result);
 
-        $this->assertStringContainsString('<div class="alert alert-danger" role="alert">', $result);
+        self::assertStringContainsString('<div class="alert alert-danger" role="alert">', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<form method="post" id="login_form" action="index.php?route=/" name="login_form" ' .
             'class="disableAjax hide js-show">',
             $result
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input type="text" name="pma_servername" id="serverNameInput" value="localhost"',
             $result
         );
 
-        $this->assertStringContainsString(
-            '<input type="text" name="pma_username" id="input_username" ' .
-            'value="pmauser" class="form-control" autocomplete="username" spellcheck="false">',
-            $result
-        );
+        self::assertStringContainsString('<input type="text" name="pma_username" id="input_username" ' .
+        'value="pmauser" class="form-control" autocomplete="username" spellcheck="false">', $result);
 
-        $this->assertStringContainsString(
-            '<input type="password" name="pma_password" id="input_password" ' .
-            'value="" class="form-control" autocomplete="current-password" spellcheck="false">',
-            $result
-        );
+        self::assertStringContainsString('<input type="password" name="pma_password" id="input_password" ' .
+        'value="" class="form-control" autocomplete="current-password" spellcheck="false">', $result);
 
-        $this->assertStringContainsString(
-            '<select name="server" id="select_server" class="form-select" ' .
-            'onchange="document.forms[\'login_form\'].' .
-            'elements[\'pma_servername\'].value = \'\'">',
-            $result
-        );
+        self::assertStringContainsString('<select name="server" id="select_server" class="form-select" ' .
+        'onchange="document.forms[\'login_form\'].' .
+        'elements[\'pma_servername\'].value = \'\'">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="db" value="testDb">', $result);
+        self::assertStringContainsString('<input type="hidden" name="db" value="testDb">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="table" value="testTable">', $result);
+        self::assertStringContainsString('<input type="hidden" name="table" value="testTable">', $result);
     }
 
     /**
@@ -284,38 +273,32 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $this->object->showLoginForm();
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('id="imLogo"', $result);
+        self::assertStringContainsString('id="imLogo"', $result);
 
         // Check for language selection if locales are there
         $loc = LOCALE_PATH . '/cs/LC_MESSAGES/phpmyadmin.mo';
         if (is_readable($loc)) {
-            $this->assertStringContainsString(
-                '<select name="lang" class="form-select autosubmit" lang="en" dir="ltr"'
-                . ' id="languageSelect" aria-labelledby="languageSelectLabel">',
-                $result
-            );
+            self::assertStringContainsString('<select name="lang" class="form-select autosubmit" lang="en" dir="ltr"'
+            . ' id="languageSelect" aria-labelledby="languageSelectLabel">', $result);
         }
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<form method="post" id="login_form" action="index.php?route=/" name="login_form"' .
             ' class="disableAjax hide js-show" autocomplete="off">',
             $result
         );
 
-        $this->assertStringContainsString('<input type="hidden" name="server" value="0">', $result);
+        self::assertStringContainsString('<input type="hidden" name="server" value="0">', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<script src="https://www.google.com/recaptcha/api.js?hl=en" async defer></script>',
             $result
         );
 
-        $this->assertStringContainsString(
-            '<input class="btn btn-primary g-recaptcha" data-sitekey="testpubkey"'
-            . ' data-callback="Functions_recaptchaCallback" value="Log in" type="submit" id="input_go">',
-            $result
-        );
+        self::assertStringContainsString('<input class="btn btn-primary g-recaptcha" data-sitekey="testpubkey"'
+        . ' data-callback="Functions_recaptchaCallback" value="Log in" type="submit" id="input_go">', $result);
     }
 
     /**
@@ -360,36 +343,33 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $this->object->showLoginForm();
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('id="imLogo"', $result);
+        self::assertStringContainsString('id="imLogo"', $result);
 
         // Check for language selection if locales are there
         $loc = LOCALE_PATH . '/cs/LC_MESSAGES/phpmyadmin.mo';
         if (is_readable($loc)) {
-            $this->assertStringContainsString(
-                '<select name="lang" class="form-select autosubmit" lang="en" dir="ltr"'
-                . ' id="languageSelect" aria-labelledby="languageSelectLabel">',
-                $result
-            );
+            self::assertStringContainsString('<select name="lang" class="form-select autosubmit" lang="en" dir="ltr"'
+            . ' id="languageSelect" aria-labelledby="languageSelectLabel">', $result);
         }
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<form method="post" id="login_form" action="index.php?route=/" name="login_form"' .
             ' class="disableAjax hide js-show" autocomplete="off">',
             $result
         );
 
-        $this->assertStringContainsString('<input type="hidden" name="server" value="0">', $result);
+        self::assertStringContainsString('<input type="hidden" name="server" value="0">', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<script src="https://www.google.com/recaptcha/api.js?hl=en" async defer></script>',
             $result
         );
 
-        $this->assertStringContainsString('<div class="g-recaptcha" data-sitekey="testpubkey"></div>', $result);
+        self::assertStringContainsString('<div class="g-recaptcha" data-sitekey="testpubkey"></div>', $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<input class="btn btn-primary" value="Log in" type="submit" id="input_go">',
             $result
         );
@@ -437,11 +417,9 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $_POST['g-recaptcha-response'] = '';
         $_POST['pma_username'] = 'testPMAUser';
 
-        $this->assertFalse(
-            $this->object->readCredentials()
-        );
+        self::assertFalse($this->object->readCredentials());
 
-        $this->assertEquals(
+        self::assertSame(
             'Missing reCAPTCHA verification, maybe it has been blocked by adblock?',
             $GLOBALS['conn_error']
         );
@@ -465,7 +443,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $this->object->logOut();
 
-        $this->assertArrayNotHasKey('pmaAuth-0', $_COOKIE);
+        self::assertArrayNotHasKey('pmaAuth-0', $_COOKIE);
     }
 
     public function testLogout(): void
@@ -488,7 +466,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $this->object->logOut();
 
-        $this->assertArrayNotHasKey('pmaAuth-1', $_COOKIE);
+        self::assertArrayNotHasKey('pmaAuth-1', $_COOKIE);
     }
 
     public function testAuthCheckArbitrary(): void
@@ -504,17 +482,15 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $_POST['pma_password'] = 'testPMAPSWD';
         $GLOBALS['cfg']['AllowArbitraryServer'] = true;
 
-        $this->assertTrue(
-            $this->object->readCredentials()
-        );
+        self::assertTrue($this->object->readCredentials());
 
-        $this->assertEquals('testPMAUser', $this->object->user);
+        self::assertSame('testPMAUser', $this->object->user);
 
-        $this->assertEquals('testPMAPSWD', $this->object->password);
+        self::assertSame('testPMAPSWD', $this->object->password);
 
-        $this->assertEquals('testPMAServer', $GLOBALS['pma_auth_server']);
+        self::assertSame('testPMAServer', $GLOBALS['pma_auth_server']);
 
-        $this->assertArrayNotHasKey('pmaAuth-1', $_COOKIE);
+        self::assertArrayNotHasKey('pmaAuth-1', $_COOKIE);
     }
 
     public function testAuthCheckInvalidCookie(): void
@@ -527,9 +503,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $_COOKIE['pmaUser-1'] = '';
         $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09');
 
-        $this->assertFalse(
-            $this->object->readCredentials()
-        );
+        self::assertFalse($this->object->readCredentials());
     }
 
     public function testAuthCheckExpires(): void
@@ -543,9 +517,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $_SESSION['last_access_time'] = time() - 1000;
         $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
 
-        $this->assertFalse(
-            $this->object->readCredentials()
-        );
+        self::assertFalse($this->object->readCredentials());
     }
 
     public function testAuthCheckDecryptUser(): void
@@ -575,11 +547,9 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
             ->method('cookieDecrypt')
             ->will($this->returnValue('testBF'));
 
-        $this->assertFalse(
-            $this->object->readCredentials()
-        );
+        self::assertFalse($this->object->readCredentials());
 
-        $this->assertEquals('testBF', $this->object->user);
+        self::assertSame('testBF', $this->object->user);
     }
 
     public function testAuthCheckDecryptPassword(): void
@@ -611,13 +581,11 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
             ->method('cookieDecrypt')
             ->will($this->returnValue('{"password":""}'));
 
-        $this->assertTrue(
-            $this->object->readCredentials()
-        );
+        self::assertTrue($this->object->readCredentials());
 
-        $this->assertTrue($GLOBALS['from_cookie']);
+        self::assertTrue($GLOBALS['from_cookie']);
 
-        $this->assertEquals('', $this->object->password);
+        self::assertSame('', $this->object->password);
     }
 
     public function testAuthCheckAuthFails(): void
@@ -652,9 +620,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $this->object->expects($this->once())
             ->method('showFailure');
 
-        $this->assertFalse(
-            $this->object->readCredentials()
-        );
+        self::assertFalse($this->object->readCredentials());
     }
 
     public function testAuthSetUser(): void
@@ -683,14 +649,14 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $this->object->rememberCredentials();
 
-        $this->assertArrayHasKey('pmaUser-2', $_COOKIE);
+        self::assertArrayHasKey('pmaUser-2', $_COOKIE);
 
-        $this->assertArrayHasKey('pmaAuth-2', $_COOKIE);
+        self::assertArrayHasKey('pmaAuth-2', $_COOKIE);
 
         $arr['password'] = 'testPW';
         $arr['host'] = 'b';
         $arr['port'] = '2';
-        $this->assertEquals($arr, $GLOBALS['cfg']['Server']);
+        self::assertSame($arr, $GLOBALS['cfg']['Server']);
     }
 
     public function testAuthSetUserWithHeaders(): void
@@ -742,9 +708,9 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         );
         $this->object->showFailure('empty-denied');
 
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
-            'Login without a password is forbidden by configuration (see AllowNoPassword)'
+        self::assertSame(
+            'Login without a password is forbidden by configuration (see AllowNoPassword)',
+            $GLOBALS['conn_error']
         );
     }
 
@@ -785,16 +751,12 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $_POST['pma_password'] = $password;
 
         if ($trueFalse === false) {
-            $this->assertFalse(
-                $this->object->readCredentials()
-            );
+            self::assertFalse($this->object->readCredentials());
         } else {
-            $this->assertTrue(
-                $this->object->readCredentials()
-            );
+            self::assertTrue($this->object->readCredentials());
         }
 
-        $this->assertEquals($GLOBALS['conn_error'], $connError);
+        self::assertSame($GLOBALS['conn_error'], $connError);
     }
 
     /**
@@ -816,7 +778,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         );
         $this->object->showFailure('allow-denied');
 
-        $this->assertEquals($GLOBALS['conn_error'], 'Access denied!');
+        self::assertSame($GLOBALS['conn_error'], 'Access denied!');
     }
 
     /**
@@ -840,10 +802,10 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         );
         $this->object->showFailure('no-activity');
 
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
+        self::assertSame(
             'You have been automatically logged out due to inactivity of 10 seconds.'
-            . ' Once you log in again, you should be able to resume the work where you left off.'
+            . ' Once you log in again, you should be able to resume the work where you left off.',
+            $GLOBALS['conn_error']
         );
     }
 
@@ -877,7 +839,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         );
         $this->object->showFailure('');
 
-        $this->assertEquals($GLOBALS['conn_error'], '#42 Cannot log in to the MySQL server');
+        self::assertSame($GLOBALS['conn_error'], '#42 Cannot log in to the MySQL server');
     }
 
     /**
@@ -910,7 +872,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         );
         $this->object->showFailure('');
 
-        $this->assertEquals($GLOBALS['conn_error'], 'Cannot log in to the MySQL server');
+        self::assertSame($GLOBALS['conn_error'], 'Cannot log in to the MySQL server');
     }
 
     public function testGetEncryptionSecretEmpty(): void
@@ -923,8 +885,8 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $result = $method->invoke($this->object, null);
 
-        $this->assertSame($result, $_SESSION['encryption_key']);
-        $this->assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($result, '8bit'));
+        self::assertSame($result, $_SESSION['encryption_key']);
+        self::assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($result, '8bit'));
     }
 
     public function testGetEncryptionSecretConfigured(): void
@@ -938,7 +900,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $result = $method->invoke($this->object, null);
 
-        $this->assertSame($key, $result);
+        self::assertSame($key, $result);
     }
 
     public function testGetSessionEncryptionSecretConfigured(): void
@@ -952,28 +914,28 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $result = $method->invoke($this->object, null);
 
-        $this->assertSame($key, $result);
+        self::assertSame($key, $result);
     }
 
     public function testCookieEncryption(): void
     {
         $key = random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
         $encrypted = $this->object->cookieEncrypt('data123', $key);
-        $this->assertNotFalse(base64_decode($encrypted, true));
-        $this->assertSame('data123', $this->object->cookieDecrypt($encrypted, $key));
+        self::assertNotFalse(base64_decode($encrypted, true));
+        self::assertSame('data123', $this->object->cookieDecrypt($encrypted, $key));
     }
 
     public function testCookieDecryptInvalid(): void
     {
-        $this->assertNull($this->object->cookieDecrypt('', ''));
+        self::assertNull($this->object->cookieDecrypt('', ''));
 
         $key = random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
         $encrypted = $this->object->cookieEncrypt('data123', $key);
-        $this->assertSame('data123', $this->object->cookieDecrypt($encrypted, $key));
+        self::assertSame('data123', $this->object->cookieDecrypt($encrypted, $key));
 
-        $this->assertNull($this->object->cookieDecrypt('', $key));
-        $this->assertNull($this->object->cookieDecrypt($encrypted, ''));
-        $this->assertNull($this->object->cookieDecrypt($encrypted, random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES)));
+        self::assertNull($this->object->cookieDecrypt('', $key));
+        self::assertNull($this->object->cookieDecrypt($encrypted, ''));
+        self::assertNull($this->object->cookieDecrypt($encrypted, random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES)));
     }
 
     /**
@@ -992,12 +954,12 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
 
         $payload = ['password' => $newPassword, 'server' => 'b 2'];
 
-        $this->assertIsString($_COOKIE['pmaAuth-' . $GLOBALS['server']]);
+        self::assertIsString($_COOKIE['pmaAuth-' . $GLOBALS['server']]);
         $decryptedCookie = $this->object->cookieDecrypt(
             $_COOKIE['pmaAuth-' . $GLOBALS['server']],
             $_SESSION['encryption_key']
         );
-        $this->assertSame(json_encode($payload), $decryptedCookie);
+        self::assertSame(json_encode($payload), $decryptedCookie);
     }
 
     public function testAuthenticate(): void
@@ -1018,15 +980,15 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $result = ob_get_clean();
 
         /* Nothing should be printed */
-        $this->assertEquals('', $result);
+        self::assertSame('', $result);
 
         /* Verify readCredentials worked */
-        $this->assertEquals('testUser', $this->object->user);
-        $this->assertEquals('testPassword', $this->object->password);
+        self::assertSame('testUser', $this->object->user);
+        self::assertSame('testPassword', $this->object->password);
 
         /* Verify storeCredentials worked */
-        $this->assertEquals('testUser', $GLOBALS['cfg']['Server']['user']);
-        $this->assertEquals('testPassword', $GLOBALS['cfg']['Server']['password']);
+        self::assertSame('testUser', $GLOBALS['cfg']['Server']['user']);
+        self::assertSame('testPassword', $GLOBALS['cfg']['Server']['password']);
     }
 
     /**
@@ -1067,12 +1029,12 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $this->object->checkRules();
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
         if (empty($expected)) {
-            $this->assertEquals($expected, $result);
+            self::assertSame($expected, $result);
         } else {
-            $this->assertStringContainsString($expected, $result);
+            self::assertStringContainsString($expected, $result);
         }
     }
 
diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
index 2e45610e6d..ef35a84fbd 100644
--- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
@@ -111,9 +111,7 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
         if (! empty($_REQUEST['old_usr'])) {
             $this->object->logOut();
         } else {
-            $this->assertFalse(
-                $this->object->showLoginForm()
-            );
+            self::assertFalse($this->object->showLoginForm());
         }
     }
 
@@ -214,14 +212,11 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
 
         $_REQUEST['old_usr'] = $old_usr;
 
-        $this->assertEquals(
-            $expectedReturn,
-            $this->object->readCredentials()
-        );
+        self::assertSame($expectedReturn, $this->object->readCredentials());
 
-        $this->assertEquals($expectedUser, $this->object->user);
+        self::assertSame($expectedUser, $this->object->user);
 
-        $this->assertEquals($expectedPass, $this->object->password);
+        self::assertEquals($expectedPass, $this->object->password);
 
         $_SERVER[$userIndex] = null;
         $_SERVER[$passIndex] = null;
@@ -293,17 +288,15 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
         $GLOBALS['server'] = 2;
         $GLOBALS['cfg']['Server']['user'] = 'testUser';
 
-        $this->assertTrue(
-            $this->object->storeCredentials()
-        );
+        self::assertTrue($this->object->storeCredentials());
 
-        $this->assertEquals('testUser', $GLOBALS['cfg']['Server']['user']);
+        self::assertSame('testUser', $GLOBALS['cfg']['Server']['user']);
 
-        $this->assertEquals('testPass', $GLOBALS['cfg']['Server']['password']);
+        self::assertSame('testPass', $GLOBALS['cfg']['Server']['password']);
 
-        $this->assertArrayNotHasKey('PHP_AUTH_PW', $_SERVER);
+        self::assertArrayNotHasKey('PHP_AUTH_PW', $_SERVER);
 
-        $this->assertEquals(2, $GLOBALS['server']);
+        self::assertSame(2, $GLOBALS['server']);
 
         // case 2
         $this->object->user = 'testUser';
@@ -319,20 +312,15 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
             'user' => 'user2',
         ];
 
-        $this->assertTrue(
-            $this->object->storeCredentials()
-        );
+        self::assertTrue($this->object->storeCredentials());
 
-        $this->assertEquals(
-            [
-                'user' => 'testUser',
-                'password' => 'testPass',
-                'host' => 'a',
-            ],
-            $GLOBALS['cfg']['Server']
-        );
+        self::assertEquals([
+            'user' => 'testUser',
+            'password' => 'testPass',
+            'host' => 'a',
+        ], $GLOBALS['cfg']['Server']);
 
-        $this->assertEquals(2, $GLOBALS['server']);
+        self::assertSame(2, $GLOBALS['server']);
 
         // case 3
         $GLOBALS['server'] = 3;
@@ -349,20 +337,15 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
             'user' => 'user2',
         ];
 
-        $this->assertTrue(
-            $this->object->storeCredentials()
-        );
+        self::assertTrue($this->object->storeCredentials());
 
-        $this->assertEquals(
-            [
-                'user' => 'testUser',
-                'password' => 'testPass',
-                'host' => 'a',
-            ],
-            $GLOBALS['cfg']['Server']
-        );
+        self::assertEquals([
+            'user' => 'testUser',
+            'password' => 'testPass',
+            'host' => 'a',
+        ], $GLOBALS['cfg']['Server']);
 
-        $this->assertEquals(3, $GLOBALS['server']);
+        self::assertSame(3, $GLOBALS['server']);
     }
 
     /**
@@ -388,9 +371,9 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
         $this->object->showFailure('');
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('<p>error 123</p>', $result);
+        self::assertStringContainsString('<p>error 123</p>', $result);
 
         $this->object = $this->getMockBuilder(AuthenticationHttp::class)
             ->disableOriginalConstructor()
diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
index a0424bd7b9..af3f77e58d 100644
--- a/test/classes/Plugins/Auth/AuthenticationSignonTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
@@ -60,9 +60,9 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
         $this->object->showLoginForm();
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('You must set SignonURL!', $result);
+        self::assertStringContainsString('You must set SignonURL!', $result);
     }
 
     public function testAuthLogoutURL(): void
@@ -91,9 +91,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $_SESSION['LAST_SIGNON_URL'] = 'https://example.com/SignonDiffURL';
 
-        $this->assertFalse(
-            $this->object->readCredentials()
-        );
+        self::assertFalse($this->object->readCredentials());
     }
 
     public function testAuthCheckSession(): void
@@ -107,15 +105,13 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
         $GLOBALS['cfg']['Server']['port'] = '80';
         $GLOBALS['cfg']['Server']['user'] = 'user';
 
-        $this->assertTrue(
-            $this->object->readCredentials()
-        );
+        self::assertTrue($this->object->readCredentials());
 
-        $this->assertEquals('user', $this->object->user);
+        self::assertSame('user', $this->object->user);
 
-        $this->assertEquals('password', $this->object->password);
+        self::assertSame('password', $this->object->password);
 
-        $this->assertEquals('https://example.com/SignonURL', $_SESSION['LAST_SIGNON_URL']);
+        self::assertSame('https://example.com/SignonURL', $_SESSION['LAST_SIGNON_URL']);
     }
 
     public function testAuthCheckToken(): void
@@ -142,30 +138,21 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
 
         $this->object->logOut();
 
-        $this->assertEquals(
-            [
-                'SignonURL' => 'https://example.com/SignonURL',
-                'SignonScript' => '',
-                'SignonSession' => 'session123',
-                'SignonCookieParams' => [],
-                'host' => 'localhost',
-                'port' => '80',
-                'user' => 'user',
-            ],
-            $GLOBALS['cfg']['Server']
-        );
+        self::assertEquals([
+            'SignonURL' => 'https://example.com/SignonURL',
+            'SignonScript' => '',
+            'SignonSession' => 'session123',
+            'SignonCookieParams' => [],
+            'host' => 'localhost',
+            'port' => '80',
+            'user' => 'user',
+        ], $GLOBALS['cfg']['Server']);
 
-        $this->assertEquals(
-            $sessionName,
-            session_name()
-        );
+        self::assertSame($sessionName, session_name());
 
-        $this->assertEquals(
-            $sessionID,
-            session_id()
-        );
+        self::assertSame($sessionID, session_id());
 
-        $this->assertArrayNotHasKey('LAST_SIGNON_URL', $_SESSION);
+        self::assertArrayNotHasKey('LAST_SIGNON_URL', $_SESSION);
     }
 
     public function testAuthCheckKeep(): void
@@ -186,13 +173,11 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
         $_SESSION['PMA_single_signon_cfgupdate'] = ['foo' => 'bar'];
         $_SESSION['PMA_single_signon_token'] = 'pmaToken';
 
-        $this->assertTrue(
-            $this->object->readCredentials()
-        );
+        self::assertTrue($this->object->readCredentials());
 
-        $this->assertEquals('user123', $this->object->user);
+        self::assertSame('user123', $this->object->user);
 
-        $this->assertEquals('pass123', $this->object->password);
+        self::assertSame('pass123', $this->object->password);
     }
 
     public function testAuthSetUser(): void
@@ -200,13 +185,11 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
         $this->object->user = 'testUser123';
         $this->object->password = 'testPass123';
 
-        $this->assertTrue(
-            $this->object->storeCredentials()
-        );
+        self::assertTrue($this->object->storeCredentials());
 
-        $this->assertEquals('testUser123', $GLOBALS['cfg']['Server']['user']);
+        self::assertSame('testUser123', $GLOBALS['cfg']['Server']['user']);
 
-        $this->assertEquals('testPass123', $GLOBALS['cfg']['Server']['password']);
+        self::assertSame('testPass123', $GLOBALS['cfg']['Server']['password']);
     }
 
     public function testAuthFailsForbidden(): void
@@ -224,7 +207,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
 
         $this->object->showFailure('empty-denied');
 
-        $this->assertEquals(
+        self::assertSame(
             'Login without a password is forbidden by configuration (see AllowNoPassword)',
             $_SESSION['PMA_single_signon_error_message']
         );
@@ -245,7 +228,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
 
         $this->object->showFailure('allow-denied');
 
-        $this->assertEquals('Access denied!', $_SESSION['PMA_single_signon_error_message']);
+        self::assertSame('Access denied!', $_SESSION['PMA_single_signon_error_message']);
     }
 
     public function testAuthFailsTimeout(): void
@@ -265,12 +248,9 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
 
         $this->object->showFailure('no-activity');
 
-        $this->assertEquals(
-            'You have been automatically logged out due to inactivity of'
-            . ' 1440 seconds. Once you log in again, you should be able to'
-            . ' resume the work where you left off.',
-            $_SESSION['PMA_single_signon_error_message']
-        );
+        self::assertSame('You have been automatically logged out due to inactivity of'
+        . ' 1440 seconds. Once you log in again, you should be able to'
+        . ' resume the work where you left off.', $_SESSION['PMA_single_signon_error_message']);
     }
 
     public function testAuthFailsMySQLError(): void
@@ -298,7 +278,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
 
         $this->object->showFailure('');
 
-        $this->assertEquals('error&lt;123&gt;', $_SESSION['PMA_single_signon_error_message']);
+        self::assertSame('error&lt;123&gt;', $_SESSION['PMA_single_signon_error_message']);
     }
 
     public function testAuthFailsConnect(): void
@@ -327,7 +307,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
 
         $this->object->showFailure('');
 
-        $this->assertEquals('Cannot log in to the MySQL server', $_SESSION['PMA_single_signon_error_message']);
+        self::assertSame('Cannot log in to the MySQL server', $_SESSION['PMA_single_signon_error_message']);
     }
 
     public function testSetCookieParamsDefaults(): void
@@ -352,9 +332,6 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase
             unset($defaultOptions['samesite']);
         }
 
-        $this->assertSame(
-            $defaultOptions,
-            session_get_cookie_params()
-        );
+        self::assertSame($defaultOptions, session_get_cookie_params());
     }
 }
diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php
index 6534f491b9..03da6a2199 100644
--- a/test/classes/Plugins/Export/ExportCodegenTest.php
+++ b/test/classes/Plugins/Export/ExportCodegenTest.php
@@ -55,13 +55,10 @@ class ExportCodegenTest extends AbstractTestCase
         $attrCgFormats = new ReflectionProperty(ExportCodegen::class, 'cgFormats');
         $attrCgFormats->setAccessible(true);
 
-        $this->assertEquals(
-            [
-                'NHibernate C# DO',
-                'NHibernate XML',
-            ],
-            $attrCgFormats->getValue($this->object)
-        );
+        self::assertSame([
+            'NHibernate C# DO',
+            'NHibernate XML',
+        ], $attrCgFormats->getValue($this->object));
     }
 
     public function testSetProperties(): void
@@ -74,107 +71,69 @@ class ExportCodegenTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'CodeGen',
-            $properties->getText()
-        );
+        self::assertSame('CodeGen', $properties->getText());
 
-        $this->assertEquals(
-            'cs',
-            $properties->getExtension()
-        );
+        self::assertSame('cs', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/cs',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/cs', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $hidden = $generalProperties[0];
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $hidden);
+        self::assertInstanceOf(HiddenPropertyItem::class, $hidden);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $hidden->getName()
-        );
+        self::assertSame('structure_or_data', $hidden->getName());
 
         $select = $generalProperties[1];
 
-        $this->assertInstanceOf(SelectPropertyItem::class, $select);
+        self::assertInstanceOf(SelectPropertyItem::class, $select);
 
-        $this->assertEquals(
-            'format',
-            $select->getName()
-        );
+        self::assertSame('format', $select->getName());
 
-        $this->assertEquals(
-            'Format:',
-            $select->getText()
-        );
+        self::assertSame('Format:', $select->getText());
 
-        $this->assertEquals(
-            [
-                'NHibernate C# DO',
-                'NHibernate XML',
-            ],
-            $select->getValues()
-        );
+        self::assertSame([
+            'NHibernate C# DO',
+            'NHibernate XML',
+        ], $select->getValues());
     }
 
     public function testExportHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
     }
 
     public function testExportFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportData(): void
@@ -190,25 +149,22 @@ class ExportCodegenTest extends AbstractTestCase
         $this->object->exportData('test_db', 'test_table', "\n", 'localhost', 'SELECT * FROM `test_db`.`test_table`;');
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertEquals(
-            '<?xml version="1.0" encoding="utf-8" ?>' . "\n"
-            . '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="Test_db" assembly="Test_db">' . "\n"
-            . '    <class name="Test_table" table="Test_table">' . "\n"
-            . '        <id name="Id" type="Int32" unsaved-value="0">' . "\n"
-            . '            <column name="id" sql-type="int" not-null="true" unique="true" index="PRIMARY"/>' . "\n"
-            . '            <generator class="native" />' . "\n"
-            . '        </id>' . "\n"
-            . '        <property name="Name" type="String">' . "\n"
-            . '            <column name="name" sql-type="varchar" not-null="true" />' . "\n"
-            . '        </property>' . "\n"
-            . '        <property name="Datetimefield" type="DateTime">' . "\n"
-            . '            <column name="datetimefield" sql-type="datetime" not-null="true" />' . "\n"
-            . '        </property>' . "\n"
-            . '    </class>' . "\n"
-            . '</hibernate-mapping>',
-            $result
-        );
+        self::assertIsString($result);
+        self::assertSame('<?xml version="1.0" encoding="utf-8" ?>' . "\n"
+        . '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="Test_db" assembly="Test_db">' . "\n"
+        . '    <class name="Test_table" table="Test_table">' . "\n"
+        . '        <id name="Id" type="Int32" unsaved-value="0">' . "\n"
+        . '            <column name="id" sql-type="int" not-null="true" unique="true" index="PRIMARY"/>' . "\n"
+        . '            <generator class="native" />' . "\n"
+        . '        </id>' . "\n"
+        . '        <property name="Name" type="String">' . "\n"
+        . '            <column name="name" sql-type="varchar" not-null="true" />' . "\n"
+        . '        </property>' . "\n"
+        . '        <property name="Datetimefield" type="DateTime">' . "\n"
+        . '            <column name="datetimefield" sql-type="datetime" not-null="true" />' . "\n"
+        . '        </property>' . "\n"
+        . '    </class>' . "\n"
+        . '</hibernate-mapping>', $result);
 
         $GLOBALS['codegen_format'] = 4;
 
@@ -219,20 +175,11 @@ class ExportCodegenTest extends AbstractTestCase
 
     public function testCgMakeIdentifier(): void
     {
-        $this->assertEquals(
-            '_Ⅲfoo',
-            ExportCodegen::cgMakeIdentifier('Ⅲ{}96`{}foo', true)
-        );
+        self::assertSame('_Ⅲfoo', ExportCodegen::cgMakeIdentifier('Ⅲ{}96`{}foo', true));
 
-        $this->assertEquals(
-            'TestⅢ',
-            ExportCodegen::cgMakeIdentifier('`98testⅢ{}96`{}', true)
-        );
+        self::assertSame('TestⅢ', ExportCodegen::cgMakeIdentifier('`98testⅢ{}96`{}', true));
 
-        $this->assertEquals(
-            'testⅢ',
-            ExportCodegen::cgMakeIdentifier('`98testⅢ{}96`{}', false)
-        );
+        self::assertSame('testⅢ', ExportCodegen::cgMakeIdentifier('`98testⅢ{}96`{}', false));
     }
 
     public function testHandleNHibernateCSBody(): void
@@ -241,51 +188,48 @@ class ExportCodegenTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'test_db', 'test_table', "\n");
 
-        $this->assertEquals(
-            'using System;' . "\n" .
-            'using System.Collections;' . "\n" .
-            'using System.Collections.Generic;' . "\n" .
-            'using System.Text;' . "\n" .
-            'namespace Test_db' . "\n" .
-            '{' . "\n" .
-            '    #region Test_table' . "\n" .
-            '    public class Test_table' . "\n" .
-            '    {' . "\n" .
-            '        #region Member Variables' . "\n" .
-            '        protected int _id;' . "\n" .
-            '        protected string _name;' . "\n" .
-            '        protected DateTime _datetimefield;' . "\n" .
-            '        #endregion' . "\n" .
-            '        #region Constructors' . "\n" .
-            '        public Test_table() { }' . "\n" .
-            '        public Test_table(string name, DateTime datetimefield)' . "\n" .
-            '        {' . "\n" .
-            '            this._name=name;' . "\n" .
-            '            this._datetimefield=datetimefield;' . "\n" .
-            '        }' . "\n" .
-            '        #endregion' . "\n" .
-            '        #region Public Properties' . "\n" .
-            '        public virtual int Id' . "\n" .
-            '        {' . "\n" .
-            '            get {return _id;}' . "\n" .
-            '            set {_id=value;}' . "\n" .
-            '        }' . "\n" .
-            '        public virtual string Name' . "\n" .
-            '        {' . "\n" .
-            '            get {return _name;}' . "\n" .
-            '            set {_name=value;}' . "\n" .
-            '        }' . "\n" .
-            '        public virtual DateTime Datetimefield' . "\n" .
-            '        {' . "\n" .
-            '            get {return _datetimefield;}' . "\n" .
-            '            set {_datetimefield=value;}' . "\n" .
-            '        }' . "\n" .
-            '        #endregion' . "\n" .
-            '    }' . "\n" .
-            '    #endregion' . "\n" .
-            '}',
-            $result
-        );
+        self::assertSame('using System;' . "\n" .
+        'using System.Collections;' . "\n" .
+        'using System.Collections.Generic;' . "\n" .
+        'using System.Text;' . "\n" .
+        'namespace Test_db' . "\n" .
+        '{' . "\n" .
+        '    #region Test_table' . "\n" .
+        '    public class Test_table' . "\n" .
+        '    {' . "\n" .
+        '        #region Member Variables' . "\n" .
+        '        protected int _id;' . "\n" .
+        '        protected string _name;' . "\n" .
+        '        protected DateTime _datetimefield;' . "\n" .
+        '        #endregion' . "\n" .
+        '        #region Constructors' . "\n" .
+        '        public Test_table() { }' . "\n" .
+        '        public Test_table(string name, DateTime datetimefield)' . "\n" .
+        '        {' . "\n" .
+        '            this._name=name;' . "\n" .
+        '            this._datetimefield=datetimefield;' . "\n" .
+        '        }' . "\n" .
+        '        #endregion' . "\n" .
+        '        #region Public Properties' . "\n" .
+        '        public virtual int Id' . "\n" .
+        '        {' . "\n" .
+        '            get {return _id;}' . "\n" .
+        '            set {_id=value;}' . "\n" .
+        '        }' . "\n" .
+        '        public virtual string Name' . "\n" .
+        '        {' . "\n" .
+        '            get {return _name;}' . "\n" .
+        '            set {_name=value;}' . "\n" .
+        '        }' . "\n" .
+        '        public virtual DateTime Datetimefield' . "\n" .
+        '        {' . "\n" .
+        '            get {return _datetimefield;}' . "\n" .
+        '            set {_datetimefield=value;}' . "\n" .
+        '        }' . "\n" .
+        '        #endregion' . "\n" .
+        '    }' . "\n" .
+        '    #endregion' . "\n" .
+        '}', $result);
     }
 
     public function testHandleNHibernateXMLBody(): void
@@ -294,24 +238,21 @@ class ExportCodegenTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'test_db', 'test_table', "\n");
 
-        $this->assertEquals(
-            '<?xml version="1.0" encoding="utf-8" ?>' . "\n" .
-            '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="Test_db" assembly="Test_db">' . "\n" .
-            '    <class name="Test_table" table="Test_table">' . "\n" .
-            '        <id name="Id" type="Int32" unsaved-value="0">' . "\n" .
-            '            <column name="id" sql-type="int" not-null="true" unique="true" index="PRIMARY"/>' . "\n" .
-            '            <generator class="native" />' . "\n" .
-            '        </id>' . "\n" .
-            '        <property name="Name" type="String">' . "\n" .
-            '            <column name="name" sql-type="varchar" not-null="true" />' . "\n" .
-            '        </property>' . "\n" .
-            '        <property name="Datetimefield" type="DateTime">' . "\n" .
-            '            <column name="datetimefield" sql-type="datetime" not-null="true" />' . "\n" .
-            '        </property>' . "\n" .
-            '    </class>' . "\n" .
-            '</hibernate-mapping>',
-            $result
-        );
+        self::assertSame('<?xml version="1.0" encoding="utf-8" ?>' . "\n" .
+        '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="Test_db" assembly="Test_db">' . "\n" .
+        '    <class name="Test_table" table="Test_table">' . "\n" .
+        '        <id name="Id" type="Int32" unsaved-value="0">' . "\n" .
+        '            <column name="id" sql-type="int" not-null="true" unique="true" index="PRIMARY"/>' . "\n" .
+        '            <generator class="native" />' . "\n" .
+        '        </id>' . "\n" .
+        '        <property name="Name" type="String">' . "\n" .
+        '            <column name="name" sql-type="varchar" not-null="true" />' . "\n" .
+        '        </property>' . "\n" .
+        '        <property name="Datetimefield" type="DateTime">' . "\n" .
+        '            <column name="datetimefield" sql-type="datetime" not-null="true" />' . "\n" .
+        '        </property>' . "\n" .
+        '    </class>' . "\n" .
+        '</hibernate-mapping>', $result);
     }
 
     /**
@@ -331,12 +272,9 @@ class ExportCodegenTest extends AbstractTestCase
 
         $setter->invoke($this->object, [1, 2]);
 
-        $this->assertEquals(
-            [
-                1,
-                2,
-            ],
-            $getter->invoke($this->object)
-        );
+        self::assertSame([
+            1,
+            2,
+        ], $getter->invoke($this->object));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportCsvTest.php b/test/classes/Plugins/Export/ExportCsvTest.php
index 18f67afb47..b81a52314c 100644
--- a/test/classes/Plugins/Export/ExportCsvTest.php
+++ b/test/classes/Plugins/Export/ExportCsvTest.php
@@ -62,155 +62,92 @@ class ExportCsvTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'CSV',
-            $properties->getText()
-        );
+        self::assertSame('CSV', $properties->getText());
 
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
+        self::assertSame('csv', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/comma-separated-values',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/comma-separated-values', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'separator',
-            $property->getName()
-        );
+        self::assertSame('separator', $property->getName());
 
-        $this->assertEquals(
-            'Columns separated with:',
-            $property->getText()
-        );
+        self::assertSame('Columns separated with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'enclosed',
-            $property->getName()
-        );
+        self::assertSame('enclosed', $property->getName());
 
-        $this->assertEquals(
-            'Columns enclosed with:',
-            $property->getText()
-        );
+        self::assertSame('Columns enclosed with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'escaped',
-            $property->getName()
-        );
+        self::assertSame('escaped', $property->getName());
 
-        $this->assertEquals(
-            'Columns escaped with:',
-            $property->getText()
-        );
+        self::assertSame('Columns escaped with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'terminated',
-            $property->getName()
-        );
+        self::assertSame('terminated', $property->getName());
 
-        $this->assertEquals(
-            'Lines terminated with:',
-            $property->getText()
-        );
+        self::assertSame('Lines terminated with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
 
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
+        self::assertSame('Replace NULL with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'removeCRLF',
-            $property->getName()
-        );
+        self::assertSame('removeCRLF', $property->getName());
 
-        $this->assertEquals(
-            'Remove carriage return/line feed characters within columns',
-            $property->getText()
-        );
+        self::assertSame('Remove carriage return/line feed characters within columns', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
+        self::assertSame('Put columns names in the first row', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
     }
 
     public function testExportHeader(): void
@@ -221,19 +158,17 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['excel_edition'] = 'win';
         $GLOBALS['excel_columns'] = true;
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals("\015\012", $GLOBALS['csv_terminated']);
+        self::assertSame("\015\012", $GLOBALS['csv_terminated']);
 
-        $this->assertEquals(';', $GLOBALS['csv_separator']);
+        self::assertSame(';', $GLOBALS['csv_separator']);
 
-        $this->assertEquals('"', $GLOBALS['csv_enclosed']);
+        self::assertSame('"', $GLOBALS['csv_enclosed']);
 
-        $this->assertEquals('"', $GLOBALS['csv_escaped']);
+        self::assertSame('"', $GLOBALS['csv_escaped']);
 
-        $this->assertEquals(true, $GLOBALS['csv_columns']);
+        self::assertTrue($GLOBALS['csv_columns']);
 
         // case 2
 
@@ -241,48 +176,42 @@ class ExportCsvTest extends AbstractTestCase
         unset($GLOBALS['excel_columns']);
         $GLOBALS['csv_columns'] = false;
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals("\015\012", $GLOBALS['csv_terminated']);
+        self::assertSame("\015\012", $GLOBALS['csv_terminated']);
 
-        $this->assertEquals(';', $GLOBALS['csv_separator']);
+        self::assertSame(';', $GLOBALS['csv_separator']);
 
-        $this->assertEquals('"', $GLOBALS['csv_enclosed']);
+        self::assertSame('"', $GLOBALS['csv_enclosed']);
 
-        $this->assertEquals('"', $GLOBALS['csv_escaped']);
+        self::assertSame('"', $GLOBALS['csv_escaped']);
 
-        $this->assertEquals(false, $GLOBALS['csv_columns']);
+        self::assertFalse($GLOBALS['csv_columns']);
 
         // case 3
 
         $GLOBALS['excel_edition'] = 'mac_excel2008';
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals("\015\012", $GLOBALS['csv_terminated']);
+        self::assertSame("\015\012", $GLOBALS['csv_terminated']);
 
-        $this->assertEquals(',', $GLOBALS['csv_separator']);
+        self::assertSame(',', $GLOBALS['csv_separator']);
 
-        $this->assertEquals('"', $GLOBALS['csv_enclosed']);
+        self::assertSame('"', $GLOBALS['csv_enclosed']);
 
-        $this->assertEquals('"', $GLOBALS['csv_escaped']);
+        self::assertSame('"', $GLOBALS['csv_escaped']);
 
-        $this->assertEquals(false, $GLOBALS['csv_columns']);
+        self::assertFalse($GLOBALS['csv_columns']);
 
         // case 4
 
         $GLOBALS['excel_edition'] = 'testBlank';
         $GLOBALS['csv_separator'] = '#';
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals('#', $GLOBALS['csv_separator']);
+        self::assertSame('#', $GLOBALS['csv_separator']);
 
         // case 5
 
@@ -291,63 +220,49 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['csv_terminated'] = '';
         $GLOBALS['csv_separator'] = 'a\\t';
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals($GLOBALS['csv_terminated'], "\n");
+        self::assertSame($GLOBALS['csv_terminated'], "\n");
 
-        $this->assertEquals($GLOBALS['csv_separator'], "a\011");
+        self::assertSame($GLOBALS['csv_separator'], "a\011");
         // case 6
 
         $GLOBALS['csv_terminated'] = 'AUTO';
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals($GLOBALS['csv_terminated'], "\n");
+        self::assertSame($GLOBALS['csv_terminated'], "\n");
 
         // case 7
 
         $GLOBALS['csv_terminated'] = 'a\\rb\\nc\\t';
         $GLOBALS['csv_separator'] = 'a\\t';
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertEquals($GLOBALS['csv_terminated'], "a\015b\012c\011");
+        self::assertSame($GLOBALS['csv_terminated'], "a\015b\012c\011");
 
-        $this->assertEquals($GLOBALS['csv_separator'], "a\011");
+        self::assertSame($GLOBALS['csv_separator'], "a\011");
     }
 
     public function testExportFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -364,7 +279,7 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['file_handle'] = null;
 
         ob_start();
-        $this->assertFalse($this->object->exportData(
+        self::assertFalse($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -385,7 +300,7 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['csv_separator'] = '';
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -394,7 +309,7 @@ class ExportCsvTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
+        self::assertSame(
             'idnamedatetimefiel;1abcd2011-01-20 02:00:02;2foo2010-01-20 02:00:02;3Abcd2012-01-20 02:00:02;',
             $result
         );
@@ -404,7 +319,7 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['csv_escaped'] = '';
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -413,11 +328,8 @@ class ExportCsvTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
-            . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";',
-            $result
-        );
+        self::assertSame('"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
+        . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";', $result);
 
         // case 4
         $GLOBALS['csv_enclosed'] = '"';
@@ -426,7 +338,7 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['csv_escaped'] = '"';
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -435,11 +347,8 @@ class ExportCsvTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
-            . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";',
-            $result
-        );
+        self::assertSame('"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
+        . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";', $result);
 
         // case 5
         $GLOBALS['csv_enclosed'] = '"';
@@ -447,7 +356,7 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['csv_escaped'] = ';';
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -456,11 +365,8 @@ class ExportCsvTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
-            . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";',
-            $result
-        );
+        self::assertSame('"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
+        . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";', $result);
 
         // case 6
         $GLOBALS['csv_enclosed'] = '"';
@@ -468,7 +374,7 @@ class ExportCsvTest extends AbstractTestCase
         $GLOBALS['csv_escaped'] = '#';
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -477,10 +383,7 @@ class ExportCsvTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
-            . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";',
-            $result
-        );
+        self::assertSame('"id""name""datetimefield;"1""abcd""2011-01-20 02:00:02";'
+        . '"2""foo""2010-01-20 02:00:02";"3""Abcd""2012-01-20 02:00:02";', $result);
     }
 }
diff --git a/test/classes/Plugins/Export/ExportExcelTest.php b/test/classes/Plugins/Export/ExportExcelTest.php
index 14daf5f35f..35781cfb3c 100644
--- a/test/classes/Plugins/Export/ExportExcelTest.php
+++ b/test/classes/Plugins/Export/ExportExcelTest.php
@@ -56,121 +56,73 @@ class ExportExcelTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'CSV for MS Excel',
-            $properties->getText()
-        );
+        self::assertSame('CSV for MS Excel', $properties->getText());
 
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
+        self::assertSame('csv', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/comma-separated-values',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/comma-separated-values', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
 
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
+        self::assertSame('Replace NULL with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'removeCRLF',
-            $property->getName()
-        );
+        self::assertSame('removeCRLF', $property->getName());
 
-        $this->assertEquals(
-            'Remove carriage return/line feed characters within columns',
-            $property->getText()
-        );
+        self::assertSame('Remove carriage return/line feed characters within columns', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
+        self::assertSame('Put columns names in the first row', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(SelectPropertyItem::class, $property);
+        self::assertInstanceOf(SelectPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'edition',
-            $property->getName()
-        );
+        self::assertSame('edition', $property->getName());
 
-        $this->assertEquals(
-            [
-                'win' => 'Windows',
-                'mac_excel2003' => 'Excel 2003 / Macintosh',
-                'mac_excel2008' => 'Excel 2008 / Macintosh',
-            ],
-            $property->getValues()
-        );
+        self::assertSame([
+            'win' => 'Windows',
+            'mac_excel2003' => 'Excel 2003 / Macintosh',
+            'mac_excel2008' => 'Excel 2008 / Macintosh',
+        ], $property->getValues());
 
-        $this->assertEquals(
-            'Excel edition:',
-            $property->getText()
-        );
+        self::assertSame('Excel edition:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
     }
 }
diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php
index 19c0263d21..45e7aee363 100644
--- a/test/classes/Plugins/Export/ExportHtmlwordTest.php
+++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php
@@ -73,124 +73,74 @@ class ExportHtmlwordTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'Microsoft Word 2000',
-            $properties->getText()
-        );
+        self::assertSame('Microsoft Word 2000', $properties->getText());
 
-        $this->assertEquals(
-            'doc',
-            $properties->getExtension()
-        );
+        self::assertSame('doc', $properties->getExtension());
 
-        $this->assertEquals(
-            'application/vnd.ms-word',
-            $properties->getMimeType()
-        );
+        self::assertSame('application/vnd.ms-word', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
+        self::assertTrue($properties->getForceFile());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
+        self::assertSame('dump_what', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
+        self::assertSame('Dump table', $generalOptions->getText());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(RadioPropertyItem::class, $property);
+        self::assertInstanceOf(RadioPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
 
-        $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
-            $property->getValues()
-        );
+        self::assertSame([
+            'structure' => __('structure'),
+            'data' => __('data'),
+            'structure_and_data' => __('structure and data'),
+        ], $property->getValues());
 
         $generalOptions = $generalOptionsArray[1];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
+        self::assertSame('dump_what', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Data dump options',
-            $generalOptions->getText()
-        );
+        self::assertSame('Data dump options', $generalOptions->getText());
 
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getForce()
-        );
+        self::assertSame('structure', $generalOptions->getForce());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
 
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
+        self::assertSame('Replace NULL with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
+        self::assertSame('Put columns names in the first row', $property->getText());
     }
 
     public function testExportHeader(): void
@@ -212,7 +162,7 @@ class ExportHtmlwordTest extends AbstractTestCase
             </head>
             <body>';
 
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
 
         // case 2
 
@@ -234,43 +184,35 @@ class ExportHtmlwordTest extends AbstractTestCase
             </head>
             <body>';
 
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
     }
 
     public function testExportFooter(): void
     {
         ob_start();
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
         $result = ob_get_clean();
 
-        $this->assertEquals('</body></html>', $result);
+        self::assertSame('</body></html>', $result);
     }
 
     public function testExportDBHeader(): void
     {
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('d"b')
-        );
+        self::assertTrue($this->object->exportDBHeader('d"b'));
         $result = ob_get_clean();
 
-        $this->assertEquals('<h1>Database d&quot;b</h1>', $result);
+        self::assertSame('<h1>Database d&quot;b</h1>', $result);
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -286,7 +228,7 @@ class ExportHtmlwordTest extends AbstractTestCase
         $GLOBALS['save_on_server'] = false;
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -295,21 +237,18 @@ class ExportHtmlwordTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '<h2>Dumping data for table test_table</h2>'
-            . '<table width="100%" cellspacing="1"><tr class="print-category">'
-            . '<td class="print"><strong>id</strong></td>'
-            . '<td class="print"><strong>name</strong></td>'
-            . '<td class="print"><strong>datetimefield</strong></td>'
-            . '</tr><tr class="print-category">'
-            . '<td class="print">1</td><td class="print">abcd</td><td class="print">2011-01-20 02:00:02</td>'
-            . '</tr><tr class="print-category">'
-            . '<td class="print">2</td><td class="print">foo</td><td class="print">2010-01-20 02:00:02</td>'
-            . '</tr><tr class="print-category">'
-            . '<td class="print">3</td><td class="print">Abcd</td><td class="print">2012-01-20 02:00:02</td>'
-            . '</tr></table>',
-            $result
-        );
+        self::assertSame('<h2>Dumping data for table test_table</h2>'
+        . '<table width="100%" cellspacing="1"><tr class="print-category">'
+        . '<td class="print"><strong>id</strong></td>'
+        . '<td class="print"><strong>name</strong></td>'
+        . '<td class="print"><strong>datetimefield</strong></td>'
+        . '</tr><tr class="print-category">'
+        . '<td class="print">1</td><td class="print">abcd</td><td class="print">2011-01-20 02:00:02</td>'
+        . '</tr><tr class="print-category">'
+        . '<td class="print">2</td><td class="print">foo</td><td class="print">2010-01-20 02:00:02</td>'
+        . '</tr><tr class="print-category">'
+        . '<td class="print">3</td><td class="print">Abcd</td><td class="print">2012-01-20 02:00:02</td>'
+        . '</tr></table>', $result);
     }
 
     public function testGetTableDefStandIn(): void
@@ -352,15 +291,12 @@ class ExportHtmlwordTest extends AbstractTestCase
             ->with(['Field' => 'column'], ['name1'], 'column')
             ->will($this->returnValue(1));
 
-        $this->assertEquals(
-            '<table width="100%" cellspacing="1">' .
-            '<tr class="print-category"><th class="print">Column</th>' .
-            '<td class="print"><strong>Type</strong></td>' .
-            '<td class="print"><strong>Null</strong></td>' .
-            '<td class="print"><strong>Default</strong></td></tr>' .
-            '1</tr></table>',
-            $this->object->getTableDefStandIn('database', 'view', "\n")
-        );
+        self::assertSame('<table width="100%" cellspacing="1">' .
+        '<tr class="print-category"><th class="print">Column</th>' .
+        '<td class="print"><strong>Type</strong></td>' .
+        '<td class="print"><strong>Null</strong></td>' .
+        '<td class="print"><strong>Default</strong></td></tr>' .
+        '1</tr></table>', $this->object->getTableDefStandIn('database', 'view', "\n"));
     }
 
     public function testGetTableDef(): void
@@ -447,17 +383,14 @@ class ExportHtmlwordTest extends AbstractTestCase
 
         $result = $this->object->getTableDef('database', '', true, true, true);
 
-        $this->assertEquals(
-            '<table width="100%" cellspacing="1">' .
-            '<tr class="print-category"><th class="print">Column</th>' .
-            '<td class="print"><strong>Type</strong></td>' .
-            '<td class="print"><strong>Null</strong></td>' .
-            '<td class="print"><strong>Default</strong></td>' .
-            '<td class="print"><strong>Comments</strong></td>' .
-            '<td class="print"><strong>Media type</strong></td></tr>' .
-            '1<td class="print"></td><td class="print">Test&lt;</td></tr></table>',
-            $result
-        );
+        self::assertSame('<table width="100%" cellspacing="1">' .
+        '<tr class="print-category"><th class="print">Column</th>' .
+        '<td class="print"><strong>Type</strong></td>' .
+        '<td class="print"><strong>Null</strong></td>' .
+        '<td class="print"><strong>Default</strong></td>' .
+        '<td class="print"><strong>Comments</strong></td>' .
+        '<td class="print"><strong>Media type</strong></td></tr>' .
+        '1<td class="print"></td><td class="print">Test&lt;</td></tr></table>', $result);
 
         // case 2
 
@@ -527,9 +460,9 @@ class ExportHtmlwordTest extends AbstractTestCase
 
         $result = $this->object->getTableDef('database', '', true, true, true);
 
-        $this->assertStringContainsString('<td class="print">ftable (ffield)</td>', $result);
+        self::assertStringContainsString('<td class="print">ftable (ffield)</td>', $result);
 
-        $this->assertStringContainsString('<td class="print"></td><td class="print"></td>', $result);
+        self::assertStringContainsString('<td class="print"></td><td class="print"></td>', $result);
 
         // case 3
 
@@ -566,14 +499,11 @@ class ExportHtmlwordTest extends AbstractTestCase
 
         $result = $this->object->getTableDef('database', '', false, false, false);
 
-        $this->assertEquals(
-            '<table width="100%" cellspacing="1">' .
-            '<tr class="print-category"><th class="print">Column</th>' .
-            '<td class="print"><strong>Type</strong></td>' .
-            '<td class="print"><strong>Null</strong></td>' .
-            '<td class="print"><strong>Default</strong></td></tr>1</tr></table>',
-            $result
-        );
+        self::assertSame('<table width="100%" cellspacing="1">' .
+        '<tr class="print-category"><th class="print">Column</th>' .
+        '<td class="print"><strong>Type</strong></td>' .
+        '<td class="print"><strong>Null</strong></td>' .
+        '<td class="print"><strong>Default</strong></td></tr>1</tr></table>', $result);
     }
 
     public function testGetTriggers(): void
@@ -602,125 +532,102 @@ class ExportHtmlwordTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'database', 'table');
 
-        $this->assertStringContainsString(
-            '<td class="print">tna&quot;me</td>' .
-            '<td class="print">ac&gt;t</td>' .
-            '<td class="print">manip&amp;</td>' .
-            '<td class="print">def</td>',
-            $result
-        );
+        self::assertStringContainsString('<td class="print">tna&quot;me</td>' .
+        '<td class="print">ac&gt;t</td>' .
+        '<td class="print">manip&amp;</td>' .
+        '<td class="print">def</td>', $result);
     }
 
     public function testExportStructure(): void
     {
         ob_start();
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_table',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_table',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '<h2>Table structure for table test_table</h2>'
-            . '<table width="100%" cellspacing="1"><tr class="print-category">'
-            . '<th class="print">Column</th><td class="print"><strong>Type</strong></td>'
-            . '<td class="print"><strong>Null</strong></td><td class="print"><strong>Default</strong></td></tr>'
-            . '<tr class="print-category"><td class="print"><em><strong>id</strong></em></td>'
-            . '<td class="print">int(11)</td><td class="print">No</td><td class="print">NULL</td></tr>'
-            . '<tr class="print-category"><td class="print">name</td><td class="print">varchar(20)</td>'
-            . '<td class="print">No</td><td class="print">NULL</td></tr><tr class="print-category">'
-            . '<td class="print">datetimefield</td><td class="print">datetime</td>'
-            . '<td class="print">No</td><td class="print">NULL</td></tr></table>',
-            $result
-        );
+        self::assertSame('<h2>Table structure for table test_table</h2>'
+        . '<table width="100%" cellspacing="1"><tr class="print-category">'
+        . '<th class="print">Column</th><td class="print"><strong>Type</strong></td>'
+        . '<td class="print"><strong>Null</strong></td><td class="print"><strong>Default</strong></td></tr>'
+        . '<tr class="print-category"><td class="print"><em><strong>id</strong></em></td>'
+        . '<td class="print">int(11)</td><td class="print">No</td><td class="print">NULL</td></tr>'
+        . '<tr class="print-category"><td class="print">name</td><td class="print">varchar(20)</td>'
+        . '<td class="print">No</td><td class="print">NULL</td></tr><tr class="print-category">'
+        . '<td class="print">datetimefield</td><td class="print">datetime</td>'
+        . '<td class="print">No</td><td class="print">NULL</td></tr></table>', $result);
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'triggers',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'triggers',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '<h2>Triggers test_table</h2><table width="100%" cellspacing="1">'
-            . '<tr class="print-category"><th class="print">Name</th>'
-            . '<td class="print"><strong>Time</strong></td><td class="print"><strong>Event</strong></td>'
-            . '<td class="print"><strong>Definition</strong></td></tr><tr class="print-category">'
-            . '<td class="print">test_trigger</td><td class="print">AFTER</td>'
-            . '<td class="print">INSERT</td><td class="print">BEGIN END</td></tr></table>',
-            $result
-        );
+        self::assertSame('<h2>Triggers test_table</h2><table width="100%" cellspacing="1">'
+        . '<tr class="print-category"><th class="print">Name</th>'
+        . '<td class="print"><strong>Time</strong></td><td class="print"><strong>Event</strong></td>'
+        . '<td class="print"><strong>Definition</strong></td></tr><tr class="print-category">'
+        . '<td class="print">test_trigger</td><td class="print">AFTER</td>'
+        . '<td class="print">INSERT</td><td class="print">BEGIN END</td></tr></table>', $result);
 
         ob_start();
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_view',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_view',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '<h2>Structure for view test_table</h2>'
-            . '<table width="100%" cellspacing="1"><tr class="print-category">'
-            . '<th class="print">Column</th><td class="print"><strong>Type</strong></td>'
-            . '<td class="print"><strong>Null</strong></td><td class="print"><strong>Default</strong>'
-            . '</td></tr><tr class="print-category"><td class="print"><em><strong>id</strong></em></td>'
-            . '<td class="print">int(11)</td><td class="print">No</td><td class="print">NULL</td></tr>'
-            . '<tr class="print-category"><td class="print">name</td><td class="print">varchar(20)</td>'
-            . '<td class="print">No</td><td class="print">NULL</td></tr><tr class="print-category">'
-            . '<td class="print">datetimefield</td><td class="print">datetime</td>'
-            . '<td class="print">No</td><td class="print">NULL</td></tr></table>',
-            $result
-        );
+        self::assertSame('<h2>Structure for view test_table</h2>'
+        . '<table width="100%" cellspacing="1"><tr class="print-category">'
+        . '<th class="print">Column</th><td class="print"><strong>Type</strong></td>'
+        . '<td class="print"><strong>Null</strong></td><td class="print"><strong>Default</strong>'
+        . '</td></tr><tr class="print-category"><td class="print"><em><strong>id</strong></em></td>'
+        . '<td class="print">int(11)</td><td class="print">No</td><td class="print">NULL</td></tr>'
+        . '<tr class="print-category"><td class="print">name</td><td class="print">varchar(20)</td>'
+        . '<td class="print">No</td><td class="print">NULL</td></tr><tr class="print-category">'
+        . '<td class="print">datetimefield</td><td class="print">datetime</td>'
+        . '<td class="print">No</td><td class="print">NULL</td></tr></table>', $result);
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'stand_in',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'stand_in',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '<h2>Stand-in structure for view test_table</h2>'
-            . '<table width="100%" cellspacing="1"><tr class="print-category">'
-            . '<th class="print">Column</th><td class="print"><strong>Type</strong></td>'
-            . '<td class="print"><strong>Null</strong></td><td class="print"><strong>Default</strong></td>'
-            . '</tr><tr class="print-category">'
-            . '<td class="print"><em><strong>id</strong></em></td><td class="print">int(11)</td>'
-            . '<td class="print">No</td><td class="print">NULL</td></tr><tr class="print-category">'
-            . '<td class="print">name</td><td class="print">varchar(20)</td><td class="print">No</td>'
-            . '<td class="print">NULL</td></tr><tr class="print-category">'
-            . '<td class="print">datetimefield</td><td class="print">datetime</td>'
-            . '<td class="print">No</td><td class="print">NULL</td></tr></table>',
-            $result
-        );
+        self::assertSame('<h2>Stand-in structure for view test_table</h2>'
+        . '<table width="100%" cellspacing="1"><tr class="print-category">'
+        . '<th class="print">Column</th><td class="print"><strong>Type</strong></td>'
+        . '<td class="print"><strong>Null</strong></td><td class="print"><strong>Default</strong></td>'
+        . '</tr><tr class="print-category">'
+        . '<td class="print"><em><strong>id</strong></em></td><td class="print">int(11)</td>'
+        . '<td class="print">No</td><td class="print">NULL</td></tr><tr class="print-category">'
+        . '<td class="print">name</td><td class="print">varchar(20)</td><td class="print">No</td>'
+        . '<td class="print">NULL</td></tr><tr class="print-category">'
+        . '<td class="print">datetimefield</td><td class="print">datetime</td>'
+        . '<td class="print">No</td><td class="print">NULL</td></tr></table>', $result);
     }
 
     public function testFormatOneColumnDefinition(): void
@@ -737,12 +644,9 @@ class ExportHtmlwordTest extends AbstractTestCase
 
         $unique_keys = ['field'];
 
-        $this->assertEquals(
-            '<tr class="print-category"><td class="print"><em>' .
-            '<strong>field</strong></em></td><td class="print">set(abc)</td>' .
-            '<td class="print">Yes</td><td class="print">NULL</td>',
-            $method->invoke($this->object, $cols, $unique_keys)
-        );
+        self::assertSame('<tr class="print-category"><td class="print"><em>' .
+        '<strong>field</strong></em></td><td class="print">set(abc)</td>' .
+        '<td class="print">Yes</td><td class="print">NULL</td>', $method->invoke($this->object, $cols, $unique_keys));
 
         $cols = [
             'Null' => 'NO',
@@ -754,11 +658,8 @@ class ExportHtmlwordTest extends AbstractTestCase
 
         $unique_keys = ['field'];
 
-        $this->assertEquals(
-            '<tr class="print-category"><td class="print">fields</td>' .
-            '<td class="print">&amp;nbsp;</td><td class="print">No</td>' .
-            '<td class="print">def</td>',
-            $method->invoke($this->object, $cols, $unique_keys)
-        );
+        self::assertSame('<tr class="print-category"><td class="print">fields</td>' .
+        '<td class="print">&amp;nbsp;</td><td class="print">No</td>' .
+        '<td class="print">def</td>', $method->invoke($this->object, $cols, $unique_keys));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportJsonTest.php b/test/classes/Plugins/Export/ExportJsonTest.php
index 97589f4bdf..af0fd3ba6a 100644
--- a/test/classes/Plugins/Export/ExportJsonTest.php
+++ b/test/classes/Plugins/Export/ExportJsonTest.php
@@ -59,57 +59,36 @@ class ExportJsonTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'JSON',
-            $properties->getText()
-        );
+        self::assertSame('JSON', $properties->getText());
 
-        $this->assertEquals(
-            'json',
-            $properties->getExtension()
-        );
+        self::assertSame('json', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/plain', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
     }
 
     public function testExportHeader(): void
@@ -123,9 +102,7 @@ class ExportJsonTest extends AbstractTestCase
             . "\n"
         );
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
     }
 
     public function testExportFooter(): void
@@ -134,9 +111,7 @@ class ExportJsonTest extends AbstractTestCase
 
         $this->expectOutputString(']');
 
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
@@ -145,23 +120,17 @@ class ExportJsonTest extends AbstractTestCase
 
         $this->expectOutputString('{"type":"database","name":"testDB"},' . "\n");
 
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -176,7 +145,7 @@ class ExportJsonTest extends AbstractTestCase
             . '}' . "\n"
         );
 
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -199,15 +168,13 @@ class ExportJsonTest extends AbstractTestCase
             . "]\n}\n"
         );
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                'test_table_complex',
-                "\n",
-                'example.com',
-                'SELECT * FROM `test_db`.`test_table_complex`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            'test_table_complex',
+            "\n",
+            'example.com',
+            'SELECT * FROM `test_db`.`test_table_complex`;'
+        ));
     }
 
     public function testExportRawComplexData(): void
@@ -223,13 +190,11 @@ class ExportJsonTest extends AbstractTestCase
             . "]\n}\n"
         );
 
-        $this->assertTrue(
-            $this->object->exportRawQuery(
-                'example.com',
-                null,
-                'SELECT * FROM `test_db`.`test_table_complex`;',
-                "\n"
-            )
-        );
+        self::assertTrue($this->object->exportRawQuery(
+            'example.com',
+            null,
+            'SELECT * FROM `test_db`.`test_table_complex`;',
+            "\n"
+        ));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php
index c0e78f1d66..094fa0b39d 100644
--- a/test/classes/Plugins/Export/ExportLatexTest.php
+++ b/test/classes/Plugins/Export/ExportLatexTest.php
@@ -79,325 +79,187 @@ class ExportLatexTest extends AbstractTestCase
         $method->setAccessible(true);
         $properties = $method->invoke($this->object, null);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'LaTeX',
-            $properties->getText()
-        );
+        self::assertSame('LaTeX', $properties->getText());
 
-        $this->assertEquals(
-            'tex',
-            $properties->getExtension()
-        );
+        self::assertSame('tex', $properties->getExtension());
 
-        $this->assertEquals(
-            'application/x-tex',
-            $properties->getMimeType()
-        );
+        self::assertSame('application/x-tex', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'caption',
-            $property->getName()
-        );
+        self::assertSame('caption', $property->getName());
 
-        $this->assertEquals(
-            'Include table caption',
-            $property->getText()
-        );
+        self::assertSame('Include table caption', $property->getText());
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
+        self::assertSame('dump_what', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
+        self::assertSame('Dump table', $generalOptions->getText());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(RadioPropertyItem::class, $property);
+        self::assertInstanceOf(RadioPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
 
-        $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
-            $property->getValues()
-        );
+        self::assertSame([
+            'structure' => __('structure'),
+            'data' => __('data'),
+            'structure_and_data' => __('structure and data'),
+        ], $property->getValues());
 
         // hide structure
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getName()
-        );
+        self::assertSame('structure', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Object creation options',
-            $generalOptions->getText()
-        );
+        self::assertSame('Object creation options', $generalOptions->getText());
 
-        $this->assertEquals(
-            'data',
-            $generalOptions->getForce()
-        );
+        self::assertSame('data', $generalOptions->getForce());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_caption',
-            $property->getName()
-        );
+        self::assertSame('structure_caption', $property->getName());
 
-        $this->assertEquals(
-            'Table caption:',
-            $property->getText()
-        );
+        self::assertSame('Table caption:', $property->getText());
 
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
+        self::assertSame('faq6-27', $property->getDoc());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_continued_caption',
-            $property->getName()
-        );
+        self::assertSame('structure_continued_caption', $property->getName());
 
-        $this->assertEquals(
-            'Table caption (continued):',
-            $property->getText()
-        );
+        self::assertSame('Table caption (continued):', $property->getText());
 
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
+        self::assertSame('faq6-27', $property->getDoc());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_label',
-            $property->getName()
-        );
+        self::assertSame('structure_label', $property->getName());
 
-        $this->assertEquals(
-            'Label key:',
-            $property->getText()
-        );
+        self::assertSame('Label key:', $property->getText());
 
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
+        self::assertSame('faq6-27', $property->getDoc());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'relation',
-            $property->getName()
-        );
+        self::assertSame('relation', $property->getName());
 
-        $this->assertEquals(
-            'Display foreign key relationships',
-            $property->getText()
-        );
+        self::assertSame('Display foreign key relationships', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'comments',
-            $property->getName()
-        );
+        self::assertSame('comments', $property->getName());
 
-        $this->assertEquals(
-            'Display comments',
-            $property->getText()
-        );
+        self::assertSame('Display comments', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'mime',
-            $property->getName()
-        );
+        self::assertSame('mime', $property->getName());
 
-        $this->assertEquals(
-            'Display media types',
-            $property->getText()
-        );
+        self::assertSame('Display media types', $property->getText());
 
         // data options
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
+        self::assertSame('data', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Data dump options',
-            $generalOptions->getText()
-        );
+        self::assertSame('Data dump options', $generalOptions->getText());
 
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getForce()
-        );
+        self::assertSame('structure', $generalOptions->getForce());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
-        $this->assertEquals(
-            'Put columns names in the first row:',
-            $property->getText()
-        );
+        self::assertSame('Put columns names in the first row:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'data_caption',
-            $property->getName()
-        );
+        self::assertSame('data_caption', $property->getName());
 
-        $this->assertEquals(
-            'Table caption:',
-            $property->getText()
-        );
+        self::assertSame('Table caption:', $property->getText());
 
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
+        self::assertSame('faq6-27', $property->getDoc());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'data_continued_caption',
-            $property->getName()
-        );
+        self::assertSame('data_continued_caption', $property->getName());
 
-        $this->assertEquals(
-            'Table caption (continued):',
-            $property->getText()
-        );
+        self::assertSame('Table caption (continued):', $property->getText());
 
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
+        self::assertSame('faq6-27', $property->getDoc());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'data_label',
-            $property->getName()
-        );
+        self::assertSame('data_label', $property->getName());
 
-        $this->assertEquals(
-            'Label key:',
-            $property->getText()
-        );
+        self::assertSame('Label key:', $property->getText());
 
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
+        self::assertSame('faq6-27', $property->getDoc());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
 
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
+        self::assertSame('Replace NULL with:', $property->getText());
 
         // case 2
         $GLOBALS['plugin_param']['export_type'] = 'table';
@@ -407,7 +269,7 @@ class ExportLatexTest extends AbstractTestCase
 
         $generalOptionsArray = $options->getProperties();
 
-        $this->assertCount(4, $generalOptionsArray);
+        self::assertCount(4, $generalOptionsArray);
     }
 
     public function testExportHeader(): void
@@ -417,21 +279,17 @@ class ExportLatexTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("\n% Host: localhost:80", $result);
+        self::assertStringContainsString("\n% Host: localhost:80", $result);
     }
 
     public function testExportFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
@@ -440,23 +298,17 @@ class ExportLatexTest extends AbstractTestCase
 
         $this->expectOutputString("% \n% Database: 'testDB'\n% \n");
 
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -471,7 +323,7 @@ class ExportLatexTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['verbose'] = 'verb';
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -480,30 +332,27 @@ class ExportLatexTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            "\n" . '%' . "\n" .
-            '% Data: test_table' . "\n" .
-            '%' . "\n" .
-            ' \begin{longtable}{|l|l|l|} ' . "\n" .
-            ' \hline \endhead \hline \endfoot \hline ' . "\n" .
-            ' \caption{latex data caption} \label{datalabel} \\\\\hline \multicolumn{1}{|c|}' .
-            '{\textbf{id}} & \multicolumn{1}{|c|}{\textbf{name}} & \multicolumn{1}{|c|}' .
-            '{\textbf{datetimefield}} \\\ \hline \hline  \endfirsthead ' . "\n" .
-            '\caption{continued caption} \\\ \hline \multicolumn{1}{|c|}{\textbf{id}} & \multicolumn{1}' .
-            '{|c|}{\textbf{name}} & \multicolumn{1}{|c|}{\textbf{datetimefield}}' .
-            ' \\\ \hline \hline \endhead \endfoot' . "\n" .
-            '1 & abcd & 2011-01-20 02:00:02 \\\\ \hline ' . "\n" .
-            '2 & foo & 2010-01-20 02:00:02 \\\\ \hline ' . "\n" .
-            '3 & Abcd & 2012-01-20 02:00:02 \\\\ \hline ' . "\n" .
-            ' \end{longtable}' . "\n",
-            $result
-        );
+        self::assertSame("\n" . '%' . "\n" .
+        '% Data: test_table' . "\n" .
+        '%' . "\n" .
+        ' \begin{longtable}{|l|l|l|} ' . "\n" .
+        ' \hline \endhead \hline \endfoot \hline ' . "\n" .
+        ' \caption{latex data caption} \label{datalabel} \\\\\hline \multicolumn{1}{|c|}' .
+        '{\textbf{id}} & \multicolumn{1}{|c|}{\textbf{name}} & \multicolumn{1}{|c|}' .
+        '{\textbf{datetimefield}} \\\ \hline \hline  \endfirsthead ' . "\n" .
+        '\caption{continued caption} \\\ \hline \multicolumn{1}{|c|}{\textbf{id}} & \multicolumn{1}' .
+        '{|c|}{\textbf{name}} & \multicolumn{1}{|c|}{\textbf{datetimefield}}' .
+        ' \\\ \hline \hline \endhead \endfoot' . "\n" .
+        '1 & abcd & 2011-01-20 02:00:02 \\\\ \hline ' . "\n" .
+        '2 & foo & 2010-01-20 02:00:02 \\\\ \hline ' . "\n" .
+        '3 & Abcd & 2012-01-20 02:00:02 \\\\ \hline ' . "\n" .
+        ' \end{longtable}' . "\n", $result);
 
         // case 2
         unset($GLOBALS['latex_columns']);
 
         ob_start();
-        $this->assertTrue($this->object->exportData(
+        self::assertTrue($this->object->exportData(
             'test_db',
             'test_table',
             "\n",
@@ -512,20 +361,17 @@ class ExportLatexTest extends AbstractTestCase
         ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertEquals(
-            "\n" . '%' . "\n" .
-            '% Data: test_table' . "\n" .
-            '%' . "\n" .
-            ' \begin{longtable}{|l|l|l|} ' . "\n" .
-            ' \hline \endhead \hline \endfoot \hline ' . "\n" .
-            ' \caption{latex data caption} \label{datalabel} \\\\\\\\ \hline' .
-            '1 & abcd & 2011-01-20 02:00:02 \\\\ \hline ' . "\n" .
-            '2 & foo & 2010-01-20 02:00:02 \\\\ \hline ' . "\n" .
-            '3 & Abcd & 2012-01-20 02:00:02 \\\\ \hline ' . "\n" .
-            ' \end{longtable}' . "\n",
-            $result
-        );
+        self::assertIsString($result);
+        self::assertSame("\n" . '%' . "\n" .
+        '% Data: test_table' . "\n" .
+        '%' . "\n" .
+        ' \begin{longtable}{|l|l|l|} ' . "\n" .
+        ' \hline \endhead \hline \endfoot \hline ' . "\n" .
+        ' \caption{latex data caption} \label{datalabel} \\\\\\\\ \hline' .
+        '1 & abcd & 2011-01-20 02:00:02 \\\\ \hline ' . "\n" .
+        '2 & foo & 2010-01-20 02:00:02 \\\\ \hline ' . "\n" .
+        '3 & Abcd & 2012-01-20 02:00:02 \\\\ \hline ' . "\n" .
+        ' \end{longtable}' . "\n", $result);
     }
 
     public function testExportStructure(): void
@@ -616,44 +462,39 @@ class ExportLatexTest extends AbstractTestCase
         ])->toArray();
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                'example.com',
-                'test',
-                'test',
-                true,
-                true,
-                true
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'database',
+            '',
+            "\n",
+            'example.com',
+            'test',
+            'test',
+            true,
+            true,
+            true
+        ));
         $result = ob_get_clean();
 
         //echo $result; die;
-        $this->assertEquals(
-            "\n" . '%' . "\n" .
-            '% Structure: ' . "\n" .
-            '%' . "\n" .
-            ' \\begin{longtable}{|l|c|c|c|l|l|} ' . "\n" .
-            ' \\hline \\multicolumn{1}{|c|}{\\textbf{Column}} & ' .
-            '\\multicolumn{1}{|c|}{\\textbf{Type}} & \\multicolumn{1}{|c|}' .
-            '{\\textbf{Null}} & \\multicolumn{1}{|c|}{\\textbf{Default}} &' .
-            ' \\multicolumn{1}{|c|}{\\textbf{Comments}} & \\multicolumn{1}' .
-            '{|c|}{\\textbf{MIME}} \\\\ \\hline \\hline' . "\n" .
-            '\\endfirsthead' . "\n" . ' \\hline \\multicolumn{1}{|c|}' .
-            '{\\textbf{Column}} & \\multicolumn{1}{|c|}{\\textbf{Type}}' .
-            ' & \\multicolumn{1}{|c|}{\\textbf{Null}} & \\multicolumn' .
-            '{1}{|c|}{\\textbf{Default}} & \\multicolumn{1}{|c|}{\\textbf' .
-            '{Comments}} & \\multicolumn{1}{|c|}{\\textbf{MIME}} \\\\ ' .
-            '\\hline \\hline \\endhead \\endfoot ' . "\n" . '\\textbf{\\textit' .
-            '{name1}} & set(abc) & Yes & NULL &  ' .
-            '& Testmimetype/ \\\\ \\hline ' . "\n" .
-            'fields &   & No & def &  &  \\\\ \\hline ' . "\n" .
-            ' \\end{longtable}' . "\n",
-            $result
-        );
+        self::assertSame("\n" . '%' . "\n" .
+        '% Structure: ' . "\n" .
+        '%' . "\n" .
+        ' \\begin{longtable}{|l|c|c|c|l|l|} ' . "\n" .
+        ' \\hline \\multicolumn{1}{|c|}{\\textbf{Column}} & ' .
+        '\\multicolumn{1}{|c|}{\\textbf{Type}} & \\multicolumn{1}{|c|}' .
+        '{\\textbf{Null}} & \\multicolumn{1}{|c|}{\\textbf{Default}} &' .
+        ' \\multicolumn{1}{|c|}{\\textbf{Comments}} & \\multicolumn{1}' .
+        '{|c|}{\\textbf{MIME}} \\\\ \\hline \\hline' . "\n" .
+        '\\endfirsthead' . "\n" . ' \\hline \\multicolumn{1}{|c|}' .
+        '{\\textbf{Column}} & \\multicolumn{1}{|c|}{\\textbf{Type}}' .
+        ' & \\multicolumn{1}{|c|}{\\textbf{Null}} & \\multicolumn' .
+        '{1}{|c|}{\\textbf{Default}} & \\multicolumn{1}{|c|}{\\textbf' .
+        '{Comments}} & \\multicolumn{1}{|c|}{\\textbf{MIME}} \\\\ ' .
+        '\\hline \\hline \\endhead \\endfoot ' . "\n" . '\\textbf{\\textit' .
+        '{name1}} & set(abc) & Yes & NULL &  ' .
+        '& Testmimetype/ \\\\ \\hline ' . "\n" .
+        'fields &   & No & def &  &  \\\\ \\hline ' . "\n" .
+        ' \\end{longtable}' . "\n", $result);
 
         // case 2
 
@@ -718,28 +559,23 @@ class ExportLatexTest extends AbstractTestCase
         ])->toArray();
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                'example.com',
-                'test',
-                'test',
-                true,
-                true,
-                true
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'database',
+            '',
+            "\n",
+            'example.com',
+            'test',
+            'test',
+            true,
+            true,
+            true
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString(
-            '\\textbf{\\textit{name1}} & set(abc) & Yes & NULL & ' .
-            'ftable (ffield) &  &  \\\\ \\hline',
-            $result
-        );
+        self::assertStringContainsString('\\textbf{\\textit{name1}} & set(abc) & Yes & NULL & ' .
+        'ftable (ffield) &  &  \\\\ \\hline', $result);
 
         // case 3
 
@@ -777,42 +613,35 @@ class ExportLatexTest extends AbstractTestCase
         ])->toArray();
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                'example.com',
-                'test',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'database',
+            '',
+            "\n",
+            'example.com',
+            'test',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('\\caption{latexstructure} \\label{latexlabel}', $result);
+        self::assertStringContainsString('\\caption{latexstructure} \\label{latexlabel}', $result);
 
-        $this->assertStringContainsString('caption{latexcontinued}', $result);
+        self::assertStringContainsString('caption{latexcontinued}', $result);
 
         // case 4
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                'example.com',
-                'triggers',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'database',
+            '',
+            "\n",
+            'example.com',
+            'triggers',
+            'test'
+        ));
     }
 
     public function testTexEscape(): void
     {
-        $this->assertEquals(
-            '\\$\\%\\{foo\\&bar\\}\\#\\_\\^',
-            ExportLatex::texEscape('$%{foo&bar}#_^')
-        );
+        self::assertSame('\\$\\%\\{foo\\&bar\\}\\#\\_\\^', ExportLatex::texEscape('$%{foo&bar}#_^'));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php
index 4a6b2ece1f..e26233e0ca 100644
--- a/test/classes/Plugins/Export/ExportMediawikiTest.php
+++ b/test/classes/Plugins/Export/ExportMediawikiTest.php
@@ -69,148 +69,93 @@ class ExportMediawikiTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'MediaWiki Table',
-            $properties->getText()
-        );
+        self::assertSame('MediaWiki Table', $properties->getText());
 
-        $this->assertEquals(
-            'mediawiki',
-            $properties->getExtension()
-        );
+        self::assertSame('mediawiki', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/plain', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
+        self::assertSame('Dump table', $generalOptions->getText());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(OptionsPropertySubgroup::class, $property);
+        self::assertInstanceOf(OptionsPropertySubgroup::class, $property);
 
-        $this->assertEquals(
-            'dump_table',
-            $property->getName()
-        );
+        self::assertSame('dump_table', $property->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $property->getText()
-        );
+        self::assertSame('Dump table', $property->getText());
 
         $sgHeader = $property->getSubgroupHeader();
 
-        $this->assertInstanceOf(RadioPropertyItem::class, $sgHeader);
+        self::assertInstanceOf(RadioPropertyItem::class, $sgHeader);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $sgHeader->getName()
-        );
+        self::assertSame('structure_or_data', $sgHeader->getName());
 
-        $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
-            $sgHeader->getValues()
-        );
+        self::assertSame([
+            'structure' => __('structure'),
+            'data' => __('data'),
+            'structure_and_data' => __('structure and data'),
+        ], $sgHeader->getValues());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'caption',
-            $property->getName()
-        );
+        self::assertSame('caption', $property->getName());
 
-        $this->assertEquals(
-            'Export table names',
-            $property->getText()
-        );
+        self::assertSame('Export table names', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'headers',
-            $property->getName()
-        );
+        self::assertSame('headers', $property->getName());
 
-        $this->assertEquals(
-            'Export table headers',
-            $property->getText()
-        );
+        self::assertSame('Export table headers', $property->getText());
     }
 
     public function testExportHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
     }
 
     public function testExportFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     /**
@@ -251,48 +196,43 @@ class ExportMediawikiTest extends AbstractTestCase
         $GLOBALS['mediawiki_headers'] = true;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db',
-                'table',
-                "\n",
-                'example.com',
-                'create_table',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'db',
+            'table',
+            "\n",
+            'example.com',
+            'create_table',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            "\n<!--\n" .
-            "Table structure for `table`\n" .
-            "-->\n" .
-            "\n" .
-            "{| class=\"wikitable\" style=\"text-align:center;\"\n" .
-            "|+'''table'''\n" .
-            "|- style=\"background:#ffdead;\"\n" .
-            "! style=\"background:#ffffff\" | \n" .
-            " | name1\n" .
-            " | fields\n" .
-            "|-\n" .
-            "! Type\n" .
-            " | set(abc)enum123\n" .
-            " | \n" .
-            "|-\n" .
-            "! Null\n" .
-            " | Yes\n" .
-            " | NO\n" .
-            "|-\n" .
-            "! Default\n" .
-            " | \n" .
-            " | def\n" .
-            "|-\n" .
-            "! Extra\n" .
-            " | \n" .
-            " | ext\n" .
-            "|}\n\n",
-            $result
-        );
+        self::assertSame("\n<!--\n" .
+        "Table structure for `table`\n" .
+        "-->\n" .
+        "\n" .
+        "{| class=\"wikitable\" style=\"text-align:center;\"\n" .
+        "|+'''table'''\n" .
+        "|- style=\"background:#ffdead;\"\n" .
+        "! style=\"background:#ffffff\" | \n" .
+        " | name1\n" .
+        " | fields\n" .
+        "|-\n" .
+        "! Type\n" .
+        " | set(abc)enum123\n" .
+        " | \n" .
+        "|-\n" .
+        "! Null\n" .
+        " | Yes\n" .
+        " | NO\n" .
+        "|-\n" .
+        "! Default\n" .
+        " | \n" .
+        " | def\n" .
+        "|-\n" .
+        "! Extra\n" .
+        " | \n" .
+        " | ext\n" .
+        "|}\n\n", $result);
     }
 
     public function testExportData(): void
@@ -301,43 +241,38 @@ class ExportMediawikiTest extends AbstractTestCase
         $GLOBALS['mediawiki_headers'] = true;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'SELECT * FROM `test_db`.`test_table`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'SELECT * FROM `test_db`.`test_table`;'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            "\n<!--\n" .
-            "Table data for `test_table`\n" .
-            "-->\n" .
-            "\n" .
-            '{| class="wikitable sortable" style="text-align:' .
-            "center;\"\n" .
-            "|+'''test_table'''\n" .
-            "|-\n" .
-            " ! id\n" .
-            " ! name\n" .
-            " ! datetimefield\n" .
-            "|-\n" .
-            " | 1\n" .
-            " | abcd\n" .
-            " | 2011-01-20 02:00:02\n" .
-            "|-\n" .
-            " | 2\n" .
-            " | foo\n" .
-            " | 2010-01-20 02:00:02\n" .
-            "|-\n" .
-            " | 3\n" .
-            " | Abcd\n" .
-            " | 2012-01-20 02:00:02\n" .
-            "|}\n\n",
-            $result
-        );
+        self::assertSame("\n<!--\n" .
+        "Table data for `test_table`\n" .
+        "-->\n" .
+        "\n" .
+        '{| class="wikitable sortable" style="text-align:' .
+        "center;\"\n" .
+        "|+'''test_table'''\n" .
+        "|-\n" .
+        " ! id\n" .
+        " ! name\n" .
+        " ! datetimefield\n" .
+        "|-\n" .
+        " | 1\n" .
+        " | abcd\n" .
+        " | 2011-01-20 02:00:02\n" .
+        "|-\n" .
+        " | 2\n" .
+        " | foo\n" .
+        " | 2010-01-20 02:00:02\n" .
+        "|-\n" .
+        " | 3\n" .
+        " | Abcd\n" .
+        " | 2012-01-20 02:00:02\n" .
+        "|}\n\n", $result);
     }
 }
diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php
index 818f1fb093..fef9bf2411 100644
--- a/test/classes/Plugins/Export/ExportOdsTest.php
+++ b/test/classes/Plugins/Export/ExportOdsTest.php
@@ -73,98 +73,61 @@ class ExportOdsTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'OpenDocument Spreadsheet',
-            $properties->getText()
-        );
+        self::assertSame('OpenDocument Spreadsheet', $properties->getText());
 
-        $this->assertEquals(
-            'ods',
-            $properties->getExtension()
-        );
+        self::assertSame('ods', $properties->getExtension());
 
-        $this->assertEquals(
-            'application/vnd.oasis.opendocument.spreadsheet',
-            $properties->getMimeType()
-        );
+        self::assertSame('application/vnd.oasis.opendocument.spreadsheet', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
+        self::assertTrue($properties->getForceFile());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
 
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
+        self::assertSame('Replace NULL with:', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
+        self::assertSame('Put columns names in the first row', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
     }
 
     public function testExportHeader(): void
     {
-        $this->assertArrayHasKey('ods_buffer', $GLOBALS);
+        self::assertArrayHasKey('ods_buffer', $GLOBALS);
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
     }
 
     /**
@@ -177,38 +140,30 @@ class ExportOdsTest extends AbstractTestCase
         $this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c/');
         $this->setOutputCallback('bin2hex');
 
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
 
-        $this->assertStringContainsString('header', $GLOBALS['ods_buffer']);
+        self::assertStringContainsString('header', $GLOBALS['ods_buffer']);
 
-        $this->assertStringContainsString('</office:spreadsheet>', $GLOBALS['ods_buffer']);
+        self::assertStringContainsString('</office:spreadsheet>', $GLOBALS['ods_buffer']);
 
-        $this->assertStringContainsString('</office:body>', $GLOBALS['ods_buffer']);
+        self::assertStringContainsString('</office:body>', $GLOBALS['ods_buffer']);
 
-        $this->assertStringContainsString('</office:document-content>', $GLOBALS['ods_buffer']);
+        self::assertStringContainsString('</office:document-content>', $GLOBALS['ods_buffer']);
     }
 
     public function testExportDBHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -274,35 +229,30 @@ class ExportOdsTest extends AbstractTestCase
         $GLOBALS['what'] = 'foo';
         $GLOBALS['foo_null'] = '&';
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'table',
-                "\n",
-                'example.com',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'table',
+            "\n",
+            'example.com',
+            'SELECT'
+        ));
 
-        $this->assertEquals(
-            '<table:table table:name="table"><table:table-row><table:table-cell ' .
-            'office:value-type="string"><text:p>&amp;</text:p></table:table-cell>' .
-            '<table:table-cell office:value-type="string"><text:p></text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="date" office:' .
-            'date-value="2000-01-01" table:style-name="DateCell"><text:p>01-01' .
-            '-2000</text:p></table:table-cell><table:table-cell office:value-type=' .
-            '"time" office:time-value="PT10H00M00S" table:style-name="TimeCell">' .
-            '<text:p>01-01-2000 10:00:00</text:p></table:table-cell><table:table-' .
-            'cell office:value-type="date" office:date-value="2014-01-01T10:02:00"' .
-            ' table:style-name="DateTimeCell"><text:p>01-01-2014 10:02:00' .
-            '</text:p></table:table-cell><table:table-cell office:value-type=' .
-            '"float" office:value="t>s" ><text:p>t&gt;s</text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="float" ' .
-            'office:value="a&b" ><text:p>a&amp;b</text:p></table:table-cell>' .
-            '<table:table-cell office:value-type="string"><text:p>&lt;</text:p>' .
-            '</table:table-cell></table:table-row></table:table>',
-            $GLOBALS['ods_buffer']
-        );
+        self::assertSame('<table:table table:name="table"><table:table-row><table:table-cell ' .
+        'office:value-type="string"><text:p>&amp;</text:p></table:table-cell>' .
+        '<table:table-cell office:value-type="string"><text:p></text:p>' .
+        '</table:table-cell><table:table-cell office:value-type="date" office:' .
+        'date-value="2000-01-01" table:style-name="DateCell"><text:p>01-01' .
+        '-2000</text:p></table:table-cell><table:table-cell office:value-type=' .
+        '"time" office:time-value="PT10H00M00S" table:style-name="TimeCell">' .
+        '<text:p>01-01-2000 10:00:00</text:p></table:table-cell><table:table-' .
+        'cell office:value-type="date" office:date-value="2014-01-01T10:02:00"' .
+        ' table:style-name="DateTimeCell"><text:p>01-01-2014 10:02:00' .
+        '</text:p></table:table-cell><table:table-cell office:value-type=' .
+        '"float" office:value="t>s" ><text:p>t&gt;s</text:p>' .
+        '</table:table-cell><table:table-cell office:value-type="float" ' .
+        'office:value="a&b" ><text:p>a&amp;b</text:p></table:table-cell>' .
+        '<table:table-cell office:value-type="string"><text:p>&lt;</text:p>' .
+        '</table:table-cell></table:table-row></table:table>', $GLOBALS['ods_buffer']);
     }
 
     public function testExportDataWithFieldNames(): void
@@ -348,24 +298,19 @@ class ExportOdsTest extends AbstractTestCase
         $GLOBALS['foo_null'] = '&';
         $GLOBALS['foo_columns'] = true;
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'table',
-                "\n",
-                'example.com',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'table',
+            "\n",
+            'example.com',
+            'SELECT'
+        ));
 
-        $this->assertEquals(
-            '<table:table table:name="table"><table:table-row><table:table-cell ' .
-            'office:value-type="string"><text:p>fna&quot;me</text:p></table:table' .
-            '-cell><table:table-cell office:value-type="string"><text:p>' .
-            'fnam/&lt;e2</text:p></table:table-cell></table:table-row>' .
-            '</table:table>',
-            $GLOBALS['ods_buffer']
-        );
+        self::assertSame('<table:table table:name="table"><table:table-row><table:table-cell ' .
+        'office:value-type="string"><text:p>fna&quot;me</text:p></table:table' .
+        '-cell><table:table-cell office:value-type="string"><text:p>' .
+        'fnam/&lt;e2</text:p></table:table-cell></table:table-row>' .
+        '</table:table>', $GLOBALS['ods_buffer']);
 
         // with no row count
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
@@ -401,17 +346,15 @@ class ExportOdsTest extends AbstractTestCase
         $GLOBALS['foo_null'] = '&';
         $GLOBALS['ods_buffer'] = '';
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'table',
-                "\n",
-                'example.com',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'table',
+            "\n",
+            'example.com',
+            'SELECT'
+        ));
 
-        $this->assertEquals(
+        self::assertSame(
             '<table:table table:name="table"><table:table-row></table:table-row></table:table>',
             $GLOBALS['ods_buffer']
         );
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
index a66bb920d1..7bfc47cb91 100644
--- a/test/classes/Plugins/Export/ExportOdtTest.php
+++ b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -85,189 +85,112 @@ class ExportOdtTest extends AbstractTestCase
         $method->setAccessible(true);
         $properties = $method->invoke($this->object, null);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'OpenDocument Text',
-            $properties->getText()
-        );
+        self::assertSame('OpenDocument Text', $properties->getText());
 
-        $this->assertEquals(
-            'odt',
-            $properties->getExtension()
-        );
+        self::assertSame('odt', $properties->getExtension());
 
-        $this->assertEquals(
-            'application/vnd.oasis.opendocument.text',
-            $properties->getMimeType()
-        );
+        self::assertSame('application/vnd.oasis.opendocument.text', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
+        self::assertTrue($properties->getForceFile());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
+        self::assertSame('Dump table', $generalOptions->getText());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(RadioPropertyItem::class, $property);
+        self::assertInstanceOf(RadioPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
 
-        $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
-            $property->getValues()
-        );
+        self::assertSame([
+            'structure' => __('structure'),
+            'data' => __('data'),
+            'structure_and_data' => __('structure and data'),
+        ], $property->getValues());
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getName()
-        );
+        self::assertSame('structure', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Object creation options',
-            $generalOptions->getText()
-        );
+        self::assertSame('Object creation options', $generalOptions->getText());
 
-        $this->assertEquals(
-            'data',
-            $generalOptions->getForce()
-        );
+        self::assertSame('data', $generalOptions->getForce());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'relation',
-            $property->getName()
-        );
+        self::assertSame('relation', $property->getName());
 
-        $this->assertEquals(
-            'Display foreign key relationships',
-            $property->getText()
-        );
+        self::assertSame('Display foreign key relationships', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'comments',
-            $property->getName()
-        );
+        self::assertSame('comments', $property->getName());
 
-        $this->assertEquals(
-            'Display comments',
-            $property->getText()
-        );
+        self::assertSame('Display comments', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'mime',
-            $property->getName()
-        );
+        self::assertSame('mime', $property->getName());
 
-        $this->assertEquals(
-            'Display media types',
-            $property->getText()
-        );
+        self::assertSame('Display media types', $property->getText());
 
         // hide structure
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
+        self::assertSame('data', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Data dump options',
-            $generalOptions->getText()
-        );
+        self::assertSame('Data dump options', $generalOptions->getText());
 
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getForce()
-        );
+        self::assertSame('structure', $generalOptions->getForce());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
+        self::assertSame('Put columns names in the first row', $property->getText());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
 
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
+        self::assertSame('Replace NULL with:', $property->getText());
 
         // case 2
         $GLOBALS['plugin_param']['export_type'] = 'table';
@@ -277,17 +200,15 @@ class ExportOdtTest extends AbstractTestCase
 
         $generalOptionsArray = $options->getProperties();
 
-        $this->assertCount(3, $generalOptionsArray);
+        self::assertCount(3, $generalOptionsArray);
     }
 
     public function testExportHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
 
-        $this->assertStringContainsString('<office:document-content', $GLOBALS['odt_buffer']);
-        $this->assertStringContainsString('office:version', $GLOBALS['odt_buffer']);
+        self::assertStringContainsString('<office:document-content', $GLOBALS['odt_buffer']);
+        self::assertStringContainsString('office:version', $GLOBALS['odt_buffer']);
     }
 
     /**
@@ -300,13 +221,11 @@ class ExportOdtTest extends AbstractTestCase
         $this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c/');
         $this->setOutputCallback('bin2hex');
 
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
 
-        $this->assertStringContainsString('header', $GLOBALS['odt_buffer']);
+        self::assertStringContainsString('header', $GLOBALS['odt_buffer']);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '</office:text></office:body></office:document-content>',
             $GLOBALS['odt_buffer']
         );
@@ -316,27 +235,21 @@ class ExportOdtTest extends AbstractTestCase
     {
         $GLOBALS['odt_buffer'] = 'header';
 
-        $this->assertTrue(
-            $this->object->exportDBHeader('d&b')
-        );
+        self::assertTrue($this->object->exportDBHeader('d&b'));
 
-        $this->assertStringContainsString('header', $GLOBALS['odt_buffer']);
+        self::assertStringContainsString('header', $GLOBALS['odt_buffer']);
 
-        $this->assertStringContainsString('Database d&amp;b</text:h>', $GLOBALS['odt_buffer']);
+        self::assertStringContainsString('Database d&amp;b</text:h>', $GLOBALS['odt_buffer']);
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -390,30 +303,25 @@ class ExportOdtTest extends AbstractTestCase
         $GLOBALS['foo_null'] = '&';
         unset($GLOBALS['foo_columns']);
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'ta<ble',
-                "\n",
-                'example.com',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'ta<ble',
+            "\n",
+            'example.com',
+            'SELECT'
+        ));
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Dumping data for table ta&lt;ble</text:h>' .
-            '<table:table table:name="ta&lt;ble_structure"><table:table-column ' .
-            'table:number-columns-repeated="4"/><table:table-row>' .
-            '<table:table-cell office:value-type="string"><text:p>&amp;</text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="string">' .
-            '<text:p></text:p></table:table-cell><table:table-cell ' .
-            'office:value-type="float" office:value="a>b" ><text:p>a&gt;b</text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="string">' .
-            '<text:p>a&amp;b</text:p></table:table-cell></table:table-row>' .
-            '</table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" ' .
+        'text:is-list-header="true">Dumping data for table ta&lt;ble</text:h>' .
+        '<table:table table:name="ta&lt;ble_structure"><table:table-column ' .
+        'table:number-columns-repeated="4"/><table:table-row>' .
+        '<table:table-cell office:value-type="string"><text:p>&amp;</text:p>' .
+        '</table:table-cell><table:table-cell office:value-type="string">' .
+        '<text:p></text:p></table:table-cell><table:table-cell ' .
+        'office:value-type="float" office:value="a>b" ><text:p>a&gt;b</text:p>' .
+        '</table:table-cell><table:table-cell office:value-type="string">' .
+        '<text:p>a&amp;b</text:p></table:table-cell></table:table-row>' .
+        '</table:table>', $GLOBALS['odt_buffer']);
     }
 
     public function testExportDataWithFieldNames(): void
@@ -457,26 +365,21 @@ class ExportOdtTest extends AbstractTestCase
         $GLOBALS['foo_null'] = '&';
         $GLOBALS['foo_columns'] = true;
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'table',
-                "\n",
-                'example.com',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'table',
+            "\n",
+            'example.com',
+            'SELECT'
+        ));
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:' .
-            'is-list-header="true">Dumping data for table table</text:h><table:' .
-            'table table:name="table_structure"><table:table-column table:number-' .
-            'columns-repeated="2"/><table:table-row><table:table-cell office:' .
-            'value-type="string"><text:p>fna&quot;me</text:p></table:table-cell>' .
-            '<table:table-cell office:value-type="string"><text:p>fnam/&lt;e2' .
-            '</text:p></table:table-cell></table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" text:' .
+        'is-list-header="true">Dumping data for table table</text:h><table:' .
+        'table table:name="table_structure"><table:table-column table:number-' .
+        'columns-repeated="2"/><table:table-row><table:table-cell office:' .
+        'value-type="string"><text:p>fna&quot;me</text:p></table:table-cell>' .
+        '<table:table-cell office:value-type="string"><text:p>fnam/&lt;e2' .
+        '</text:p></table:table-cell></table:table-row></table:table>', $GLOBALS['odt_buffer']);
 
         // with no row count
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
@@ -512,60 +415,49 @@ class ExportOdtTest extends AbstractTestCase
         $GLOBALS['foo_null'] = '&';
         $GLOBALS['odt_buffer'] = '';
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'table',
-                "\n",
-                'example.com',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'table',
+            "\n",
+            'example.com',
+            'SELECT'
+        ));
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Dumping data for table table</text:h>' .
-            '<table:table table:name="table_structure"><table:table-column ' .
-            'table:number-columns-repeated="0"/><table:table-row>' .
-            '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" ' .
+        'text:is-list-header="true">Dumping data for table table</text:h>' .
+        '<table:table table:name="table_structure"><table:table-column ' .
+        'table:number-columns-repeated="0"/><table:table-row>' .
+        '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
     }
 
     public function testGetTableDefStandIn(): void
     {
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertSame(
-            $this->object->getTableDefStandIn('test_db', 'test_table', "\n"),
-            ''
-        );
+        self::assertSame($this->object->getTableDefStandIn('test_db', 'test_table', "\n"), '');
         $this->assertAllSelectsConsumed();
 
-        $this->assertEquals(
-            '<table:table table:name="test_table_data">'
-            . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>Column</text:p>'
-            . '</table:table-cell><table:table-cell office:value-type="string"><text:p>Type</text:p>'
-            . '</table:table-cell><table:table-cell office:value-type="string"><text:p>Null</text:p>'
-            . '</table:table-cell><table:table-cell office:value-type="string"><text:p>Default</text:p>'
-            . '</table:table-cell></table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<table:table table:name="test_table_data">'
+        . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>Column</text:p>'
+        . '</table:table-cell><table:table-cell office:value-type="string"><text:p>Type</text:p>'
+        . '</table:table-cell><table:table-cell office:value-type="string"><text:p>Null</text:p>'
+        . '</table:table-cell><table:table-cell office:value-type="string"><text:p>Default</text:p>'
+        . '</table:table-cell></table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
     }
 
     public function testGetTableDef(): void
@@ -631,40 +523,35 @@ class ExportOdtTest extends AbstractTestCase
             'column_info' => 'col',
         ])->toArray();
 
-        $this->assertTrue(
-            $this->object->getTableDef(
-                'database',
-                '',
-                "\n",
-                'example.com',
-                true,
-                true,
-                true
-            )
-        );
+        self::assertTrue($this->object->getTableDef(
+            'database',
+            '',
+            "\n",
+            'example.com',
+            true,
+            true,
+            true
+        ));
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table:table table:name="_structure"><table:table-column table:number-columns-repeated="6"/>',
             $GLOBALS['odt_buffer']
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table:table-cell office:value-type="string"><text:p>Comments</text:p></table:table-cell>',
             $GLOBALS['odt_buffer']
         );
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<table:table-cell office:value-type="string"><text:p>Media type</text:p></table:table-cell>',
             $GLOBALS['odt_buffer']
         );
 
-        $this->assertStringContainsString(
-            '</table:table-row>1<table:table-cell office:value-type="string">' .
-            '<text:p></text:p></table:table-cell><table:table-cell office:value-' .
-            'type="string"><text:p>Test&lt;</text:p></table:table-cell>' .
-            '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertStringContainsString('</table:table-row>1<table:table-cell office:value-type="string">' .
+        '<text:p></text:p></table:table-cell><table:table-cell office:value-' .
+        'type="string"><text:p>Test&lt;</text:p></table:table-cell>' .
+        '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
 
         // case 2
 
@@ -724,19 +611,17 @@ class ExportOdtTest extends AbstractTestCase
             'column_info' => 'col',
         ])->toArray();
 
-        $this->assertTrue(
-            $this->object->getTableDef(
-                'database',
-                '',
-                "\n",
-                'example.com',
-                true,
-                true,
-                true
-            )
-        );
+        self::assertTrue($this->object->getTableDef(
+            'database',
+            '',
+            "\n",
+            'example.com',
+            true,
+            true,
+            true
+        ));
 
-        $this->assertStringContainsString('<text:p>ftable (ffield)</text:p>', $GLOBALS['odt_buffer']);
+        self::assertStringContainsString('<text:p>ftable (ffield)</text:p>', $GLOBALS['odt_buffer']);
     }
 
     public function testGetTriggers(): void
@@ -765,177 +650,157 @@ class ExportOdtTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'database', 'ta<ble');
 
-        $this->assertSame($result, $GLOBALS['odt_buffer']);
+        self::assertSame($result, $GLOBALS['odt_buffer']);
 
-        $this->assertStringContainsString('<table:table table:name="ta&lt;ble_triggers">', $result);
+        self::assertStringContainsString('<table:table table:name="ta&lt;ble_triggers">', $result);
 
-        $this->assertStringContainsString('<text:p>tna&quot;me</text:p>', $result);
+        self::assertStringContainsString('<text:p>tna&quot;me</text:p>', $result);
 
-        $this->assertStringContainsString('<text:p>ac&gt;t</text:p>', $result);
+        self::assertStringContainsString('<text:p>ac&gt;t</text:p>', $result);
 
-        $this->assertStringContainsString('<text:p>manip&amp;</text:p>', $result);
+        self::assertStringContainsString('<text:p>manip&amp;</text:p>', $result);
 
-        $this->assertStringContainsString('<text:p>def</text:p>', $result);
+        self::assertStringContainsString('<text:p>def</text:p>', $result);
     }
 
     public function testExportStructure(): void
     {
         // case 1
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_table',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_table',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
-            . 'Table structure for table test_table</text:h><table:table table:name="test_table_structure">'
-            . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>Column</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Type</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Null</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Default</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
+        . 'Table structure for table test_table</text:h><table:table table:name="test_table_structure">'
+        . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>Column</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Type</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Null</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Default</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
 
         // case 2
         $GLOBALS['odt_buffer'] = '';
 
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'triggers',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'triggers',
+            'test'
+        ));
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
-            . 'Triggers test_table</text:h><table:table table:name="test_table_triggers">'
-            . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>Name</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Time</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Event</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Definition</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>test_trigger</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>AFTER</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>INSERT</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>BEGIN END</text:p></table:table-cell>'
-            . '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
+        . 'Triggers test_table</text:h><table:table table:name="test_table_triggers">'
+        . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>Name</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Time</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Event</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Definition</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>test_trigger</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>AFTER</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>INSERT</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>BEGIN END</text:p></table:table-cell>'
+        . '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
 
         // case 3
         $GLOBALS['odt_buffer'] = '';
 
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_view',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_view',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
-            . 'Structure for view test_table</text:h><table:table table:name="test_table_structure">'
-            . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>Column</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Type</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Null</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Default</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
+        . 'Structure for view test_table</text:h><table:table table:name="test_table_structure">'
+        . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>Column</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Type</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Null</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Default</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
 
         // case 4
         $this->dummyDbi->addSelectDb('test_db');
         $GLOBALS['odt_buffer'] = '';
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'stand_in',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'stand_in',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
 
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
-            . 'Stand-in structure for view test_table</text:h><table:table table:name="test_table_data">'
-            . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>Column</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Type</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Null</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>Default</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row><table:table-row>'
-            . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
-            . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
-            . '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
+        self::assertSame('<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">'
+        . 'Stand-in structure for view test_table</text:h><table:table table:name="test_table_data">'
+        . '<table:table-column table:number-columns-repeated="4"/><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>Column</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Type</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Null</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>Default</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>id</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>int(11)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>name</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>varchar(20)</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row><table:table-row>'
+        . '<table:table-cell office:value-type="string"><text:p>datetimefield</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>datetime</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>No</text:p></table:table-cell>'
+        . '<table:table-cell office:value-type="string"><text:p>NULL</text:p></table:table-cell>'
+        . '</table:table-row></table:table>', $GLOBALS['odt_buffer']);
     }
 
     public function testFormatOneColumnDefinition(): void
@@ -952,15 +817,12 @@ class ExportOdtTest extends AbstractTestCase
 
         $col_alias = 'alias';
 
-        $this->assertEquals(
-            '<table:table-row><table:table-cell office:value-type="string">' .
-            '<text:p>alias</text:p></table:table-cell><table:table-cell off' .
-            'ice:value-type="string"><text:p>set(abc)</text:p></table:table' .
-            '-cell><table:table-cell office:value-type="string"><text:p>Yes' .
-            '</text:p></table:table-cell><table:table-cell office:value-typ' .
-            'e="string"><text:p>NULL</text:p></table:table-cell>',
-            $method->invoke($this->object, $cols, $col_alias)
-        );
+        self::assertSame('<table:table-row><table:table-cell office:value-type="string">' .
+        '<text:p>alias</text:p></table:table-cell><table:table-cell off' .
+        'ice:value-type="string"><text:p>set(abc)</text:p></table:table' .
+        '-cell><table:table-cell office:value-type="string"><text:p>Yes' .
+        '</text:p></table:table-cell><table:table-cell office:value-typ' .
+        'e="string"><text:p>NULL</text:p></table:table-cell>', $method->invoke($this->object, $cols, $col_alias));
 
         $cols = [
             'Null' => 'NO',
@@ -970,14 +832,11 @@ class ExportOdtTest extends AbstractTestCase
             'Default' => 'def',
         ];
 
-        $this->assertEquals(
-            '<table:table-row><table:table-cell office:value-type="string">' .
-            '<text:p>fields</text:p></table:table-cell><table:table-cell off' .
-            'ice:value-type="string"><text:p>&amp;nbsp;</text:p></table:table' .
-            '-cell><table:table-cell office:value-type="string"><text:p>No' .
-            '</text:p></table:table-cell><table:table-cell office:value-type=' .
-            '"string"><text:p>def</text:p></table:table-cell>',
-            $method->invoke($this->object, $cols, '')
-        );
+        self::assertSame('<table:table-row><table:table-cell office:value-type="string">' .
+        '<text:p>fields</text:p></table:table-cell><table:table-cell off' .
+        'ice:value-type="string"><text:p>&amp;nbsp;</text:p></table:table' .
+        '-cell><table:table-cell office:value-type="string"><text:p>No' .
+        '</text:p></table:table-cell><table:table-cell office:value-type=' .
+        '"string"><text:p>def</text:p></table:table-cell>', $method->invoke($this->object, $cols, ''));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php
index e7165c1680..ff0fd77a40 100644
--- a/test/classes/Plugins/Export/ExportPdfTest.php
+++ b/test/classes/Plugins/Export/ExportPdfTest.php
@@ -61,96 +61,61 @@ class ExportPdfTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'PDF',
-            $properties->getText()
-        );
+        self::assertSame('PDF', $properties->getText());
 
-        $this->assertEquals(
-            'pdf',
-            $properties->getExtension()
-        );
+        self::assertSame('pdf', $properties->getExtension());
 
-        $this->assertEquals(
-            'application/pdf',
-            $properties->getMimeType()
-        );
+        self::assertSame('application/pdf', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
+        self::assertTrue($properties->getForceFile());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'report_title',
-            $property->getName()
-        );
+        self::assertSame('report_title', $property->getName());
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
+        self::assertSame('dump_what', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
+        self::assertSame('Dump table', $generalOptions->getText());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(RadioPropertyItem::class, $property);
+        self::assertInstanceOf(RadioPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
+        self::assertSame('structure_or_data', $property->getName());
 
-        $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
-            $property->getValues()
-        );
+        self::assertSame([
+            'structure' => __('structure'),
+            'data' => __('data'),
+            'structure_and_data' => __('structure and data'),
+        ], $property->getValues());
     }
 
     public function testExportHeader(): void
@@ -169,9 +134,7 @@ class ExportPdfTest extends AbstractTestCase
         $attrPdf->setAccessible(true);
         $attrPdf->setValue($this->object, $pdf);
 
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
     }
 
     public function testExportFooter(): void
@@ -187,30 +150,22 @@ class ExportPdfTest extends AbstractTestCase
         $attrPdf->setAccessible(true);
         $attrPdf->setValue($this->object, $pdf);
 
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -227,15 +182,13 @@ class ExportPdfTest extends AbstractTestCase
         $attrPdf->setAccessible(true);
         $attrPdf->setValue($this->object, $pdf);
 
-        $this->assertTrue(
-            $this->object->exportData(
-                'db',
-                'table',
-                "\n",
-                'phpmyadmin.net/err',
-                'SELECT'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'db',
+            'table',
+            "\n",
+            'phpmyadmin.net/err',
+            'SELECT'
+        ));
     }
 
     /**
@@ -251,9 +204,6 @@ class ExportPdfTest extends AbstractTestCase
 
         $getter = new ReflectionMethod(ExportPdf::class, 'getPdf');
         $getter->setAccessible(true);
-        $this->assertInstanceOf(
-            Pdf::class,
-            $getter->invoke($this->object)
-        );
+        self::assertInstanceOf(Pdf::class, $getter->invoke($this->object));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportPhparrayTest.php b/test/classes/Plugins/Export/ExportPhparrayTest.php
index 75e805a521..e6a7876963 100644
--- a/test/classes/Plugins/Export/ExportPhparrayTest.php
+++ b/test/classes/Plugins/Export/ExportPhparrayTest.php
@@ -65,52 +65,34 @@ class ExportPhparrayTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'PHP array',
-            $properties->getText()
-        );
+        self::assertSame('PHP array', $properties->getText());
 
-        $this->assertEquals(
-            'php',
-            $properties->getExtension()
-        );
+        self::assertSame('php', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/plain', $properties->getMimeType());
 
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
+        self::assertSame('Options', $properties->getOptionsText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
         $generalOptions = $generalOptionsArray[0];
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
     }
 
     public function testExportHeader(): void
@@ -118,21 +100,17 @@ class ExportPhparrayTest extends AbstractTestCase
         $GLOBALS['crlf'] = ' ';
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('<?php ', $result);
+        self::assertStringContainsString('<?php ', $result);
     }
 
     public function testExportFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
@@ -140,76 +118,60 @@ class ExportPhparrayTest extends AbstractTestCase
         $GLOBALS['crlf'] = "\n";
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('db')
-        );
+        self::assertTrue($this->object->exportDBHeader('db'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("/**\n * Database `db`\n */", $result);
+        self::assertStringContainsString("/**\n * Database `db`\n */", $result);
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
     {
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                'test_table',
-                "\n",
-                'phpmyadmin.net/err',
-                'SELECT * FROM `test_db`.`test_table`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            'test_table',
+            "\n",
+            'phpmyadmin.net/err',
+            'SELECT * FROM `test_db`.`test_table`;'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            "\n" . '/* `test_db`.`test_table` */' . "\n" .
-            '$test_table = array(' . "\n" .
-            '  array(\'id\' => \'1\',\'name\' => \'abcd\',\'datetimefield\' => \'2011-01-20 02:00:02\'),' . "\n" .
-            '  array(\'id\' => \'2\',\'name\' => \'foo\',\'datetimefield\' => \'2010-01-20 02:00:02\'),' . "\n" .
-            '  array(\'id\' => \'3\',\'name\' => \'Abcd\',\'datetimefield\' => \'2012-01-20 02:00:02\')' . "\n" .
-            ');' . "\n",
-            $result
-        );
+        self::assertSame("\n" . '/* `test_db`.`test_table` */' . "\n" .
+        '$test_table = array(' . "\n" .
+        '  array(\'id\' => \'1\',\'name\' => \'abcd\',\'datetimefield\' => \'2011-01-20 02:00:02\'),' . "\n" .
+        '  array(\'id\' => \'2\',\'name\' => \'foo\',\'datetimefield\' => \'2010-01-20 02:00:02\'),' . "\n" .
+        '  array(\'id\' => \'3\',\'name\' => \'Abcd\',\'datetimefield\' => \'2012-01-20 02:00:02\')' . "\n" .
+        ');' . "\n", $result);
 
         // case 2: test invalid variable name fix
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                '0`932table',
-                "\n",
-                'phpmyadmin.net/err',
-                'SELECT * FROM `test_db`.`test_table`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            '0`932table',
+            "\n",
+            'phpmyadmin.net/err',
+            'SELECT * FROM `test_db`.`test_table`;'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertEquals(
-            "\n" . '/* `test_db`.`0``932table` */' . "\n" .
-            '$_0_932table = array(' . "\n" .
-            '  array(\'id\' => \'1\',\'name\' => \'abcd\',\'datetimefield\' => \'2011-01-20 02:00:02\'),' . "\n" .
-            '  array(\'id\' => \'2\',\'name\' => \'foo\',\'datetimefield\' => \'2010-01-20 02:00:02\'),' . "\n" .
-            '  array(\'id\' => \'3\',\'name\' => \'Abcd\',\'datetimefield\' => \'2012-01-20 02:00:02\')' . "\n" .
-            ');' . "\n",
-            $result
-        );
+        self::assertIsString($result);
+        self::assertSame("\n" . '/* `test_db`.`0``932table` */' . "\n" .
+        '$_0_932table = array(' . "\n" .
+        '  array(\'id\' => \'1\',\'name\' => \'abcd\',\'datetimefield\' => \'2011-01-20 02:00:02\'),' . "\n" .
+        '  array(\'id\' => \'2\',\'name\' => \'foo\',\'datetimefield\' => \'2010-01-20 02:00:02\'),' . "\n" .
+        '  array(\'id\' => \'3\',\'name\' => \'Abcd\',\'datetimefield\' => \'2012-01-20 02:00:02\')' . "\n" .
+        ');' . "\n", $result);
     }
 }
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index 52c3f72a64..eee9d1188e 100644
--- a/test/classes/Plugins/Export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -91,9 +91,9 @@ class ExportSqlTest extends AbstractTestCase
         $method->setAccessible(true);
         $properties = $method->invoke($this->object, null);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
-        $this->assertEquals('SQL', $properties->getText());
-        $this->assertNull($properties->getOptions());
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertSame('SQL', $properties->getText());
+        self::assertNull($properties->getOptions());
     }
 
     /**
@@ -130,149 +130,122 @@ class ExportSqlTest extends AbstractTestCase
         $method->setAccessible(true);
         $properties = $method->invoke($this->object, null);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
-        $this->assertEquals('SQL', $properties->getText());
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertSame('SQL', $properties->getText());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
         $properties = $generalOptions->getProperties();
 
         $property = array_shift($properties);
 
-        $this->assertInstanceOf(OptionsPropertySubgroup::class, $property);
+        self::assertInstanceOf(OptionsPropertySubgroup::class, $property);
 
-        $this->assertInstanceOf(
-            BoolPropertyItem::class,
-            $property->getSubgroupHeader()
-        );
+        self::assertInstanceOf(BoolPropertyItem::class, $property->getSubgroupHeader());
 
         $leaves = $property->getProperties();
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(TextPropertyItem::class, $leaf);
+        self::assertInstanceOf(TextPropertyItem::class, $leaf);
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(SelectPropertyItem::class, $property);
+        self::assertInstanceOf(SelectPropertyItem::class, $property);
 
-        $this->assertEquals(
-            [
-                'v1' => 'v1',
-                'v2' => 'v2',
-            ],
-            $property->getValues()
-        );
+        self::assertSame([
+            'v1' => 'v1',
+            'v2' => 'v2',
+        ], $property->getValues());
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(OptionsPropertySubgroup::class, $property);
+        self::assertInstanceOf(OptionsPropertySubgroup::class, $property);
 
-        $this->assertInstanceOf(
-            RadioPropertyItem::class,
-            $property->getSubgroupHeader()
-        );
+        self::assertInstanceOf(RadioPropertyItem::class, $property->getSubgroupHeader());
 
         $structureOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $structureOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $structureOptions);
 
         $properties = $structureOptions->getProperties();
 
         $property = array_shift($properties);
 
-        $this->assertInstanceOf(OptionsPropertySubgroup::class, $property);
+        self::assertInstanceOf(OptionsPropertySubgroup::class, $property);
 
-        $this->assertInstanceOf(
-            MessageOnlyPropertyItem::class,
-            $property->getSubgroupHeader()
-        );
+        self::assertInstanceOf(MessageOnlyPropertyItem::class, $property->getSubgroupHeader());
 
         $leaves = $property->getProperties();
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
-        $this->assertEquals(
+        self::assertSame(
             'Add <code>DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT</code><code> / TRIGGER</code> statement',
             $leaf->getText()
         );
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(OptionsPropertySubgroup::class, $leaf);
+        self::assertInstanceOf(OptionsPropertySubgroup::class, $leaf);
 
-        $this->assertCount(
-            2,
-            $leaf->getProperties()
-        );
+        self::assertCount(2, $leaf->getProperties());
 
-        $this->assertInstanceOf(
-            BoolPropertyItem::class,
-            $leaf->getSubgroupHeader()
-        );
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf->getSubgroupHeader());
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(OptionsPropertySubgroup::class, $leaf);
+        self::assertInstanceOf(OptionsPropertySubgroup::class, $leaf);
 
-        $this->assertCount(
-            3,
-            $leaf->getProperties()
-        );
+        self::assertCount(3, $leaf->getProperties());
 
-        $this->assertInstanceOf(
-            BoolPropertyItem::class,
-            $leaf->getSubgroupHeader()
-        );
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf->getSubgroupHeader());
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
         $leaf = array_shift($leaves);
-        $this->assertInstanceOf(BoolPropertyItem::class, $leaf);
+        self::assertInstanceOf(BoolPropertyItem::class, $leaf);
 
         $property = array_shift($properties);
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $dataOptions = array_shift($generalOptionsArray);
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $dataOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $dataOptions);
 
         $properties = $dataOptions->getProperties();
 
-        $this->assertCount(7, $properties);
+        self::assertCount(7, $properties);
 
-        $this->assertCount(
-            2,
-            $properties[1]->getProperties()
-        );
+        self::assertCount(2, $properties[1]->getProperties());
     }
 
     public function testExportRoutines(): void
@@ -299,29 +272,17 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['crlf'] = '##';
         $GLOBALS['sql_include_comments'] = true;
 
-        $this->assertEquals(
-            '--##',
-            $method->invoke($this->object, '')
-        );
+        self::assertSame('--##', $method->invoke($this->object, ''));
 
-        $this->assertEquals(
-            '-- Comment##',
-            $method->invoke($this->object, 'Comment')
-        );
+        self::assertSame('-- Comment##', $method->invoke($this->object, 'Comment'));
 
         $GLOBALS['sql_include_comments'] = false;
 
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
+        self::assertSame('', $method->invoke($this->object, 'Comment'));
 
         unset($GLOBALS['sql_include_comments']);
 
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
+        self::assertSame('', $method->invoke($this->object, 'Comment'));
     }
 
     public function testPossibleCRLF(): void
@@ -332,29 +293,17 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['crlf'] = '##';
         $GLOBALS['sql_include_comments'] = true;
 
-        $this->assertEquals(
-            '##',
-            $method->invoke($this->object, '')
-        );
+        self::assertSame('##', $method->invoke($this->object, ''));
 
-        $this->assertEquals(
-            '##',
-            $method->invoke($this->object, 'Comment')
-        );
+        self::assertSame('##', $method->invoke($this->object, 'Comment'));
 
         $GLOBALS['sql_include_comments'] = false;
 
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
+        self::assertSame('', $method->invoke($this->object, 'Comment'));
 
         unset($GLOBALS['sql_include_comments']);
 
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
+        self::assertSame('', $method->invoke($this->object, 'Comment'));
     }
 
     public function testExportFooter(): void
@@ -380,9 +329,7 @@ class ExportSqlTest extends AbstractTestCase
 
         $this->expectOutputString('SET FOREIGN_KEY_CHECKS=1;COMMIT;');
 
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportHeader(): void
@@ -422,28 +369,23 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('h1C', $result);
+        self::assertStringContainsString('h1C', $result);
 
-        $this->assertStringContainsString('h2C', $result);
+        self::assertStringContainsString('h2C', $result);
 
-        $this->assertStringContainsString("SET FOREIGN_KEY_CHECKS=0;\n", $result);
+        self::assertStringContainsString("SET FOREIGN_KEY_CHECKS=0;\n", $result);
 
-        $this->assertStringContainsString('40101 SET', $result);
+        self::assertStringContainsString('40101 SET', $result);
 
-        $this->assertStringContainsString(
-            "SET FOREIGN_KEY_CHECKS=0;\n" .
-            "SET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\n" .
-            "START TRANSACTION;\n" .
-            "SET time_zone = \"+00:00\";\n",
-            $result
-        );
+        self::assertStringContainsString("SET FOREIGN_KEY_CHECKS=0;\n" .
+        "SET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\n" .
+        "START TRANSACTION;\n" .
+        "SET time_zone = \"+00:00\";\n", $result);
     }
 
     public function testExportDBCreate(): void
@@ -470,21 +412,19 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBCreate('db', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('db', 'database'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("DROP DATABASE IF EXISTS `db`;\n", $result);
+        self::assertStringContainsString("DROP DATABASE IF EXISTS `db`;\n", $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'CREATE DATABASE IF NOT EXISTS `db` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;',
             $result
         );
 
-        $this->assertStringContainsString('USE `db`;', $result);
+        self::assertStringContainsString('USE `db`;', $result);
 
         // case2: no backquotes
         unset($GLOBALS['sql_compatibility']);
@@ -505,21 +445,19 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBCreate('db', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('db', 'database'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("DROP DATABASE IF EXISTS db;\n", $result);
+        self::assertStringContainsString("DROP DATABASE IF EXISTS db;\n", $result);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'CREATE DATABASE IF NOT EXISTS db DEFAULT CHARACTER SET testcollation;',
             $result
         );
 
-        $this->assertStringContainsString('USE db;', $result);
+        self::assertStringContainsString('USE db;', $result);
     }
 
     public function testExportDBHeader(): void
@@ -530,28 +468,24 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['crlf'] = "\n";
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('&quot;testDB&quot;', $result);
+        self::assertStringContainsString('&quot;testDB&quot;', $result);
 
         // case 2
         unset($GLOBALS['sql_compatibility']);
         unset($GLOBALS['sql_backquotes']);
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDB'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('testDB', $result);
+        self::assertStringContainsString('testDB', $result);
     }
 
     public function testExportEvents(): void
@@ -597,20 +531,18 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportEvents('db')
-        );
+        self::assertTrue($this->object->exportEvents('db'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("DELIMITER $$\n", $result);
+        self::assertStringContainsString("DELIMITER $$\n", $result);
 
-        $this->assertStringContainsString("DELIMITER ;\n", $result);
+        self::assertStringContainsString("DELIMITER ;\n", $result);
 
-        $this->assertStringContainsString("f1event$$\n", $result);
+        self::assertStringContainsString("f1event$$\n", $result);
 
-        $this->assertStringContainsString("f2event$$\n", $result);
+        self::assertStringContainsString("f2event$$\n", $result);
     }
 
     public function testExportDBFooter(): void
@@ -629,12 +561,10 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBFooter('db')
-        );
+        self::assertTrue($this->object->exportDBFooter('db'));
         $result = ob_get_clean();
 
-        $this->assertEquals('SqlConstraints', $result);
+        self::assertSame('SqlConstraints', $result);
     }
 
     public function testGetTableDefStandIn(): void
@@ -661,9 +591,9 @@ class ExportSqlTest extends AbstractTestCase
 
         $result = $this->object->getTableDefStandIn('db', 'view', '');
 
-        $this->assertStringContainsString('DROP VIEW IF EXISTS `view`;', $result);
+        self::assertStringContainsString('DROP VIEW IF EXISTS `view`;', $result);
 
-        $this->assertStringContainsString('CREATE TABLE IF NOT EXISTS `view` (`cname` int);', $result);
+        self::assertStringContainsString('CREATE TABLE IF NOT EXISTS `view` (`cname` int);', $result);
     }
 
     public function testGetTableDefForView(): void
@@ -702,12 +632,9 @@ class ExportSqlTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'db', 'view', "\n");
 
-        $this->assertEquals(
-            "CREATE TABLE `view`(\n" .
-            "    `fname` char COLLATE utf-8 NOT NULL DEFAULT 'a' COMMENT 'cmt'\n" .
-            ");\n",
-            $result
-        );
+        self::assertSame("CREATE TABLE `view`(\n" .
+        "    `fname` char COLLATE utf-8 NOT NULL DEFAULT 'a' COMMENT 'cmt'\n" .
+        ");\n", $result);
 
         // case 2
         unset($GLOBALS['sql_compatibility']);
@@ -738,12 +665,9 @@ class ExportSqlTest extends AbstractTestCase
 
         $result = $method->invoke($this->object, 'db', 'view', "\n", false);
 
-        $this->assertEquals(
-            "CREATE TABLE IF NOT EXISTS `view`(\n" .
-            "    `fname` char COLLATE utf-8 DEFAULT NULL COMMENT 'cmt'\n" .
-            ")\n",
-            $result
-        );
+        self::assertSame("CREATE TABLE IF NOT EXISTS `view`(\n" .
+        "    `fname` char COLLATE utf-8 DEFAULT NULL COMMENT 'cmt'\n" .
+        ")\n", $result);
     }
 
     /**
@@ -846,31 +770,31 @@ class ExportSqlTest extends AbstractTestCase
 
         $result = $this->object->getTableDef('db', 'table', "\n", 'example.com/err', true, true, false);
 
-        $this->assertStringContainsString('-- Creation: Jan 01, 2000 at 10:00 AM', $result);
+        self::assertStringContainsString('-- Creation: Jan 01, 2000 at 10:00 AM', $result);
 
-        $this->assertStringContainsString('-- Last update: Jan 02, 2000 at 12:00 PM', $result);
+        self::assertStringContainsString('-- Last update: Jan 02, 2000 at 12:00 PM', $result);
 
-        $this->assertStringContainsString('-- Last check: Jan 02, 2000 at 01:00 PM', $result);
+        self::assertStringContainsString('-- Last check: Jan 02, 2000 at 01:00 PM', $result);
 
-        $this->assertStringContainsString('DROP TABLE IF EXISTS `table`;', $result);
+        self::assertStringContainsString('DROP TABLE IF EXISTS `table`;', $result);
 
-        $this->assertStringContainsString('CREATE TABLE `table`', $result);
+        self::assertStringContainsString('CREATE TABLE `table`', $result);
 
-        $this->assertStringContainsString('-- Constraints for dumped tables', $GLOBALS['sql_constraints']);
+        self::assertStringContainsString('-- Constraints for dumped tables', $GLOBALS['sql_constraints']);
 
-        $this->assertStringContainsString('-- Constraints for table "table"', $GLOBALS['sql_constraints']);
+        self::assertStringContainsString('-- Constraints for table "table"', $GLOBALS['sql_constraints']);
 
-        $this->assertStringContainsString('ALTER TABLE "table"', $GLOBALS['sql_constraints']);
+        self::assertStringContainsString('ALTER TABLE "table"', $GLOBALS['sql_constraints']);
 
-        $this->assertStringContainsString('ADD CONSTRAINT', $GLOBALS['sql_constraints']);
+        self::assertStringContainsString('ADD CONSTRAINT', $GLOBALS['sql_constraints']);
 
-        $this->assertStringContainsString('ALTER TABLE "table"', $GLOBALS['sql_constraints_query']);
+        self::assertStringContainsString('ALTER TABLE "table"', $GLOBALS['sql_constraints_query']);
 
-        $this->assertStringContainsString('ADD CONSTRAINT', $GLOBALS['sql_constraints_query']);
+        self::assertStringContainsString('ADD CONSTRAINT', $GLOBALS['sql_constraints_query']);
 
-        $this->assertStringContainsString('ALTER TABLE "table"', $GLOBALS['sql_drop_foreign_keys']);
+        self::assertStringContainsString('ALTER TABLE "table"', $GLOBALS['sql_drop_foreign_keys']);
 
-        $this->assertStringContainsString('DROP FOREIGN KEY', $GLOBALS['sql_drop_foreign_keys']);
+        self::assertStringContainsString('DROP FOREIGN KEY', $GLOBALS['sql_drop_foreign_keys']);
     }
 
     /**
@@ -951,7 +875,7 @@ class ExportSqlTest extends AbstractTestCase
 
         $result = $this->object->getTableDef('db', 'table', "\n", 'example.com/err', true, true, false);
 
-        $this->assertStringContainsString('-- Error reading structure for table db.table: error occurred', $result);
+        self::assertStringContainsString('-- Error reading structure for table db.table: error occurred', $result);
     }
 
     public function testGetTableComments(): void
@@ -1000,19 +924,13 @@ class ExportSqlTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, 'db', '', true, true);
 
-        $this->assertStringContainsString(
-            "-- MEDIA TYPES FOR TABLE :\n" .
-            "--   fieldname\n" .
-            '--       Test<',
-            $result
-        );
+        self::assertStringContainsString("-- MEDIA TYPES FOR TABLE :\n" .
+        "--   fieldname\n" .
+        '--       Test<', $result);
 
-        $this->assertStringContainsString(
-            "-- RELATIONSHIPS FOR TABLE :\n" .
-            "--   foo\n" .
-            '--       ftable -> ffield',
-            $result
-        );
+        self::assertStringContainsString("-- RELATIONSHIPS FOR TABLE :\n" .
+        "--   foo\n" .
+        '--       ftable -> ffield', $result);
     }
 
     /**
@@ -1027,21 +945,19 @@ class ExportSqlTest extends AbstractTestCase
 
         // case 1
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_table',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_table',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertStringContainsString('-- Table structure for table &quot;test_table&quot;', $result);
-        $this->assertStringContainsString('CREATE TABLE `test_table`', $result);
+        self::assertIsString($result);
+        self::assertStringContainsString('-- Table structure for table &quot;test_table&quot;', $result);
+        self::assertStringContainsString('CREATE TABLE `test_table`', $result);
 
         // case 2
         unset($GLOBALS['sql_compatibility']);
@@ -1051,21 +967,19 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['sql_drop_table'] = true;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'triggers',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'triggers',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertStringContainsString('-- Triggers test_table', $result);
-        $this->assertStringContainsString(
+        self::assertIsString($result);
+        self::assertStringContainsString('-- Triggers test_table', $result);
+        self::assertStringContainsString(
             "CREATE TRIGGER `test_trigger` AFTER INSERT ON `test_table` FOR EACH ROW BEGIN END\n$$",
             $result
         );
@@ -1077,66 +991,60 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['sql_views_as_tables'] = false;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_view',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_view',
+            'test'
+        ));
         $result = ob_get_clean();
         $sqlViewsProp = new ReflectionProperty(ExportSql::class, 'sqlViews');
         $sqlViewsProp->setAccessible(true);
         $sqlViews = $sqlViewsProp->getValue($this->object);
 
-        $this->assertEquals('', $result);
-        $this->assertIsString($sqlViews);
-        $this->assertStringContainsString('-- Structure for view test_table', $sqlViews);
-        $this->assertStringContainsString('DROP TABLE IF EXISTS `test_table`;', $sqlViews);
-        $this->assertStringContainsString('CREATE TABLE `test_table`', $sqlViews);
+        self::assertSame('', $result);
+        self::assertIsString($sqlViews);
+        self::assertStringContainsString('-- Structure for view test_table', $sqlViews);
+        self::assertStringContainsString('DROP TABLE IF EXISTS `test_table`;', $sqlViews);
+        self::assertStringContainsString('CREATE TABLE `test_table`', $sqlViews);
 
         // case 4
         $GLOBALS['sql_views_as_tables'] = true;
         unset($GLOBALS['sql_if_not_exists']);
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_view',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_view',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertStringContainsString('-- Structure for view test_table exported as a table', $result);
-        $this->assertStringContainsString('DROP TABLE IF EXISTS `test_table`;', $result);
-        $this->assertStringContainsString('CREATE TABLE`test_table`', $result);
+        self::assertIsString($result);
+        self::assertStringContainsString('-- Structure for view test_table exported as a table', $result);
+        self::assertStringContainsString('DROP TABLE IF EXISTS `test_table`;', $result);
+        self::assertStringContainsString('CREATE TABLE`test_table`', $result);
 
         // case 5
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'stand_in',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'stand_in',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertStringContainsString('-- Stand-in structure for view test_table', $result);
-        $this->assertStringContainsString('CREATE TABLE `test_table`', $result);
+        self::assertIsString($result);
+        self::assertStringContainsString('-- Stand-in structure for view test_table', $result);
+        self::assertStringContainsString('CREATE TABLE `test_table`', $result);
     }
 
     /**
@@ -1239,22 +1147,19 @@ class ExportSqlTest extends AbstractTestCase
         $this->object->exportData('db', 'table', "\n", 'example.com/err', 'SELECT a FROM b WHERE 1');
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('TRUNCATE TABLE &quot;table&quot;;', $result);
+        self::assertStringContainsString('TRUNCATE TABLE &quot;table&quot;;', $result);
 
-        $this->assertStringContainsString('SET IDENTITY_INSERT &quot;table&quot; ON ;', $result);
+        self::assertStringContainsString('SET IDENTITY_INSERT &quot;table&quot; ON ;', $result);
 
-        $this->assertStringContainsString(
-            'INSERT DELAYED IGNORE INTO &quot;table&quot; (&quot;name&quot;, ' .
-            '&quot;name&quot;, &quot;name&quot;, &quot;name&quot;, ' .
-            '&quot;name&quot;) VALUES',
-            $result
-        );
+        self::assertStringContainsString('INSERT DELAYED IGNORE INTO &quot;table&quot; (&quot;name&quot;, ' .
+        '&quot;name&quot;, &quot;name&quot;, &quot;name&quot;, ' .
+        '&quot;name&quot;) VALUES', $result);
 
-        $this->assertStringContainsString('(NULL, \'test\', 0x3130, 0x36, 0x000a0d1a);', $result);
+        self::assertStringContainsString('(NULL, \'test\', 0x3130, 0x36, 0x000a0d1a);', $result);
 
-        $this->assertStringContainsString('SET IDENTITY_INSERT &quot;table&quot; OFF;', $result);
+        self::assertStringContainsString('SET IDENTITY_INSERT &quot;table&quot; OFF;', $result);
     }
 
     /**
@@ -1341,13 +1246,10 @@ class ExportSqlTest extends AbstractTestCase
         $this->object->exportData('db', 'table', "\n", 'example.com/err', 'SELECT a FROM b WHERE 1');
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString(
-            'UPDATE IGNORE &quot;table&quot; SET &quot;name&quot; = NULL,' .
-            '&quot;name&quot; = NULL WHERE CONCAT(`tbl`.`pma`) IS NULL;',
-            $result
-        );
+        self::assertStringContainsString('UPDATE IGNORE &quot;table&quot; SET &quot;name&quot; = NULL,' .
+        '&quot;name&quot; = NULL WHERE CONCAT(`tbl`.`pma`) IS NULL;', $result);
     }
 
     public function testExportDataWithIsView(): void
@@ -1382,16 +1284,14 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['sql_backquotes'] = true;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData('db', 'tbl', "\n", 'err.com', 'SELECT')
-        );
+        self::assertTrue($this->object->exportData('db', 'tbl', "\n", 'err.com', 'SELECT'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("-- VIEW `tbl`\n", $result);
+        self::assertStringContainsString("-- VIEW `tbl`\n", $result);
 
-        $this->assertStringContainsString("-- Data: None\n", $result);
+        self::assertStringContainsString("-- Data: None\n", $result);
 
         // reset
         $GLOBALS['sql_compatibility'] = $oldVal;
@@ -1430,14 +1330,12 @@ class ExportSqlTest extends AbstractTestCase
         $GLOBALS['crlf'] = "\n";
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData('db', 'table', "\n", 'err.com', 'SELECT')
-        );
+        self::assertTrue($this->object->exportData('db', 'table', "\n", 'err.com', 'SELECT'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('-- Error reading data for table db.table: err', $result);
+        self::assertStringContainsString('-- Error reading data for table db.table: err', $result);
     }
 
     public function testMakeCreateTableMSSQLCompatible(): void
@@ -1463,28 +1361,25 @@ class ExportSqlTest extends AbstractTestCase
         $method->setAccessible(true);
         $result = $method->invoke($this->object, $query);
 
-        $this->assertEquals(
-            "CREATE TABLE (\" datetime DEFAULT NULL,\n" .
-            "\" datetime DEFAULT NULL\n" .
-            "\" datetime NOT NULL,\n" .
-            "\" datetime NOT NULL\n" .
-            ", \" datetime NOT NULL DEFAULT 'asd', ) NOT NULL\n" .
-            ", ) NOT NULL,\n" .
-            " ) DEFAULT NULL\n" .
-            ", ) DEFAULT NULL,\n" .
-            " ) NOT NULL DEFAULT 'dsa',\n" .
-            " \" int DEFAULT NULL,\n" .
-            " \" tinyint DEFAULT NULL\n" .
-            " \" smallint NOT NULL,\n" .
-            " \" bigint NOT NULL\n" .
-            " \" bigint NOT NULL DEFAULT '12'\n" .
-            " \" float DEFAULT NULL,\n" .
-            " \" float DEFAULT NULL\n" .
-            " \" float NOT NULL,\n" .
-            " \" float NOT NULL\n" .
-            " \" float NOT NULL DEFAULT '213'\n",
-            $result
-        );
+        self::assertSame("CREATE TABLE (\" datetime DEFAULT NULL,\n" .
+        "\" datetime DEFAULT NULL\n" .
+        "\" datetime NOT NULL,\n" .
+        "\" datetime NOT NULL\n" .
+        ", \" datetime NOT NULL DEFAULT 'asd', ) NOT NULL\n" .
+        ", ) NOT NULL,\n" .
+        " ) DEFAULT NULL\n" .
+        ", ) DEFAULT NULL,\n" .
+        " ) NOT NULL DEFAULT 'dsa',\n" .
+        " \" int DEFAULT NULL,\n" .
+        " \" tinyint DEFAULT NULL\n" .
+        " \" smallint NOT NULL,\n" .
+        " \" bigint NOT NULL\n" .
+        " \" bigint NOT NULL DEFAULT '12'\n" .
+        " \" float DEFAULT NULL,\n" .
+        " \" float DEFAULT NULL\n" .
+        " \" float NOT NULL,\n" .
+        " \" float NOT NULL\n" .
+        " \" float NOT NULL DEFAULT '213'\n", $result);
     }
 
     public function testInitAlias(): void
@@ -1502,22 +1397,22 @@ class ExportSqlTest extends AbstractTestCase
         $table = null;
 
         $this->object->initAlias($aliases, $db, $table);
-        $this->assertEquals('aliastest', $db);
-        $this->assertNull($table);
+        self::assertSame('aliastest', $db);
+        self::assertNull($table);
 
         $db = 'foo';
         $table = 'qwerty';
 
         $this->object->initAlias($aliases, $db, $table);
-        $this->assertEquals('foo', $db);
-        $this->assertEquals('qwerty', $table);
+        self::assertSame('foo', $db);
+        self::assertSame('qwerty', $table);
 
         $db = 'a';
         $table = 'foo';
 
         $this->object->initAlias($aliases, $db, $table);
-        $this->assertEquals('aliastest', $db);
-        $this->assertEquals('qwerty', $table);
+        self::assertSame('aliastest', $db);
+        self::assertSame('qwerty', $table);
     }
 
     public function testGetAlias(): void
@@ -1541,25 +1436,13 @@ class ExportSqlTest extends AbstractTestCase
             ],
         ];
 
-        $this->assertEquals(
-            'f',
-            $this->object->getAlias($aliases, 'bar')
-        );
+        self::assertSame('f', $this->object->getAlias($aliases, 'bar'));
 
-        $this->assertEquals(
-            'aliastest',
-            $this->object->getAlias($aliases, 'a')
-        );
+        self::assertSame('aliastest', $this->object->getAlias($aliases, 'a'));
 
-        $this->assertEquals(
-            'pphymdain',
-            $this->object->getAlias($aliases, 'pqr')
-        );
+        self::assertSame('pphymdain', $this->object->getAlias($aliases, 'pqr'));
 
-        $this->assertEquals(
-            '',
-            $this->object->getAlias($aliases, 'abc')
-        );
+        self::assertSame('', $this->object->getAlias($aliases, 'abc'));
     }
 
     public function testReplaceWithAlias(): void
@@ -1597,27 +1480,21 @@ class ExportSqlTest extends AbstractTestCase
             . "latin1_general_ci COMMENT='List' AUTO_INCREMENT=5";
         $result = $this->object->replaceWithAliases(null, $sql_query, $aliases, $db, $table);
 
-        $this->assertEquals(
-            "CREATE TABLE IF NOT EXISTS `bartest` (\n" .
-            "  `p` tinyint(3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" .
-            "  `xyz` varchar(255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" .
-            "  `pphymdain` varchar(10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" .
-            "  CONSTRAINT `fk_om_dept` FOREIGN KEY (`p`) REFERENCES dept_master (`baz`)\n" .
-            ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'",
-            $result
-        );
+        self::assertSame("CREATE TABLE IF NOT EXISTS `bartest` (\n" .
+        "  `p` tinyint(3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" .
+        "  `xyz` varchar(255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" .
+        "  `pphymdain` varchar(10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" .
+        "  CONSTRAINT `fk_om_dept` FOREIGN KEY (`p`) REFERENCES dept_master (`baz`)\n" .
+        ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'", $result);
 
         $result = $this->object->replaceWithAliases(null, $sql_query, [], '', '');
 
-        $this->assertEquals(
-            "CREATE TABLE IF NOT EXISTS foo (\n" .
-            "  `baz` tinyint(3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" .
-            "  `xyz` varchar(255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" .
-            "  `pqr` varchar(10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" .
-            "  CONSTRAINT `fk_om_dept` FOREIGN KEY (`baz`) REFERENCES dept_master (`baz`)\n" .
-            ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'",
-            $result
-        );
+        self::assertSame("CREATE TABLE IF NOT EXISTS foo (\n" .
+        "  `baz` tinyint(3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" .
+        "  `xyz` varchar(255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" .
+        "  `pqr` varchar(10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" .
+        "  CONSTRAINT `fk_om_dept` FOREIGN KEY (`baz`) REFERENCES dept_master (`baz`)\n" .
+        ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'", $result);
 
         $table = 'bar';
         $sql_query = 'CREATE TRIGGER `BEFORE_bar_INSERT` '
@@ -1631,15 +1508,12 @@ class ExportSqlTest extends AbstractTestCase
             . 'END IF; END';
         $result = $this->object->replaceWithAliases('$$', $sql_query, $aliases, $db, $table);
 
-        $this->assertEquals(
-            'CREATE TRIGGER `BEFORE_bar_INSERT` BEFORE INSERT ON `f` FOR EACH ROW BEGIN ' .
-            'SET @cnt=(SELECT count(*) FROM `f` WHERE `n`=NEW.`n` AND id=NEW.id AND abc=NEW.`n` LIMIT 1); ' .
-            'IF @cnt<>0 THEN ' .
-            'SET NEW.`n`=1; ' .
-            'END IF; ' .
-            'END',
-            $result
-        );
+        self::assertSame('CREATE TRIGGER `BEFORE_bar_INSERT` BEFORE INSERT ON `f` FOR EACH ROW BEGIN ' .
+        'SET @cnt=(SELECT count(*) FROM `f` WHERE `n`=NEW.`n` AND id=NEW.id AND abc=NEW.`n` LIMIT 1); ' .
+        'IF @cnt<>0 THEN ' .
+        'SET NEW.`n`=1; ' .
+        'END IF; ' .
+        'END', $result);
 
         $table = 'bar';
         $sql_query = <<<'SQL'
@@ -1687,9 +1561,6 @@ RETURN TextString ;
 END
 SQL;
 
-        $this->assertEquals(
-            $expectedQuery,
-            $result
-        );
+        self::assertSame($expectedQuery, $result);
     }
 }
diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php
index 7b6482a5c1..8bb5d8d5d6 100644
--- a/test/classes/Plugins/Export/ExportTexytextTest.php
+++ b/test/classes/Plugins/Export/ExportTexytextTest.php
@@ -73,118 +73,81 @@ class ExportTexytextTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'Texy! text',
-            $properties->getText()
-        );
+        self::assertSame('Texy! text', $properties->getText());
 
-        $this->assertEquals(
-            'txt',
-            $properties->getExtension()
-        );
+        self::assertSame('txt', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/plain', $properties->getMimeType());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
+        self::assertSame('Dump table', $generalOptions->getText());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(RadioPropertyItem::class, $property);
+        self::assertInstanceOf(RadioPropertyItem::class, $property);
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
+        self::assertSame('data', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
+        self::assertSame('columns', $property->getName());
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(TextPropertyItem::class, $property);
+        self::assertInstanceOf(TextPropertyItem::class, $property);
 
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
+        self::assertSame('null', $property->getName());
     }
 
     public function testExportHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
     }
 
     public function testExportFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
     {
         $this->expectOutputString("===Database testDb\n\n");
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDb')
-        );
+        self::assertTrue($this->object->exportDBHeader('testDb'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
+        self::assertTrue($this->object->exportDBFooter('testDB'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -194,28 +157,23 @@ class ExportTexytextTest extends AbstractTestCase
         $GLOBALS['foo_null'] = '>';
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'SELECT * FROM `test_db`.`test_table`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'SELECT * FROM `test_db`.`test_table`;'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertEquals(
-            '== Dumping data for table test_table' . "\n\n"
-                . '|------' . "\n"
-                . '|id|name|datetimefield' . "\n"
-                . '|------' . "\n"
-                . '|1|abcd|2011-01-20 02:00:02' . "\n"
-                . '|2|foo|2010-01-20 02:00:02' . "\n"
-                . '|3|Abcd|2012-01-20 02:00:02' . "\n",
-            $result
-        );
+        self::assertIsString($result);
+        self::assertSame('== Dumping data for table test_table' . "\n\n"
+            . '|------' . "\n"
+            . '|id|name|datetimefield' . "\n"
+            . '|------' . "\n"
+            . '|1|abcd|2011-01-20 02:00:02' . "\n"
+            . '|2|foo|2010-01-20 02:00:02' . "\n"
+            . '|3|Abcd|2012-01-20 02:00:02' . "\n", $result);
     }
 
     public function testGetTableDefStandIn(): void
@@ -224,15 +182,12 @@ class ExportTexytextTest extends AbstractTestCase
         $result = $this->object->getTableDefStandIn('test_db', 'test_table', "\n");
         $this->assertAllSelectsConsumed();
 
-        $this->assertEquals(
-            '|------' . "\n"
-            . '|Column|Type|Null|Default' . "\n"
-            . '|------' . "\n"
-            . '|//**id**//|int(11)|No|NULL' . "\n"
-            . '|name|varchar(20)|No|NULL' . "\n"
-            . '|datetimefield|datetime|No|NULL' . "\n",
-            $result
-        );
+        self::assertSame('|------' . "\n"
+        . '|Column|Type|Null|Default' . "\n"
+        . '|------' . "\n"
+        . '|//**id**//|int(11)|No|NULL' . "\n"
+        . '|name|varchar(20)|No|NULL' . "\n"
+        . '|datetimefield|datetime|No|NULL' . "\n", $result);
     }
 
     public function testGetTableDef(): void
@@ -319,7 +274,7 @@ class ExportTexytextTest extends AbstractTestCase
 
         $result = $this->object->getTableDef('db', 'table', "\n", 'example.com', true, true, true);
 
-        $this->assertStringContainsString('1|&lt;ftable (ffield&gt;)|comm|Test&lt;', $result);
+        self::assertStringContainsString('1|&lt;ftable (ffield&gt;)|comm|Test&lt;', $result);
     }
 
     public function testGetTriggers(): void
@@ -346,9 +301,9 @@ class ExportTexytextTest extends AbstractTestCase
 
         $result = $this->object->getTriggers('database', 'ta<ble');
 
-        $this->assertStringContainsString('|tna"me|ac>t|manip&|def', $result);
+        self::assertStringContainsString('|tna"me|ac>t|manip&|def', $result);
 
-        $this->assertStringContainsString('|Name|Time|Event|Definition', $result);
+        self::assertStringContainsString('|Name|Time|Event|Definition', $result);
     }
 
     public function testExportStructure(): void
@@ -356,107 +311,87 @@ class ExportTexytextTest extends AbstractTestCase
         // case 1
         ob_start();
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_table',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_table',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertEquals(
-            '== Table structure for table test_table' . "\n\n"
-            . '|------' . "\n"
-            . '|Column|Type|Null|Default' . "\n"
-            . '|------' . "\n"
-            . '|//**id**//|int(11)|No|NULL' . "\n"
-            . '|name|varchar(20)|No|NULL' . "\n"
-            . '|datetimefield|datetime|No|NULL' . "\n",
-            $result
-        );
+        self::assertIsString($result);
+        self::assertSame('== Table structure for table test_table' . "\n\n"
+        . '|------' . "\n"
+        . '|Column|Type|Null|Default' . "\n"
+        . '|------' . "\n"
+        . '|//**id**//|int(11)|No|NULL' . "\n"
+        . '|name|varchar(20)|No|NULL' . "\n"
+        . '|datetimefield|datetime|No|NULL' . "\n", $result);
 
         // case 2
         ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'triggers',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'triggers',
+            'test'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '== Triggers test_table' . "\n\n"
-            . '|------' . "\n"
-            . '|Name|Time|Event|Definition' . "\n"
-            . '|------' . "\n"
-            . '|test_trigger|AFTER|INSERT|BEGIN END' . "\n",
-            $result
-        );
+        self::assertSame('== Triggers test_table' . "\n\n"
+        . '|------' . "\n"
+        . '|Name|Time|Event|Definition' . "\n"
+        . '|------' . "\n"
+        . '|test_trigger|AFTER|INSERT|BEGIN END' . "\n", $result);
 
         // case 3
         ob_start();
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'create_view',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'create_view',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '== Structure for view test_table' . "\n\n"
-            . '|------' . "\n"
-            . '|Column|Type|Null|Default' . "\n"
-            . '|------' . "\n"
-            . '|//**id**//|int(11)|No|NULL' . "\n"
-            . '|name|varchar(20)|No|NULL' . "\n"
-            . '|datetimefield|datetime|No|NULL' . "\n",
-            $result
-        );
+        self::assertSame('== Structure for view test_table' . "\n\n"
+        . '|------' . "\n"
+        . '|Column|Type|Null|Default' . "\n"
+        . '|------' . "\n"
+        . '|//**id**//|int(11)|No|NULL' . "\n"
+        . '|name|varchar(20)|No|NULL' . "\n"
+        . '|datetimefield|datetime|No|NULL' . "\n", $result);
 
         // case 4
         ob_start();
         $this->dummyDbi->addSelectDb('test_db');
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'stand_in',
-                'test'
-            )
-        );
+        self::assertTrue($this->object->exportStructure(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'stand_in',
+            'test'
+        ));
         $this->assertAllSelectsConsumed();
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '== Stand-in structure for view test_table' . "\n\n"
-            . '|------' . "\n"
-            . '|Column|Type|Null|Default' . "\n"
-            . '|------' . "\n"
-            . '|//**id**//|int(11)|No|NULL' . "\n"
-            . '|name|varchar(20)|No|NULL' . "\n"
-            . '|datetimefield|datetime|No|NULL' . "\n",
-            $result
-        );
+        self::assertSame('== Stand-in structure for view test_table' . "\n\n"
+        . '|------' . "\n"
+        . '|Column|Type|Null|Default' . "\n"
+        . '|------' . "\n"
+        . '|//**id**//|int(11)|No|NULL' . "\n"
+        . '|name|varchar(20)|No|NULL' . "\n"
+        . '|datetimefield|datetime|No|NULL' . "\n", $result);
     }
 
     public function testFormatOneColumnDefinition(): void
@@ -470,7 +405,7 @@ class ExportTexytextTest extends AbstractTestCase
 
         $unique_keys = ['field'];
 
-        $this->assertEquals(
+        self::assertSame(
             '|//**field**//|set(abc)|Yes|NULL',
             $this->object->formatOneColumnDefinition($cols, $unique_keys)
         );
@@ -485,9 +420,6 @@ class ExportTexytextTest extends AbstractTestCase
 
         $unique_keys = ['field'];
 
-        $this->assertEquals(
-            '|fields|&amp;nbsp;|No|def',
-            $this->object->formatOneColumnDefinition($cols, $unique_keys)
-        );
+        self::assertSame('|fields|&amp;nbsp;|No|def', $this->object->formatOneColumnDefinition($cols, $unique_keys));
     }
 }
diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php
index 5f4e77d118..721c7ef38b 100644
--- a/test/classes/Plugins/Export/ExportXmlTest.php
+++ b/test/classes/Plugins/Export/ExportXmlTest.php
@@ -70,94 +70,73 @@ class ExportXmlTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'XML',
-            $properties->getText()
-        );
+        self::assertSame('XML', $properties->getText());
 
-        $this->assertEquals(
-            'xml',
-            $properties->getExtension()
-        );
+        self::assertSame('xml', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/xml',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/xml', $properties->getMimeType());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getName()
-        );
+        self::assertSame('structure', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
+        self::assertSame('data', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(BoolPropertyItem::class, $property);
+        self::assertInstanceOf(BoolPropertyItem::class, $property);
     }
 
     /**
@@ -235,39 +214,31 @@ class ExportXmlTest extends AbstractTestCase
         $GLOBALS['table'] = 'table';
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString(
-            '&lt;pma_xml_export version=&quot;1.0&quot; xmlns:pma=&quot;' .
-            'https://www.phpmyadmin.net/some_doc_url/&quot;&gt;',
-            $result
-        );
+        self::assertStringContainsString('&lt;pma_xml_export version=&quot;1.0&quot; xmlns:pma=&quot;' .
+        'https://www.phpmyadmin.net/some_doc_url/&quot;&gt;', $result);
 
-        $this->assertStringContainsString(
-            '&lt;pma:structure_schemas&gt;' . "\n" .
-            '        &lt;pma:database name=&quot;d&amp;lt;&amp;quot;b&quot; collat' .
-            'ion=&quot;utf8_general_ci&quot; charset=&quot;utf-8&quot;&gt;' . "\n" .
-            '            &lt;pma:table name=&quot;table&quot;&gt;' . "\n" .
-            '                &amp;quot;tbl&amp;quot;;' . "\n" .
-            '            &lt;/pma:table&gt;' . "\n" .
-            '            &lt;pma:trigger name=&quot;trname&quot;&gt;' . "\n" .
-            '                ' . "\n" .
-            '            &lt;/pma:trigger&gt;' . "\n" .
-            '            &lt;pma:function name=&quot;fn&quot;&gt;' . "\n" .
-            '                fndef' . "\n" .
-            '            &lt;/pma:function&gt;' . "\n" .
-            '            &lt;pma:procedure name=&quot;pr&quot;&gt;' . "\n" .
-            '                prdef' . "\n" .
-            '            &lt;/pma:procedure&gt;' . "\n" .
-            '        &lt;/pma:database&gt;' . "\n" .
-            '    &lt;/pma:structure_schemas&gt;',
-            $result
-        );
+        self::assertStringContainsString('&lt;pma:structure_schemas&gt;' . "\n" .
+        '        &lt;pma:database name=&quot;d&amp;lt;&amp;quot;b&quot; collat' .
+        'ion=&quot;utf8_general_ci&quot; charset=&quot;utf-8&quot;&gt;' . "\n" .
+        '            &lt;pma:table name=&quot;table&quot;&gt;' . "\n" .
+        '                &amp;quot;tbl&amp;quot;;' . "\n" .
+        '            &lt;/pma:table&gt;' . "\n" .
+        '            &lt;pma:trigger name=&quot;trname&quot;&gt;' . "\n" .
+        '                ' . "\n" .
+        '            &lt;/pma:trigger&gt;' . "\n" .
+        '            &lt;pma:function name=&quot;fn&quot;&gt;' . "\n" .
+        '                fndef' . "\n" .
+        '            &lt;/pma:function&gt;' . "\n" .
+        '            &lt;pma:procedure name=&quot;pr&quot;&gt;' . "\n" .
+        '                prdef' . "\n" .
+        '            &lt;/pma:procedure&gt;' . "\n" .
+        '        &lt;/pma:database&gt;' . "\n" .
+        '    &lt;/pma:structure_schemas&gt;', $result);
 
         // case 2 with isView as true and false
 
@@ -319,29 +290,22 @@ class ExportXmlTest extends AbstractTestCase
         ];
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString(
-            '&lt;pma:structure_schemas&gt;' . "\n" .
-            '        &lt;pma:database name=&quot;d&amp;lt;&amp;quot;b&quot; collat' .
-            'ion=&quot;utf8_general_ci&quot; charset=&quot;utf-8&quot;&gt;' . "\n" .
-            '        &lt;/pma:database&gt;' . "\n" .
-            '    &lt;/pma:structure_schemas&gt;',
-            $result
-        );
+        self::assertStringContainsString('&lt;pma:structure_schemas&gt;' . "\n" .
+        '        &lt;pma:database name=&quot;d&amp;lt;&amp;quot;b&quot; collat' .
+        'ion=&quot;utf8_general_ci&quot; charset=&quot;utf-8&quot;&gt;' . "\n" .
+        '        &lt;/pma:database&gt;' . "\n" .
+        '    &lt;/pma:structure_schemas&gt;', $result);
     }
 
     public function testExportFooter(): void
     {
         $this->expectOutputString('&lt;/pma_xml_export&gt;');
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
@@ -349,20 +313,16 @@ class ExportXmlTest extends AbstractTestCase
         $GLOBALS['xml_export_contents'] = true;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('&db')
-        );
+        self::assertTrue($this->object->exportDBHeader('&db'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('&lt;database name=&quot;&amp;amp;db&quot;&gt;', $result);
+        self::assertStringContainsString('&lt;database name=&quot;&amp;amp;db&quot;&gt;', $result);
 
         $GLOBALS['xml_export_contents'] = false;
 
-        $this->assertTrue(
-            $this->object->exportDBHeader('&db')
-        );
+        self::assertTrue($this->object->exportDBHeader('&db'));
     }
 
     public function testExportDBFooter(): void
@@ -370,27 +330,21 @@ class ExportXmlTest extends AbstractTestCase
         $GLOBALS['xml_export_contents'] = true;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportDBFooter('&db')
-        );
+        self::assertTrue($this->object->exportDBFooter('&db'));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('&lt;/database&gt;', $result);
+        self::assertStringContainsString('&lt;/database&gt;', $result);
 
         $GLOBALS['xml_export_contents'] = false;
 
-        $this->assertTrue(
-            $this->object->exportDBFooter('&db')
-        );
+        self::assertTrue($this->object->exportDBFooter('&db'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
@@ -400,36 +354,31 @@ class ExportXmlTest extends AbstractTestCase
         $GLOBALS['output_charset_conversion'] = false;
 
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'SELECT * FROM `test_db`.`test_table`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'SELECT * FROM `test_db`.`test_table`;'
+        ));
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
-        $this->assertEquals(
-            '        <!-- Table test_table -->' . "\n"
-            . '        <table name="test_table">' . "\n"
-            . '            <column name="id">1</column>' . "\n"
-            . '            <column name="name">abcd</column>' . "\n"
-            . '            <column name="datetimefield">2011-01-20 02:00:02</column>' . "\n"
-            . '        </table>' . "\n"
-            . '        <table name="test_table">' . "\n"
-            . '            <column name="id">2</column>' . "\n"
-            . '            <column name="name">foo</column>' . "\n"
-            . '            <column name="datetimefield">2010-01-20 02:00:02</column>' . "\n"
-            . '        </table>' . "\n"
-            . '        <table name="test_table">' . "\n"
-            . '            <column name="id">3</column>' . "\n"
-            . '            <column name="name">Abcd</column>' . "\n"
-            . '            <column name="datetimefield">2012-01-20 02:00:02</column>' . "\n"
-            . '        </table>' . "\n",
-            $result
-        );
+        self::assertIsString($result);
+        self::assertSame('        <!-- Table test_table -->' . "\n"
+        . '        <table name="test_table">' . "\n"
+        . '            <column name="id">1</column>' . "\n"
+        . '            <column name="name">abcd</column>' . "\n"
+        . '            <column name="datetimefield">2011-01-20 02:00:02</column>' . "\n"
+        . '        </table>' . "\n"
+        . '        <table name="test_table">' . "\n"
+        . '            <column name="id">2</column>' . "\n"
+        . '            <column name="name">foo</column>' . "\n"
+        . '            <column name="datetimefield">2010-01-20 02:00:02</column>' . "\n"
+        . '        </table>' . "\n"
+        . '        <table name="test_table">' . "\n"
+        . '            <column name="id">3</column>' . "\n"
+        . '            <column name="name">Abcd</column>' . "\n"
+        . '            <column name="datetimefield">2012-01-20 02:00:02</column>' . "\n"
+        . '        </table>' . "\n", $result);
     }
 }
diff --git a/test/classes/Plugins/Export/ExportYamlTest.php b/test/classes/Plugins/Export/ExportYamlTest.php
index 417ef9fecf..0e1538859f 100644
--- a/test/classes/Plugins/Export/ExportYamlTest.php
+++ b/test/classes/Plugins/Export/ExportYamlTest.php
@@ -65,134 +65,104 @@ class ExportYamlTest extends AbstractTestCase
         $attrProperties->setAccessible(true);
         $properties = $attrProperties->getValue($this->object);
 
-        $this->assertInstanceOf(ExportPluginProperties::class, $properties);
+        self::assertInstanceOf(ExportPluginProperties::class, $properties);
 
-        $this->assertEquals(
-            'YAML',
-            $properties->getText()
-        );
+        self::assertSame('YAML', $properties->getText());
 
-        $this->assertEquals(
-            'yml',
-            $properties->getExtension()
-        );
+        self::assertSame('yml', $properties->getExtension());
 
-        $this->assertEquals(
-            'text/yaml',
-            $properties->getMimeType()
-        );
+        self::assertSame('text/yaml', $properties->getMimeType());
 
         $options = $properties->getOptions();
 
-        $this->assertInstanceOf(OptionsPropertyRootGroup::class, $options);
+        self::assertInstanceOf(OptionsPropertyRootGroup::class, $options);
 
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
+        self::assertSame('Format Specific Options', $options->getName());
 
         $generalOptionsArray = $options->getProperties();
 
         $generalOptions = array_shift($generalOptionsArray);
 
-        $this->assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
+        self::assertInstanceOf(OptionsPropertyMainGroup::class, $generalOptions);
 
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
+        self::assertSame('general_opts', $generalOptions->getName());
 
         $generalProperties = $generalOptions->getProperties();
 
         $property = array_shift($generalProperties);
 
-        $this->assertInstanceOf(HiddenPropertyItem::class, $property);
+        self::assertInstanceOf(HiddenPropertyItem::class, $property);
     }
 
     public function testExportHeader(): void
     {
         ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
+        self::assertTrue($this->object->exportHeader());
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString("%YAML 1.1\n---\n", $result);
+        self::assertStringContainsString("%YAML 1.1\n---\n", $result);
     }
 
     public function testExportFooter(): void
     {
         $this->expectOutputString("...\n");
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
+        self::assertTrue($this->object->exportFooter());
     }
 
     public function testExportDBHeader(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBHeader('&db')
-        );
+        self::assertTrue($this->object->exportDBHeader('&db'));
     }
 
     public function testExportDBFooter(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBFooter('&db')
-        );
+        self::assertTrue($this->object->exportDBFooter('&db'));
     }
 
     public function testExportDBCreate(): void
     {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
+        self::assertTrue($this->object->exportDBCreate('testDB', 'database'));
     }
 
     public function testExportData(): void
     {
         ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'test_db',
-                'test_table',
-                "\n",
-                'localhost',
-                'SELECT * FROM `test_db`.`test_table_yaml`;'
-            )
-        );
+        self::assertTrue($this->object->exportData(
+            'test_db',
+            'test_table',
+            "\n",
+            'localhost',
+            'SELECT * FROM `test_db`.`test_table_yaml`;'
+        ));
         $result = ob_get_clean();
 
-        $this->assertEquals(
-            '# test_db.test_table' . "\n" .
-            '-' . "\n" .
-            '  id: 1' . "\n" .
-            '  name: &quot;abcd&quot;' . "\n" .
-            '  datetimefield: &quot;2011-01-20 02:00:02&quot;' . "\n" .
-            '  textfield: null' . "\n" .
-            '-' . "\n" .
-            '  id: 2' . "\n" .
-            '  name: &quot;foo&quot;' . "\n" .
-            '  datetimefield: &quot;2010-01-20 02:00:02&quot;' . "\n" .
-            '  textfield: null' . "\n" .
-            '-' . "\n" .
-            '  id: 3' . "\n" .
-            '  name: &quot;Abcd&quot;' . "\n" .
-            '  datetimefield: &quot;2012-01-20 02:00:02&quot;' . "\n" .
-            '  textfield: null' . "\n" .
-            '-' . "\n" .
-            '  id: 4' . "\n" .
-            '  name: &quot;Abcd&quot;' . "\n" .
-            '  datetimefield: &quot;2012-01-20 02:00:02&quot;' . "\n" .
-            '  textfield: &quot;123&quot;' . "\n" .
-            '-' . "\n" .
-            '  id: 5' . "\n" .
-            '  name: &quot;Abcd&quot;' . "\n" .
-            '  datetimefield: &quot;2012-01-20 02:00:02&quot;' . "\n" .
-            '  textfield: &quot;+30.2103210000&quot;' . "\n",
-            $result
-        );
+        self::assertSame('# test_db.test_table' . "\n" .
+        '-' . "\n" .
+        '  id: 1' . "\n" .
+        '  name: &quot;abcd&quot;' . "\n" .
+        '  datetimefield: &quot;2011-01-20 02:00:02&quot;' . "\n" .
+        '  textfield: null' . "\n" .
+        '-' . "\n" .
+        '  id: 2' . "\n" .
+        '  name: &quot;foo&quot;' . "\n" .
+        '  datetimefield: &quot;2010-01-20 02:00:02&quot;' . "\n" .
+        '  textfield: null' . "\n" .
+        '-' . "\n" .
+        '  id: 3' . "\n" .
+        '  name: &quot;Abcd&quot;' . "\n" .
+        '  datetimefield: &quot;2012-01-20 02:00:02&quot;' . "\n" .
+        '  textfield: null' . "\n" .
+        '-' . "\n" .
+        '  id: 4' . "\n" .
+        '  name: &quot;Abcd&quot;' . "\n" .
+        '  datetimefield: &quot;2012-01-20 02:00:02&quot;' . "\n" .
+        '  textfield: &quot;123&quot;' . "\n" .
+        '-' . "\n" .
+        '  id: 5' . "\n" .
+        '  name: &quot;Abcd&quot;' . "\n" .
+        '  datetimefield: &quot;2012-01-20 02:00:02&quot;' . "\n" .
+        '  textfield: &quot;+30.2103210000&quot;' . "\n", $result);
     }
 }
diff --git a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
index b200c34942..7425f35fc2 100644
--- a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
+++ b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
@@ -44,34 +44,28 @@ class TablePropertyTest extends AbstractTestCase
 
     public function testConstructor(): void
     {
-        $this->assertEquals('name', $this->object->name);
+        self::assertSame('name', $this->object->name);
 
-        $this->assertEquals('int', $this->object->type);
+        self::assertSame('int', $this->object->type);
 
-        $this->assertEquals(1, $this->object->nullable);
+        self::assertEquals(1, $this->object->nullable);
 
-        $this->assertEquals('PRI', $this->object->key);
+        self::assertSame('PRI', $this->object->key);
 
-        $this->assertEquals('0', $this->object->defaultValue);
+        self::assertSame('0', $this->object->defaultValue);
 
-        $this->assertEquals('mysql', $this->object->ext);
+        self::assertSame('mysql', $this->object->ext);
     }
 
     public function testGetPureType(): void
     {
         $this->object->type = 'int(10)';
 
-        $this->assertEquals(
-            'int',
-            $this->object->getPureType()
-        );
+        self::assertSame('int', $this->object->getPureType());
 
         $this->object->type = 'char';
 
-        $this->assertEquals(
-            'char',
-            $this->object->getPureType()
-        );
+        self::assertSame('char', $this->object->getPureType());
     }
 
     /**
@@ -84,10 +78,7 @@ class TablePropertyTest extends AbstractTestCase
     {
         $this->object->nullable = $nullable;
 
-        $this->assertEquals(
-            $expected,
-            $this->object->isNotNull()
-        );
+        self::assertSame($expected, $this->object->isNotNull());
     }
 
     /**
@@ -123,10 +114,7 @@ class TablePropertyTest extends AbstractTestCase
     {
         $this->object->key = $key;
 
-        $this->assertEquals(
-            $expected,
-            $this->object->isUnique()
-        );
+        self::assertSame($expected, $this->object->isUnique());
     }
 
     /**
@@ -170,10 +158,7 @@ class TablePropertyTest extends AbstractTestCase
     {
         $this->object->type = $type;
 
-        $this->assertEquals(
-            $expected,
-            $this->object->getDotNetPrimitiveType()
-        );
+        self::assertSame($expected, $this->object->getDotNetPrimitiveType());
     }
 
     /**
@@ -241,10 +226,7 @@ class TablePropertyTest extends AbstractTestCase
     {
         $this->object->type = $type;
 
-        $this->assertEquals(
-            $expected,
-            $this->object->getDotNetObjectType()
-        );
+        self::assertSame($expected, $this->object->getDotNetObjectType());
     }
 
     /**
@@ -307,61 +289,42 @@ class TablePropertyTest extends AbstractTestCase
         $this->object->name = "ä'7<ab>";
         $this->object->key = 'PRI';
 
-        $this->assertEquals(
-            "index=\"ä'7&lt;ab&gt;\"",
-            $this->object->getIndexName()
-        );
+        self::assertSame("index=\"ä'7&lt;ab&gt;\"", $this->object->getIndexName());
 
         $this->object->key = '';
 
-        $this->assertEquals(
-            '',
-            $this->object->getIndexName()
-        );
+        self::assertSame('', $this->object->getIndexName());
     }
 
     public function testIsPK(): void
     {
         $this->object->key = 'PRI';
 
-        $this->assertTrue(
-            $this->object->isPK()
-        );
+        self::assertTrue($this->object->isPK());
 
         $this->object->key = '';
 
-        $this->assertFalse(
-            $this->object->isPK()
-        );
+        self::assertFalse($this->object->isPK());
     }
 
     public function testFormatCs(): void
     {
         $this->object->name = 'Name#name#123';
 
-        $this->assertEquals(
-            'text123Namename',
-            $this->object->formatCs('text123#name#')
-        );
+        self::assertSame('text123Namename', $this->object->formatCs('text123#name#'));
     }
 
     public function testFormatXml(): void
     {
         $this->object->name = '"a\'';
 
-        $this->assertEquals(
-            '&quot;a\'index="&quot;a\'"',
-            $this->object->formatXml('#name##indexName#')
-        );
+        self::assertSame('&quot;a\'index="&quot;a\'"', $this->object->formatXml('#name##indexName#'));
     }
 
     public function testFormat(): void
     {
-        $this->assertEquals(
-            'NameintInt32intfalsetrue',
-            $this->object->format(
-                '#ucfirstName##dotNetPrimitiveType##dotNetObjectType##type##notNull##unique#'
-            )
-        );
+        self::assertSame('NameintInt32intfalsetrue', $this->object->format(
+            '#ucfirstName##dotNetPrimitiveType##dotNetObjectType##type##notNull##unique#'
+        ));
     }
 }
diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php
index 4798f278aa..0453924a5a 100644
--- a/test/classes/Plugins/Import/ImportCsvTest.php
+++ b/test/classes/Plugins/Import/ImportCsvTest.php
@@ -79,14 +79,8 @@ class ImportCsvTest extends AbstractTestCase
     public function testGetProperties(): void
     {
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('CSV'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
+        self::assertSame(__('CSV'), $properties->getText());
+        self::assertSame('csv', $properties->getExtension());
     }
 
     /**
@@ -107,13 +101,13 @@ class ImportCsvTest extends AbstractTestCase
         $this->object->doImport($importHandle);
 
         //asset that all sql are executed
-        $this->assertStringContainsString('CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER', $sql_query);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER', $sql_query);
+        self::assertStringContainsString(
             'CREATE TABLE IF NOT EXISTS `CSV_DB 1`.`' . $GLOBALS['import_file_name'] . '`',
             $sql_query
         );
 
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 
     /**
@@ -139,10 +133,10 @@ class ImportCsvTest extends AbstractTestCase
         $this->object->doImport($importHandle);
 
         //asset that all sql are executed
-        $this->assertStringContainsString('CREATE DATABASE IF NOT EXISTS `ImportTestDb` DEFAULT CHARACTER', $sql_query);
-        $this->assertStringContainsString('CREATE TABLE IF NOT EXISTS `ImportTestDb`.`ImportTestTable`', $sql_query);
+        self::assertStringContainsString('CREATE DATABASE IF NOT EXISTS `ImportTestDb` DEFAULT CHARACTER', $sql_query);
+        self::assertStringContainsString('CREATE TABLE IF NOT EXISTS `ImportTestDb`.`ImportTestTable`', $sql_query);
 
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
 
         unset($_REQUEST['csv_new_tbl_name']);
         unset($_REQUEST['csv_new_db_name']);
@@ -159,14 +153,8 @@ class ImportCsvTest extends AbstractTestCase
         $GLOBALS['plugin_param'] = 'table';
         $this->object = new ImportCsv();
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('CSV'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
+        self::assertSame(__('CSV'), $properties->getText());
+        self::assertSame('csv', $properties->getExtension());
     }
 
     /**
@@ -187,14 +175,14 @@ class ImportCsvTest extends AbstractTestCase
         $this->object->doImport($importHandle);
 
         //asset that all sql are executed
-        $this->assertStringContainsString('CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER', $sql_query);
+        self::assertStringContainsString('CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER', $sql_query);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'CREATE TABLE IF NOT EXISTS `CSV_DB 1`.`' . $GLOBALS['import_file_name'] . '`',
             $sql_query
         );
 
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 
     /**
@@ -227,15 +215,12 @@ class ImportCsvTest extends AbstractTestCase
 
         $this->object->doImport();
 
-        $this->assertSame(
-            'CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
-            . 'CREATE TABLE IF NOT EXISTS `CSV_DB 1`.`db_test` (`COL 1` varchar(5), `COL 2` varchar(5))'
-            . ' DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;INSERT INTO `CSV_DB 1`.`db_test`'
-            . ' (`COL 1`, `COL 2`) VALUES (\'Row 1\', \'Row 2\'),' . "\n" . ' (\'123\', \'456\');;',
-            $sql_query
-        );
+        self::assertSame('CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
+        . 'CREATE TABLE IF NOT EXISTS `CSV_DB 1`.`db_test` (`COL 1` varchar(5), `COL 2` varchar(5))'
+        . ' DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;INSERT INTO `CSV_DB 1`.`db_test`'
+        . ' (`COL 1`, `COL 2`) VALUES (\'Row 1\', \'Row 2\'),' . "\n" . ' (\'123\', \'456\');;', $sql_query);
 
-        $this->assertEquals(true, $GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
         $this->assertAllQueriesConsumed();
     }
 
@@ -271,15 +256,12 @@ class ImportCsvTest extends AbstractTestCase
 
         $this->object->doImport();
 
-        $this->assertSame(
-            'CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
-            . 'CREATE TABLE IF NOT EXISTS `CSV_DB 1`.`db_test` (`Row 1` int(3), `Row 2` int(3))'
-            . ' DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;INSERT INTO `CSV_DB 1`.`db_test`'
-            . ' (`Row 1`, `Row 2`) VALUES (123, 456);;',
-            $sql_query
-        );
+        self::assertSame('CREATE DATABASE IF NOT EXISTS `CSV_DB 1` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
+        . 'CREATE TABLE IF NOT EXISTS `CSV_DB 1`.`db_test` (`Row 1` int(3), `Row 2` int(3))'
+        . ' DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;INSERT INTO `CSV_DB 1`.`db_test`'
+        . ' (`Row 1`, `Row 2`) VALUES (123, 456);;', $sql_query);
 
-        $this->assertEquals(true, $GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
         $this->assertAllQueriesConsumed();
     }
 }
diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php
index 8450b80c8d..067daf1eaa 100644
--- a/test/classes/Plugins/Import/ImportLdiTest.php
+++ b/test/classes/Plugins/Import/ImportLdiTest.php
@@ -82,14 +82,8 @@ class ImportLdiTest extends AbstractTestCase
     public function testGetProperties(): void
     {
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('CSV using LOAD DATA'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'ldi',
-            $properties->getExtension()
-        );
+        self::assertSame(__('CSV using LOAD DATA'), $properties->getText());
+        self::assertSame('ldi', $properties->getExtension());
     }
 
     /**
@@ -120,15 +114,9 @@ class ImportLdiTest extends AbstractTestCase
         $GLOBALS['cfg']['Import']['ldi_local_option'] = 'auto';
         $this->object = new ImportLdi();
         $properties = $this->object->getProperties();
-        $this->assertTrue($GLOBALS['cfg']['Import']['ldi_local_option']);
-        $this->assertEquals(
-            __('CSV using LOAD DATA'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'ldi',
-            $properties->getExtension()
-        );
+        self::assertTrue($GLOBALS['cfg']['Import']['ldi_local_option']);
+        self::assertSame(__('CSV using LOAD DATA'), $properties->getText());
+        self::assertSame('ldi', $properties->getExtension());
     }
 
     /**
@@ -158,12 +146,12 @@ class ImportLdiTest extends AbstractTestCase
         $this->object->doImport($importHandle);
 
         //asset that all sql are executed
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'LOAD DATA INFILE \'test/test_data/db_test_ldi.csv\' INTO TABLE `phpmyadmintest`',
             $sql_query
         );
 
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 
     /**
@@ -180,12 +168,12 @@ class ImportLdiTest extends AbstractTestCase
         $this->object->doImport();
 
         // We handle only some kind of data!
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             __('This plugin does not support compressed imports!'),
             $GLOBALS['message']->__toString()
         );
 
-        $this->assertTrue($GLOBALS['error']);
+        self::assertTrue($GLOBALS['error']);
     }
 
     /**
@@ -227,20 +215,20 @@ class ImportLdiTest extends AbstractTestCase
 
         //asset that all sql are executed
         //replace
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'LOAD DATA LOCAL INFILE \'test/test_data/db_test_ldi.csv\' REPLACE INTO TABLE `phpmyadmintest`',
             $sql_query
         );
 
         //FIELDS TERMINATED
-        $this->assertStringContainsString("FIELDS TERMINATED BY ','", $sql_query);
+        self::assertStringContainsString("FIELDS TERMINATED BY ','", $sql_query);
 
         //LINES TERMINATED
-        $this->assertStringContainsString("LINES TERMINATED BY 'newline_mark'", $sql_query);
+        self::assertStringContainsString("LINES TERMINATED BY 'newline_mark'", $sql_query);
 
         //IGNORE
-        $this->assertStringContainsString('IGNORE 1 LINES', $sql_query);
+        self::assertStringContainsString('IGNORE 1 LINES', $sql_query);
 
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 }
diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php
index 791773f435..308068e82c 100644
--- a/test/classes/Plugins/Import/ImportMediawikiTest.php
+++ b/test/classes/Plugins/Import/ImportMediawikiTest.php
@@ -60,23 +60,11 @@ class ImportMediawikiTest extends AbstractTestCase
     public function testGetProperties(): void
     {
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('MediaWiki Table'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'txt',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
-        $this->assertNull($properties->getOptions());
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
+        self::assertSame(__('MediaWiki Table'), $properties->getText());
+        self::assertSame('txt', $properties->getExtension());
+        self::assertSame('text/plain', $properties->getMimeType());
+        self::assertNull($properties->getOptions());
+        self::assertSame(__('Options'), $properties->getOptionsText());
     }
 
     /**
@@ -115,15 +103,15 @@ class ImportMediawikiTest extends AbstractTestCase
         */
 
         //asset that all databases and tables are imported
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'The following structures have either been created or altered.',
             $import_notice
         );
-        $this->assertStringContainsString('Go to database: `mediawiki_DB`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `mediawiki_DB`', $import_notice);
-        $this->assertStringContainsString('Go to table: `pma_bookmarktest`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `pma_bookmarktest`', $import_notice);
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertStringContainsString('Go to database: `mediawiki_DB`', $import_notice);
+        self::assertStringContainsString('Edit settings for `mediawiki_DB`', $import_notice);
+        self::assertStringContainsString('Go to table: `pma_bookmarktest`', $import_notice);
+        self::assertStringContainsString('Edit settings for `pma_bookmarktest`', $import_notice);
+        self::assertTrue($GLOBALS['finished']);
     }
 
     /**
@@ -162,14 +150,14 @@ class ImportMediawikiTest extends AbstractTestCase
         */
 
         //asset that all databases and tables are imported
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'The following structures have either been created or altered.',
             $import_notice
         );
-        $this->assertStringContainsString('Go to database: `mediawiki_DB`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `mediawiki_DB`', $import_notice);
-        $this->assertStringContainsString('Go to table: `empty`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `empty`', $import_notice);
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertStringContainsString('Go to database: `mediawiki_DB`', $import_notice);
+        self::assertStringContainsString('Edit settings for `mediawiki_DB`', $import_notice);
+        self::assertStringContainsString('Go to table: `empty`', $import_notice);
+        self::assertStringContainsString('Edit settings for `empty`', $import_notice);
+        self::assertTrue($GLOBALS['finished']);
     }
 }
diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php
index 57205b60e0..4c067685d9 100644
--- a/test/classes/Plugins/Import/ImportOdsTest.php
+++ b/test/classes/Plugins/Import/ImportOdsTest.php
@@ -66,18 +66,9 @@ class ImportOdsTest extends AbstractTestCase
     public function testGetProperties(): void
     {
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('OpenDocument Spreadsheet'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'ods',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
+        self::assertSame(__('OpenDocument Spreadsheet'), $properties->getText());
+        self::assertSame('ods', $properties->getExtension());
+        self::assertSame(__('Options'), $properties->getOptionsText());
     }
 
     /**
@@ -104,28 +95,28 @@ class ImportOdsTest extends AbstractTestCase
         //Test function called
         $this->object->doImport($importHandle);
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci',
             $sql_query
         );
-        $this->assertStringContainsString('CREATE TABLE IF NOT EXISTS `ODS_DB`.`pma_bookmark`', $sql_query);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('CREATE TABLE IF NOT EXISTS `ODS_DB`.`pma_bookmark`', $sql_query);
+        self::assertStringContainsString(
             'INSERT INTO `ODS_DB`.`pma_bookmark` (`A`, `B`, `C`, `D`) VALUES (1, \'dbbase\', NULL, \'ddd\');',
             $sql_query
         );
 
         //asset that all databases and tables are imported
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'The following structures have either been created or altered.',
             $import_notice
         );
-        $this->assertStringContainsString('Go to database: `ODS_DB`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `ODS_DB`', $import_notice);
-        $this->assertStringContainsString('Go to table: `pma_bookmark`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `pma_bookmark`', $import_notice);
+        self::assertStringContainsString('Go to database: `ODS_DB`', $import_notice);
+        self::assertStringContainsString('Edit settings for `ODS_DB`', $import_notice);
+        self::assertStringContainsString('Go to table: `pma_bookmark`', $import_notice);
+        self::assertStringContainsString('Edit settings for `pma_bookmark`', $import_notice);
 
         //asset that the import process is finished
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 
     public static function dataProviderOdsEmptyRows(): array
@@ -173,73 +164,70 @@ class ImportOdsTest extends AbstractTestCase
         //Test function called
         $this->object->doImport($importHandle);
 
-        $this->assertSame(
-            'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
-            . 'CREATE TABLE IF NOT EXISTS `ODS_DB`.`Shop` ('
-            . '`Artikelnummer` varchar(7), `Name` varchar(41), `keywords` varchar(15), `EK_Preis` varchar(21),'
-            . ' `Preis` varchar(23), `Details` varchar(10), `addInfo` varchar(22), `Einheit` varchar(3),'
-            . ' `Wirkstoff` varchar(10), `verkuerztHaltbar` varchar(21), `kuehlkette` varchar(7),'
-            . ' `Gebinde` varchar(71), `Verbrauchsnachweis` varchar(7), `Genehmigungspflichtig` varchar(7),'
-            . ' `Gefahrstoff` varchar(11), `GefahrArbeitsbereich` varchar(14), `Verwendungszweck` varchar(10),'
-            . ' `Verbrauch` varchar(10), `showLagerbestand` varchar(7)) '
-            . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
-            . 'CREATE TABLE IF NOT EXISTS `ODS_DB`.`Feuille 1` (`value` varchar(19)) '
-            . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
-            . 'INSERT INTO `ODS_DB`.`Shop` ('
-            . '`Artikelnummer`, `Name`, `keywords`, `EK_Preis`, `Preis`, `Details`, `addInfo`, `Einheit`,'
-            . ' `Wirkstoff`, `verkuerztHaltbar`, `kuehlkette`, `Gebinde`, `Verbrauchsnachweis`,'
-            . ' `Genehmigungspflichtig`, `Gefahrstoff`, `GefahrArbeitsbereich`, `Verwendungszweck`,'
-            . ' `Verbrauch`, `showLagerbestand`) VALUES ('
-            . 'NULL, NULL, \'Schlüsselwörter\', \'Einkaufspreis (Netto)\', \'VK-Preis (Orientierung)\', NULL,'
-            . ' \'Hintergrundinformation\', \'VPE\', NULL, \'verkürzte Haltbarkeit\', \'ja/nein\','
-            . ' \'Stück,Rolle,Pack,Flasche,Sack,Eimer,Karton,Palette,Beutel,Kanister,Paar\', \'ja/nein\','
-            . ' \'ja/nein\', \'GHS01-GHS09\', \'Arbeitsbereich\', NULL, NULL, \'ja/nein\'),' . "\n"
-            . ' (\'1005\', \'Beatmungsfilter\', NULL, \'0.85\', \'1,2\', NULL, NULL, \'5\', NULL, NULL, \'nein\','
-            . ' \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'04-3-06\', \'Absaugkatheter, CH06 grün\', NULL, \'0.13\', \'0,13\', NULL, NULL, \'1\','
-            . ' NULL, NULL,'
-            . ' NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'04-3-10\', \'Absaugkatheter, CH10 schwarz\', NULL, \'0.13\', \'0,13\', NULL, NULL, \'1\','
-            . ' NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'04-3-18\', \'Absaugkatheter, CH18 rot\', NULL, \'0.13\', \'0,13\', NULL, NULL, \'1\','
-            . ' NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'06-38\', \'Bakterienfilter\', NULL, \'1.25\', \'1,25\', NULL, NULL, \'1\', NULL, NULL, NULL,'
-            . ' \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'05-453\', \'Blockerspritze für Larynxtubus, Erwachsen\', NULL, \'2.6\', \'2,6\', NULL, NULL,'
-            . ' \'1\', NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'04-402\', \'Absaugschlauch mit Fingertip für Accuvac\', NULL, \'1.7\', \'1,7\', NULL, NULL,'
-            . ' \'1\', NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
-            . ' (\'02-580\', \'Einmalbeatmungsbeutel, Erwachsen\', NULL, \'8.9\', \'8,9\', NULL, NULL,'
-            . ' \'1\', NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\''
-             . $endOfSql
-             . 'INSERT INTO `ODS_DB`.`Feuille 1` (`value`) VALUES ('
-             . '\'test@example.org\'),' . "\n"
-             . ' (\'123 45\'),' . "\n"
-             . ' (\'123 \'),' . "\n"
-             . ' (\'test@example.fr\'),' . "\n"
-             . ' (\'https://example.org\'),' . "\n"
-             . ' (\'example.txt\'),' . "\n"
-             . ' (\'\\\'Feuille 1\\\'!A1:A4\'),' . "\n"
-             . ' (\'1,50\'),' . "\n"
-             . ' (\'0.05\'),' . "\n"
-             . ' (\'true\'),' . "\n"
-             . ' (\'12\')'
-             . ($odsEmptyRowsMode ? '' : ',' . "\n" . ' (NULL)')
-             . ($odsEmptyRowsMode ? ';;' : ',' . "\n" . ' (NULL);;'),
-            $sql_query
-        );
+        self::assertSame('CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
+        . 'CREATE TABLE IF NOT EXISTS `ODS_DB`.`Shop` ('
+        . '`Artikelnummer` varchar(7), `Name` varchar(41), `keywords` varchar(15), `EK_Preis` varchar(21),'
+        . ' `Preis` varchar(23), `Details` varchar(10), `addInfo` varchar(22), `Einheit` varchar(3),'
+        . ' `Wirkstoff` varchar(10), `verkuerztHaltbar` varchar(21), `kuehlkette` varchar(7),'
+        . ' `Gebinde` varchar(71), `Verbrauchsnachweis` varchar(7), `Genehmigungspflichtig` varchar(7),'
+        . ' `Gefahrstoff` varchar(11), `GefahrArbeitsbereich` varchar(14), `Verwendungszweck` varchar(10),'
+        . ' `Verbrauch` varchar(10), `showLagerbestand` varchar(7)) '
+        . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
+        . 'CREATE TABLE IF NOT EXISTS `ODS_DB`.`Feuille 1` (`value` varchar(19)) '
+        . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;;'
+        . 'INSERT INTO `ODS_DB`.`Shop` ('
+        . '`Artikelnummer`, `Name`, `keywords`, `EK_Preis`, `Preis`, `Details`, `addInfo`, `Einheit`,'
+        . ' `Wirkstoff`, `verkuerztHaltbar`, `kuehlkette`, `Gebinde`, `Verbrauchsnachweis`,'
+        . ' `Genehmigungspflichtig`, `Gefahrstoff`, `GefahrArbeitsbereich`, `Verwendungszweck`,'
+        . ' `Verbrauch`, `showLagerbestand`) VALUES ('
+        . 'NULL, NULL, \'Schlüsselwörter\', \'Einkaufspreis (Netto)\', \'VK-Preis (Orientierung)\', NULL,'
+        . ' \'Hintergrundinformation\', \'VPE\', NULL, \'verkürzte Haltbarkeit\', \'ja/nein\','
+        . ' \'Stück,Rolle,Pack,Flasche,Sack,Eimer,Karton,Palette,Beutel,Kanister,Paar\', \'ja/nein\','
+        . ' \'ja/nein\', \'GHS01-GHS09\', \'Arbeitsbereich\', NULL, NULL, \'ja/nein\'),' . "\n"
+        . ' (\'1005\', \'Beatmungsfilter\', NULL, \'0.85\', \'1,2\', NULL, NULL, \'5\', NULL, NULL, \'nein\','
+        . ' \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'04-3-06\', \'Absaugkatheter, CH06 grün\', NULL, \'0.13\', \'0,13\', NULL, NULL, \'1\','
+        . ' NULL, NULL,'
+        . ' NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'04-3-10\', \'Absaugkatheter, CH10 schwarz\', NULL, \'0.13\', \'0,13\', NULL, NULL, \'1\','
+        . ' NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'04-3-18\', \'Absaugkatheter, CH18 rot\', NULL, \'0.13\', \'0,13\', NULL, NULL, \'1\','
+        . ' NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'06-38\', \'Bakterienfilter\', NULL, \'1.25\', \'1,25\', NULL, NULL, \'1\', NULL, NULL, NULL,'
+        . ' \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'05-453\', \'Blockerspritze für Larynxtubus, Erwachsen\', NULL, \'2.6\', \'2,6\', NULL, NULL,'
+        . ' \'1\', NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'04-402\', \'Absaugschlauch mit Fingertip für Accuvac\', NULL, \'1.7\', \'1,7\', NULL, NULL,'
+        . ' \'1\', NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\'),' . "\n"
+        . ' (\'02-580\', \'Einmalbeatmungsbeutel, Erwachsen\', NULL, \'8.9\', \'8,9\', NULL, NULL,'
+        . ' \'1\', NULL, NULL, NULL, \'Stück\', \'nein\', \'nein\', NULL, NULL, NULL, NULL, \'ja\''
+         . $endOfSql
+         . 'INSERT INTO `ODS_DB`.`Feuille 1` (`value`) VALUES ('
+         . '\'test@example.org\'),' . "\n"
+         . ' (\'123 45\'),' . "\n"
+         . ' (\'123 \'),' . "\n"
+         . ' (\'test@example.fr\'),' . "\n"
+         . ' (\'https://example.org\'),' . "\n"
+         . ' (\'example.txt\'),' . "\n"
+         . ' (\'\\\'Feuille 1\\\'!A1:A4\'),' . "\n"
+         . ' (\'1,50\'),' . "\n"
+         . ' (\'0.05\'),' . "\n"
+         . ' (\'true\'),' . "\n"
+         . ' (\'12\')'
+         . ($odsEmptyRowsMode ? '' : ',' . "\n" . ' (NULL)')
+         . ($odsEmptyRowsMode ? ';;' : ',' . "\n" . ' (NULL);;'), $sql_query);
 
         //asset that all databases and tables are imported
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'The following structures have either been created or altered.',
             $import_notice
         );
-        $this->assertStringContainsString('Go to database: `ODS_DB`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `ODS_DB`', $import_notice);
-        $this->assertStringContainsString('Go to table: `Shop`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `Shop`', $import_notice);
+        self::assertStringContainsString('Go to database: `ODS_DB`', $import_notice);
+        self::assertStringContainsString('Edit settings for `ODS_DB`', $import_notice);
+        self::assertStringContainsString('Go to table: `Shop`', $import_notice);
+        self::assertStringContainsString('Edit settings for `Shop`', $import_notice);
 
         //asset that the import process is finished
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 }
diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php
index b9f06b56c0..dd2da42084 100644
--- a/test/classes/Plugins/Import/ImportShpTest.php
+++ b/test/classes/Plugins/Import/ImportShpTest.php
@@ -67,8 +67,8 @@ class ImportShpTest extends AbstractTestCase
         $GLOBALS['message'] = '';
         $GLOBALS['error'] = false;
         $this->object->doImport($importHandle);
-        $this->assertEquals('', $GLOBALS['message']);
-        $this->assertFalse($GLOBALS['error']);
+        self::assertSame('', $GLOBALS['message']);
+        self::assertFalse($GLOBALS['error']);
     }
 
     /**
@@ -89,19 +89,10 @@ class ImportShpTest extends AbstractTestCase
     public function testGetProperties(): void
     {
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('ESRI Shape File'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'shp',
-            $properties->getExtension()
-        );
-        $this->assertNull($properties->getOptions());
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
+        self::assertSame(__('ESRI Shape File'), $properties->getText());
+        self::assertSame('shp', $properties->getExtension());
+        self::assertNull($properties->getOptions());
+        self::assertSame(__('Options'), $properties->getOptionsText());
     }
 
     /**
@@ -128,15 +119,12 @@ class ImportShpTest extends AbstractTestCase
             $endsWith = "13.737122 51.0542065)))'),";
         }
 
-        $this->assertStringContainsString(
-            "(GeomFromText('MULTIPOLYGON((("
-            . '13.737122 51.0542065,'
-            . '13.7373039 51.0541298,'
-            . '13.7372661 51.0540944,'
-            . '13.7370842 51.0541711,'
-            . $endsWith,
-            $sql_query
-        );
+        self::assertStringContainsString("(GeomFromText('MULTIPOLYGON((("
+        . '13.737122 51.0542065,'
+        . '13.7373039 51.0541298,'
+        . '13.7372661 51.0540944,'
+        . '13.7370842 51.0541711,'
+        . $endsWith, $sql_query);
     }
 
     /**
@@ -156,34 +144,31 @@ class ImportShpTest extends AbstractTestCase
         $this->runImport('test/test_data/timezone.shp.zip');
 
         // asset that all sql are executed
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'CREATE DATABASE IF NOT EXISTS `SHP_DB` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci',
             $sql_query
         );
 
         // dbase extension will generate different sql statement
         if (extension_loaded('dbase')) {
-            $this->assertStringContainsString(
-                'CREATE TABLE IF NOT EXISTS `SHP_DB`.`TBL_NAME` '
-                . '(`SPATIAL` geometry, `ID` int(2), `AUTHORITY` varchar(25), `NAME` varchar(42)) '
-                . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;',
-                $sql_query
-            );
+            self::assertStringContainsString('CREATE TABLE IF NOT EXISTS `SHP_DB`.`TBL_NAME` '
+            . '(`SPATIAL` geometry, `ID` int(2), `AUTHORITY` varchar(25), `NAME` varchar(42)) '
+            . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;', $sql_query);
 
-            $this->assertStringContainsString(
+            self::assertStringContainsString(
                 'INSERT INTO `SHP_DB`.`TBL_NAME` (`SPATIAL`, `ID`, `AUTHORITY`, `NAME`) VALUES',
                 $sql_query
             );
         } else {
-            $this->assertStringContainsString(
+            self::assertStringContainsString(
                 'CREATE TABLE IF NOT EXISTS `SHP_DB`.`TBL_NAME` (`SPATIAL` geometry)',
                 $sql_query
             );
 
-            $this->assertStringContainsString('INSERT INTO `SHP_DB`.`TBL_NAME` (`SPATIAL`) VALUES', $sql_query);
+            self::assertStringContainsString('INSERT INTO `SHP_DB`.`TBL_NAME` (`SPATIAL`) VALUES', $sql_query);
         }
 
-        $this->assertStringContainsString("GeomFromText('POINT(1294523.1759236", $sql_query);
+        self::assertStringContainsString("GeomFromText('POINT(1294523.1759236", $sql_query);
 
         //asset that all databases and tables are imported
         $this->assertMessages($import_notice);
@@ -196,16 +181,16 @@ class ImportShpTest extends AbstractTestCase
      */
     protected function assertMessages(string $import_notice): void
     {
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'The following structures have either been created or altered.',
             $import_notice
         );
-        $this->assertStringContainsString('Go to database: `SHP_DB`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `SHP_DB`', $import_notice);
-        $this->assertStringContainsString('Go to table: `TBL_NAME`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `TBL_NAME`', $import_notice);
+        self::assertStringContainsString('Go to database: `SHP_DB`', $import_notice);
+        self::assertStringContainsString('Edit settings for `SHP_DB`', $import_notice);
+        self::assertStringContainsString('Go to table: `TBL_NAME`', $import_notice);
+        self::assertStringContainsString('Edit settings for `TBL_NAME`', $import_notice);
 
         //asset that the import process is finished
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 }
diff --git a/test/classes/Plugins/Import/ImportSqlTest.php b/test/classes/Plugins/Import/ImportSqlTest.php
index 6222cf9cd1..352f13351a 100644
--- a/test/classes/Plugins/Import/ImportSqlTest.php
+++ b/test/classes/Plugins/Import/ImportSqlTest.php
@@ -75,13 +75,13 @@ class ImportSqlTest extends AbstractTestCase
         $this->object->doImport($importHandle);
 
         //asset that all sql are executed
-        $this->assertStringContainsString('SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"', $sql_query);
-        $this->assertStringContainsString('CREATE TABLE IF NOT EXISTS `pma_bookmark`', $sql_query);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"', $sql_query);
+        self::assertStringContainsString('CREATE TABLE IF NOT EXISTS `pma_bookmark`', $sql_query);
+        self::assertStringContainsString(
             'INSERT INTO `pma_bookmark` (`id`, `dbase`, `user`, `label`, `query`) VALUES',
             $sql_query
         );
 
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertTrue($GLOBALS['finished']);
     }
 }
diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php
index c90bb97e1c..65f261f283 100644
--- a/test/classes/Plugins/Import/ImportXmlTest.php
+++ b/test/classes/Plugins/Import/ImportXmlTest.php
@@ -63,23 +63,11 @@ class ImportXmlTest extends AbstractTestCase
     public function testGetProperties(): void
     {
         $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('XML'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'xml',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            'text/xml',
-            $properties->getMimeType()
-        );
-        $this->assertNull($properties->getOptions());
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
+        self::assertSame(__('XML'), $properties->getText());
+        self::assertSame('xml', $properties->getExtension());
+        self::assertSame('text/xml', $properties->getMimeType());
+        self::assertNull($properties->getOptions());
+        self::assertSame(__('Options'), $properties->getOptionsText());
     }
 
     /**
@@ -119,14 +107,14 @@ class ImportXmlTest extends AbstractTestCase
         */
 
         //asset that all databases and tables are imported
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'The following structures have either been created or altered.',
             $import_notice
         );
-        $this->assertStringContainsString('Go to database: `phpmyadmintest`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `phpmyadmintest`', $import_notice);
-        $this->assertStringContainsString('Go to table: `pma_bookmarktest`', $import_notice);
-        $this->assertStringContainsString('Edit settings for `pma_bookmarktest`', $import_notice);
-        $this->assertTrue($GLOBALS['finished']);
+        self::assertStringContainsString('Go to database: `phpmyadmintest`', $import_notice);
+        self::assertStringContainsString('Edit settings for `phpmyadmintest`', $import_notice);
+        self::assertStringContainsString('Go to table: `pma_bookmarktest`', $import_notice);
+        self::assertStringContainsString('Edit settings for `pma_bookmarktest`', $import_notice);
+        self::assertTrue($GLOBALS['finished']);
     }
 }
diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
index 679c8b8a0b..0dea54e7e2 100644
--- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
@@ -59,10 +59,10 @@ class DiaRelationSchemaTest extends AbstractTestCase
      */
     public function testSetProperty(): void
     {
-        $this->assertEquals(33, $this->object->getPageNumber());
-        $this->assertTrue($this->object->isShowColor());
-        $this->assertTrue($this->object->isShowKeys());
-        $this->assertEquals('L', $this->object->getOrientation());
-        $this->assertEquals('paper', $this->object->getPaper());
+        self::assertSame(33, $this->object->getPageNumber());
+        self::assertTrue($this->object->isShowColor());
+        self::assertTrue($this->object->isShowKeys());
+        self::assertSame('L', $this->object->getOrientation());
+        self::assertSame('paper', $this->object->getPaper());
     }
 }
diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
index aaaeb11612..1a0cdf5659 100644
--- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
@@ -59,12 +59,12 @@ class EpsRelationSchemaTest extends AbstractTestCase
      */
     public function testConstructor(): void
     {
-        $this->assertEquals(33, $this->object->getPageNumber());
-        $this->assertTrue($this->object->isShowColor());
-        $this->assertTrue($this->object->isShowKeys());
-        $this->assertTrue($this->object->isTableDimension());
-        $this->assertTrue($this->object->isAllTableSameWidth());
-        $this->assertEquals('L', $this->object->getOrientation());
+        self::assertSame(33, $this->object->getPageNumber());
+        self::assertTrue($this->object->isShowColor());
+        self::assertTrue($this->object->isShowKeys());
+        self::assertTrue($this->object->isTableDimension());
+        self::assertTrue($this->object->isAllTableSameWidth());
+        self::assertSame('L', $this->object->getOrientation());
     }
 
     /**
@@ -75,6 +75,6 @@ class EpsRelationSchemaTest extends AbstractTestCase
     public function testSetPageNumber(): void
     {
         $this->object->setPageNumber(33);
-        $this->assertEquals(33, $this->object->getPageNumber());
+        self::assertSame(33, $this->object->getPageNumber());
     }
 }
diff --git a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
index bca05ad3a6..a769d57995 100644
--- a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
@@ -44,10 +44,7 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetPageNumber(): void
     {
         $this->object->setPageNumber(33);
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
+        self::assertSame(33, $this->object->getPageNumber());
     }
 
     /**
@@ -58,13 +55,9 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetShowColor(): void
     {
         $this->object->setShowColor(true);
-        $this->assertTrue(
-            $this->object->isShowColor()
-        );
+        self::assertTrue($this->object->isShowColor());
         $this->object->setShowColor(false);
-        $this->assertFalse(
-            $this->object->isShowColor()
-        );
+        self::assertFalse($this->object->isShowColor());
     }
 
     /**
@@ -75,15 +68,9 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetOrientation(): void
     {
         $this->object->setOrientation('P');
-        $this->assertEquals(
-            'P',
-            $this->object->getOrientation()
-        );
+        self::assertSame('P', $this->object->getOrientation());
         $this->object->setOrientation('A');
-        $this->assertEquals(
-            'L',
-            $this->object->getOrientation()
-        );
+        self::assertSame('L', $this->object->getOrientation());
     }
 
     /**
@@ -94,13 +81,9 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetTableDimension(): void
     {
         $this->object->setTableDimension(true);
-        $this->assertTrue(
-            $this->object->isTableDimension()
-        );
+        self::assertTrue($this->object->isTableDimension());
         $this->object->setTableDimension(false);
-        $this->assertFalse(
-            $this->object->isTableDimension()
-        );
+        self::assertFalse($this->object->isTableDimension());
     }
 
     /**
@@ -111,15 +94,9 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetPaper(): void
     {
         $this->object->setPaper('A5');
-        $this->assertEquals(
-            'A5',
-            $this->object->getPaper()
-        );
+        self::assertSame('A5', $this->object->getPaper());
         $this->object->setPaper('A4');
-        $this->assertEquals(
-            'A4',
-            $this->object->getPaper()
-        );
+        self::assertSame('A4', $this->object->getPaper());
     }
 
     /**
@@ -130,13 +107,9 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetAllTablesSameWidth(): void
     {
         $this->object->setAllTablesSameWidth(true);
-        $this->assertTrue(
-            $this->object->isAllTableSameWidth()
-        );
+        self::assertTrue($this->object->isAllTableSameWidth());
         $this->object->setAllTablesSameWidth(false);
-        $this->assertFalse(
-            $this->object->isAllTableSameWidth()
-        );
+        self::assertFalse($this->object->isAllTableSameWidth());
     }
 
     /**
@@ -147,12 +120,8 @@ class ExportRelationSchemaTest extends AbstractTestCase
     public function testSetShowKeys(): void
     {
         $this->object->setShowKeys(true);
-        $this->assertTrue(
-            $this->object->isShowKeys()
-        );
+        self::assertTrue($this->object->isShowKeys());
         $this->object->setShowKeys(false);
-        $this->assertFalse(
-            $this->object->isShowKeys()
-        );
+        self::assertFalse($this->object->isShowKeys());
     }
 }
diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
index c43e21431d..122304606a 100644
--- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
@@ -62,13 +62,13 @@ class PdfRelationSchemaTest extends AbstractTestCase
      */
     public function testConstructor(): void
     {
-        $this->assertEquals(33, $this->object->getPageNumber());
-        $this->assertTrue($this->object->isShowGrid());
-        $this->assertTrue($this->object->isShowColor());
-        $this->assertTrue($this->object->isShowKeys());
-        $this->assertTrue($this->object->isTableDimension());
-        $this->assertTrue($this->object->isAllTableSameWidth());
-        $this->assertEquals('L', $this->object->getOrientation());
-        $this->assertEquals('paper', $this->object->getPaper());
+        self::assertSame(33, $this->object->getPageNumber());
+        self::assertTrue($this->object->isShowGrid());
+        self::assertTrue($this->object->isShowColor());
+        self::assertTrue($this->object->isShowKeys());
+        self::assertTrue($this->object->isTableDimension());
+        self::assertTrue($this->object->isAllTableSameWidth());
+        self::assertSame('L', $this->object->getOrientation());
+        self::assertSame('paper', $this->object->getPaper());
     }
 }
diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
index 1d3610cf56..13f7cf0667 100644
--- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
@@ -63,10 +63,10 @@ class SvgRelationSchemaTest extends AbstractTestCase
      */
     public function testConstructor(): void
     {
-        $this->assertEquals(33, $this->object->getPageNumber());
-        $this->assertTrue($this->object->isShowColor());
-        $this->assertTrue($this->object->isShowKeys());
-        $this->assertTrue($this->object->isTableDimension());
-        $this->assertTrue($this->object->isAllTableSameWidth());
+        self::assertSame(33, $this->object->getPageNumber());
+        self::assertTrue($this->object->isShowColor());
+        self::assertTrue($this->object->isShowKeys());
+        self::assertTrue($this->object->isTableDimension());
+        self::assertTrue($this->object->isAllTableSameWidth());
     }
 }
diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
index 2dabd42450..93573eb3fc 100644
--- a/test/classes/Plugins/Transformations/TransformationPluginsTest.php
+++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
@@ -717,10 +717,7 @@ class TransformationPluginsTest extends AbstractTestCase
         }
 
         $reflectionMethod = new ReflectionMethod($object, $method);
-        $this->assertEquals(
-            $expected,
-            $reflectionMethod->invokeArgs($object, $args)
-        );
+        self::assertEquals($expected, $reflectionMethod->invokeArgs($object, $args));
     }
 
     /**
@@ -1273,17 +1270,11 @@ class TransformationPluginsTest extends AbstractTestCase
         string $error = ''
     ): void {
         $reflectionMethod = new ReflectionMethod($object, 'applyTransformation');
-        $this->assertEquals(
-            $transformed,
-            $reflectionMethod->invokeArgs($object, $applyArgs)
-        );
+        self::assertEquals($transformed, $reflectionMethod->invokeArgs($object, $applyArgs));
 
         // For output transformation plugins, this method may not exist
         if (method_exists($object, 'isSuccess')) {
-            $this->assertEquals(
-                $success,
-                $object->isSuccess()
-            );
+            self::assertSame($success, $object->isSuccess());
         }
 
         // For output transformation plugins, this method may not exist
@@ -1291,9 +1282,6 @@ class TransformationPluginsTest extends AbstractTestCase
             return;
         }
 
-        $this->assertEquals(
-            $error,
-            $object->getError()
-        );
+        self::assertSame($error, $object->getError());
     }
 }
diff --git a/test/classes/Plugins/TwoFactor/KeyTest.php b/test/classes/Plugins/TwoFactor/KeyTest.php
index 57118c426a..209748435e 100644
--- a/test/classes/Plugins/TwoFactor/KeyTest.php
+++ b/test/classes/Plugins/TwoFactor/KeyTest.php
@@ -40,6 +40,6 @@ class KeyTest extends AbstractTestCase
                 'index' => 0,
             ],
         ];
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 }
diff --git a/test/classes/Plugins/TwoFactor/WebAuthnTest.php b/test/classes/Plugins/TwoFactor/WebAuthnTest.php
index 8c1b52ff97..14acd759be 100644
--- a/test/classes/Plugins/TwoFactor/WebAuthnTest.php
+++ b/test/classes/Plugins/TwoFactor/WebAuthnTest.php
@@ -25,9 +25,9 @@ class WebAuthnTest extends AbstractTestCase
 {
     public function testIdNameAndDescription(): void
     {
-        $this->assertSame('WebAuthn', WebAuthn::$id);
-        $this->assertSame('Hardware Security Key (WebAuthn/FIDO2)', WebAuthn::getName());
-        $this->assertSame(
+        self::assertSame('WebAuthn', WebAuthn::$id);
+        self::assertSame('Hardware Security Key (WebAuthn/FIDO2)', WebAuthn::getName());
+        self::assertSame(
             'Provides authentication using hardware security tokens supporting the WebAuthn/FIDO2 protocol,'
             . ' such as a YubiKey.',
             WebAuthn::getDescription()
@@ -83,18 +83,18 @@ class WebAuthnTest extends AbstractTestCase
         $actual = $webAuthn->render();
 
         $optionsFromSession = $_SESSION['WebAuthnCredentialRequestOptions'] ?? null;
-        $this->assertIsString($optionsFromSession);
-        $this->assertJson($optionsFromSession);
-        $this->assertEquals($expectedRequestOptions, json_decode($optionsFromSession, true));
+        self::assertIsString($optionsFromSession);
+        self::assertJson($optionsFromSession);
+        self::assertSame($expectedRequestOptions, json_decode($optionsFromSession, true));
 
-        $this->assertStringContainsString('id="webauthn_request_response"', $actual);
-        $this->assertStringContainsString('name="webauthn_request_response"', $actual);
-        $this->assertStringContainsString('value=""', $actual);
-        $this->assertStringContainsString('data-request-options="', $actual);
-        $this->assertSame('', $webAuthn->getError());
+        self::assertStringContainsString('id="webauthn_request_response"', $actual);
+        self::assertStringContainsString('name="webauthn_request_response"', $actual);
+        self::assertStringContainsString('value=""', $actual);
+        self::assertStringContainsString('data-request-options="', $actual);
+        self::assertSame('', $webAuthn->getError());
 
         $files = ResponseRenderer::getInstance()->getHeader()->getScripts()->getFiles();
-        $this->assertContains('webauthn.js', array_column($files, 'name'));
+        self::assertContains('webauthn.js', array_column($files, 'name'));
     }
 
     public function testSetup(): void
@@ -134,18 +134,18 @@ class WebAuthnTest extends AbstractTestCase
         $actual = $webAuthn->setup();
 
         $optionsFromSession = $_SESSION['WebAuthnCredentialCreationOptions'] ?? null;
-        $this->assertIsString($optionsFromSession);
-        $this->assertJson($optionsFromSession);
-        $this->assertEquals($expectedCreationOptions, json_decode($optionsFromSession, true));
+        self::assertIsString($optionsFromSession);
+        self::assertJson($optionsFromSession);
+        self::assertSame($expectedCreationOptions, json_decode($optionsFromSession, true));
 
-        $this->assertStringContainsString('id="webauthn_creation_response"', $actual);
-        $this->assertStringContainsString('name="webauthn_creation_response"', $actual);
-        $this->assertStringContainsString('value=""', $actual);
-        $this->assertStringContainsString('data-creation-options="', $actual);
-        $this->assertSame('', $webAuthn->getError());
+        self::assertStringContainsString('id="webauthn_creation_response"', $actual);
+        self::assertStringContainsString('name="webauthn_creation_response"', $actual);
+        self::assertStringContainsString('value=""', $actual);
+        self::assertStringContainsString('data-creation-options="', $actual);
+        self::assertSame('', $webAuthn->getError());
 
         $files = ResponseRenderer::getInstance()->getHeader()->getScripts()->getFiles();
-        $this->assertContains('webauthn.js', array_column($files, 'name'));
+        self::assertContains('webauthn.js', array_column($files, 'name'));
     }
 
     public function testConfigure(): void
@@ -155,8 +155,8 @@ class WebAuthnTest extends AbstractTestCase
         $request->method('getParsedBodyParam')->willReturnMap([['webauthn_creation_response', '', '']]);
         $GLOBALS['request'] = $request;
         $webAuthn = new WebAuthn($this->createStub(TwoFactor::class));
-        $this->assertFalse($webAuthn->configure());
-        $this->assertSame('', $webAuthn->getError());
+        self::assertFalse($webAuthn->configure());
+        self::assertSame('', $webAuthn->getError());
     }
 
     public function testConfigure2(): void
@@ -166,8 +166,8 @@ class WebAuthnTest extends AbstractTestCase
         $request->method('getParsedBodyParam')->willReturnMap([['webauthn_creation_response', '', '{}']]);
         $GLOBALS['request'] = $request;
         $webAuthn = new WebAuthn($this->createStub(TwoFactor::class));
-        $this->assertFalse($webAuthn->configure());
-        $this->assertStringContainsString('Two-factor authentication failed:', $webAuthn->getError());
+        self::assertFalse($webAuthn->configure());
+        self::assertStringContainsString('Two-factor authentication failed:', $webAuthn->getError());
     }
 
     public function testConfigure3(): void
@@ -183,8 +183,8 @@ class WebAuthnTest extends AbstractTestCase
 
         $webAuthn = new WebAuthn($this->createStub(TwoFactor::class));
         $webAuthn->setServer($server);
-        $this->assertFalse($webAuthn->configure());
-        $this->assertStringContainsString('Two-factor authentication failed.', $webAuthn->getError());
+        self::assertFalse($webAuthn->configure());
+        self::assertStringContainsString('Two-factor authentication failed.', $webAuthn->getError());
     }
 
     public function testConfigure4(): void
@@ -208,19 +208,16 @@ class WebAuthnTest extends AbstractTestCase
 
         $webAuthn = new WebAuthn($twoFactor);
         $webAuthn->setServer($server);
-        $this->assertTrue($webAuthn->configure());
+        self::assertTrue($webAuthn->configure());
         /** @psalm-var array{backend: string, settings: mixed[]} $config */
         $config = $twoFactor->config;
-        $this->assertSame(
-            [
-                'backend' => '',
-                'settings' => [
-                    'userHandle' => 'userHandle',
-                    'credentials' => ['cHVibGljS2V5Q3JlZGVudGlhbElkMQ==' => $credential],
-                ],
+        self::assertSame([
+            'backend' => '',
+            'settings' => [
+                'userHandle' => 'userHandle',
+                'credentials' => ['cHVibGljS2V5Q3JlZGVudGlhbElkMQ==' => $credential],
             ],
-            $config
-        );
+        ], $config);
     }
 
     public function testCheck(): void
@@ -230,8 +227,8 @@ class WebAuthnTest extends AbstractTestCase
         $request->method('getParsedBodyParam')->willReturnMap([['webauthn_request_response', '', '']]);
         $GLOBALS['request'] = $request;
         $webAuthn = new WebAuthn($this->createStub(TwoFactor::class));
-        $this->assertFalse($webAuthn->check());
-        $this->assertSame('', $webAuthn->getError());
+        self::assertFalse($webAuthn->check());
+        self::assertSame('', $webAuthn->getError());
     }
 
     public function testCheck2(): void
@@ -241,8 +238,8 @@ class WebAuthnTest extends AbstractTestCase
         $request->method('getParsedBodyParam')->willReturnMap([['webauthn_request_response', '', '{}']]);
         $GLOBALS['request'] = $request;
         $webAuthn = new WebAuthn($this->createStub(TwoFactor::class));
-        $this->assertFalse($webAuthn->check());
-        $this->assertStringContainsString('Two-factor authentication failed:', $webAuthn->getError());
+        self::assertFalse($webAuthn->check());
+        self::assertStringContainsString('Two-factor authentication failed:', $webAuthn->getError());
     }
 
     public function testCheck3(): void
@@ -258,8 +255,8 @@ class WebAuthnTest extends AbstractTestCase
 
         $webAuthn = new WebAuthn($this->createStub(TwoFactor::class));
         $webAuthn->setServer($server);
-        $this->assertFalse($webAuthn->check());
-        $this->assertStringContainsString('Two-factor authentication failed.', $webAuthn->getError());
+        self::assertFalse($webAuthn->check());
+        self::assertStringContainsString('Two-factor authentication failed.', $webAuthn->getError());
     }
 
     public function testCheck4(): void
@@ -294,6 +291,6 @@ class WebAuthnTest extends AbstractTestCase
 
         $webAuthn = new WebAuthn($twoFactor);
         $webAuthn->setServer($server);
-        $this->assertTrue($webAuthn->check());
+        self::assertTrue($webAuthn->check());
     }
 }
diff --git a/test/classes/PluginsTest.php b/test/classes/PluginsTest.php
index 667fec0988..6d0c2f49ca 100644
--- a/test/classes/PluginsTest.php
+++ b/test/classes/PluginsTest.php
@@ -17,10 +17,10 @@ class PluginsTest extends AbstractTestCase
 
         $GLOBALS['server'] = 1;
         $plugins = Plugins::getExport('database', false);
-        $this->assertEquals(['export_type' => 'database', 'single_table' => false], $plugin_param);
-        $this->assertIsArray($plugins);
-        $this->assertCount(14, $plugins);
-        $this->assertContainsOnlyInstancesOf(Plugins\ExportPlugin::class, $plugins);
+        self::assertSame(['export_type' => 'database', 'single_table' => false], $plugin_param);
+        self::assertIsArray($plugins);
+        self::assertCount(14, $plugins);
+        self::assertContainsOnlyInstancesOf(Plugins\ExportPlugin::class, $plugins);
     }
 
     public function testGetImport(): void
@@ -28,18 +28,18 @@ class PluginsTest extends AbstractTestCase
         global $plugin_param;
 
         $plugins = Plugins::getImport('database');
-        $this->assertEquals('database', $plugin_param);
-        $this->assertIsArray($plugins);
-        $this->assertCount(6, $plugins);
-        $this->assertContainsOnlyInstancesOf(Plugins\ImportPlugin::class, $plugins);
+        self::assertSame('database', $plugin_param);
+        self::assertIsArray($plugins);
+        self::assertCount(6, $plugins);
+        self::assertContainsOnlyInstancesOf(Plugins\ImportPlugin::class, $plugins);
     }
 
     public function testGetSchema(): void
     {
         $plugins = Plugins::getSchema();
-        $this->assertIsArray($plugins);
-        $this->assertCount(4, $plugins);
-        $this->assertContainsOnlyInstancesOf(Plugins\SchemaPlugin::class, $plugins);
+        self::assertIsArray($plugins);
+        self::assertCount(4, $plugins);
+        self::assertContainsOnlyInstancesOf(Plugins\SchemaPlugin::class, $plugins);
     }
 
     /**
@@ -72,7 +72,7 @@ class PluginsTest extends AbstractTestCase
         /** @psalm-suppress InvalidArrayOffset, PossiblyInvalidArrayAssignment */
         $cfg[$section][$option] = $actualConfig;
         $default = Plugins::getDefault($section, $option);
-        $this->assertSame($expected, $default);
+        self::assertSame($expected, $default);
     }
 
     /**
@@ -119,6 +119,6 @@ class PluginsTest extends AbstractTestCase
             ['name' => 'sql', 'text' => 'SQL', 'is_selected' => false, 'force_file' => false],
             ['name' => 'xml', 'text' => 'XML', 'is_selected' => true, 'force_file' => false],
         ];
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 }
diff --git a/test/classes/ProfilingTest.php b/test/classes/ProfilingTest.php
index eb73b8711c..efe30ff903 100644
--- a/test/classes/ProfilingTest.php
+++ b/test/classes/ProfilingTest.php
@@ -20,10 +20,10 @@ class ProfilingTest extends AbstractTestCase
 
         SessionCache::set('profiling_supported', true);
         $condition = Profiling::isSupported($dbi);
-        $this->assertTrue($condition);
+        self::assertTrue($condition);
 
         SessionCache::set('profiling_supported', false);
         $condition = Profiling::isSupported($dbi);
-        $this->assertFalse($condition);
+        self::assertFalse($condition);
     }
 }
diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php
index c5bb946e1f..c6361e560b 100644
--- a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php
+++ b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php
@@ -35,9 +35,6 @@ class OptionsPropertyMainGroupTest extends AbstractTestCase
 
     public function testGetItemType(): void
     {
-        $this->assertEquals(
-            'main',
-            $this->object->getItemType()
-        );
+        self::assertSame('main', $this->object->getItemType());
     }
 }
diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php
index 85a4746ffd..6d703225ff 100644
--- a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php
+++ b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php
@@ -35,10 +35,7 @@ class OptionsPropertyRootGroupTest extends AbstractTestCase
 
     public function testGetItemType(): void
     {
-        $this->assertEquals(
-            'root',
-            $this->object->getItemType()
-        );
+        self::assertSame('root', $this->object->getItemType());
     }
 
     /**
@@ -46,6 +43,6 @@ class OptionsPropertyRootGroupTest extends AbstractTestCase
      */
     public function testCountable(): void
     {
-        $this->assertCount(0, $this->object);
+        self::assertCount(0, $this->object);
     }
 }
diff --git a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
index 284fe54952..d64bcc99c5 100644
--- a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
+++ b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
@@ -35,10 +35,7 @@ class OptionsPropertySubgroupTest extends AbstractTestCase
 
     public function testGetItemType(): void
     {
-        $this->assertEquals(
-            'subgroup',
-            $this->object->getItemType()
-        );
+        self::assertSame('subgroup', $this->object->getItemType());
     }
 
     /**
@@ -50,9 +47,6 @@ class OptionsPropertySubgroupTest extends AbstractTestCase
     {
         $this->object->setSubgroupHeader('subGroupHeader123');
 
-        $this->assertEquals(
-            'subGroupHeader123',
-            $this->object->getSubgroupHeader()
-        );
+        self::assertSame('subGroupHeader123', $this->object->getSubgroupHeader());
     }
 }
diff --git a/test/classes/Properties/Options/Items/PropertyItemsTest.php b/test/classes/Properties/Options/Items/PropertyItemsTest.php
index da6c9ddc85..df20b26d22 100644
--- a/test/classes/Properties/Options/Items/PropertyItemsTest.php
+++ b/test/classes/Properties/Options/Items/PropertyItemsTest.php
@@ -22,103 +22,70 @@ class PropertyItemsTest extends AbstractTestCase
     {
         $object = new BoolPropertyItem(null, 'Text');
 
-        $this->assertEquals(
-            'Text',
-            $object->getText()
-        );
+        self::assertSame('Text', $object->getText());
 
         $object->setText('xtext2');
 
-        $this->assertEquals(
-            'xtext2',
-            $object->getText()
-        );
+        self::assertSame('xtext2', $object->getText());
     }
 
     public function testBoolName(): void
     {
         $object = new BoolPropertyItem('xname');
 
-        $this->assertEquals(
-            'xname',
-            $object->getName()
-        );
+        self::assertSame('xname', $object->getName());
 
         $object->setName('xname2');
 
-        $this->assertEquals(
-            'xname2',
-            $object->getName()
-        );
+        self::assertSame('xname2', $object->getName());
     }
 
     public function testBoolGetItemType(): void
     {
         $object = new BoolPropertyItem();
 
-        $this->assertEquals(
-            'bool',
-            $object->getItemType()
-        );
+        self::assertSame('bool', $object->getItemType());
     }
 
     public function testGetItemTypeDoc(): void
     {
         $object = new DocPropertyItem();
 
-        $this->assertEquals(
-            'doc',
-            $object->getItemType()
-        );
+        self::assertSame('doc', $object->getItemType());
     }
 
     public function testGetItemTypeHidden(): void
     {
         $object = new HiddenPropertyItem();
 
-        $this->assertEquals(
-            'hidden',
-            $object->getItemType()
-        );
+        self::assertSame('hidden', $object->getItemType());
     }
 
     public function testGetItemTypeMessageOnly(): void
     {
         $object = new MessageOnlyPropertyItem();
 
-        $this->assertEquals(
-            'messageOnly',
-            $object->getItemType()
-        );
+        self::assertSame('messageOnly', $object->getItemType());
     }
 
     public function testGetItemTypeRadio(): void
     {
         $object = new RadioPropertyItem();
 
-        $this->assertEquals(
-            'radio',
-            $object->getItemType()
-        );
+        self::assertSame('radio', $object->getItemType());
     }
 
     public function testGetItemTypeSelect(): void
     {
         $object = new SelectPropertyItem();
 
-        $this->assertEquals(
-            'select',
-            $object->getItemType()
-        );
+        self::assertSame('select', $object->getItemType());
     }
 
     public function testGetItemTypeText(): void
     {
         $object = new TextPropertyItem();
 
-        $this->assertEquals(
-            'text',
-            $object->getItemType()
-        );
+        self::assertSame('text', $object->getItemType());
     }
 }
diff --git a/test/classes/Properties/Options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php
index 1b97753307..94d7dd5462 100644
--- a/test/classes/Properties/Options/OptionsPropertyGroupTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php
@@ -45,15 +45,12 @@ class OptionsPropertyGroupTest extends AbstractTestCase
         $this->stub->addProperty(2);
         $this->stub->addProperty('2');
 
-        $this->assertEquals(
-            [
-                1,
-                2,
-                3,
-                '2',
-            ],
-            $properties->getValue($this->stub)
-        );
+        self::assertSame([
+            1,
+            2,
+            3,
+            '2',
+        ], $properties->getValue($this->stub));
     }
 
     public function testRemoveProperty(): void
@@ -64,22 +61,16 @@ class OptionsPropertyGroupTest extends AbstractTestCase
         $properties->setValue($this->stub, [1, 2, 'test', 3]);
         $this->stub->removeProperty('test');
 
-        $this->assertEquals(
-            [
-                0 => 1,
-                1 => 2,
-                3 => 3,
-            ],
-            $properties->getValue($this->stub)
-        );
+        self::assertSame([
+            0 => 1,
+            1 => 2,
+            3 => 3,
+        ], $properties->getValue($this->stub));
     }
 
     public function testGetGroup(): void
     {
-        $this->assertInstanceOf(
-            OptionsPropertyGroup::class,
-            $this->stub->getGroup()
-        );
+        self::assertInstanceOf(OptionsPropertyGroup::class, $this->stub->getGroup());
     }
 
     public function testGetProperties(): void
@@ -88,14 +79,11 @@ class OptionsPropertyGroupTest extends AbstractTestCase
         $properties->setAccessible(true);
         $properties->setValue($this->stub, [1, 2, 3]);
 
-        $this->assertEquals(
-            [
-                1,
-                2,
-                3,
-            ],
-            $this->stub->getProperties()
-        );
+        self::assertSame([
+            1,
+            2,
+            3,
+        ], $this->stub->getProperties());
     }
 
     public function testGetNrOfProperties(): void
@@ -104,9 +92,6 @@ class OptionsPropertyGroupTest extends AbstractTestCase
         $properties->setAccessible(true);
         $properties->setValue($this->stub, [1, 2, 3]);
 
-        $this->assertEquals(
-            3,
-            $this->stub->getNrOfProperties()
-        );
+        self::assertSame(3, $this->stub->getNrOfProperties());
     }
 }
diff --git a/test/classes/Properties/Options/OptionsPropertyItemTest.php b/test/classes/Properties/Options/OptionsPropertyItemTest.php
index 7968aa563a..471c49bf0e 100644
--- a/test/classes/Properties/Options/OptionsPropertyItemTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyItemTest.php
@@ -43,10 +43,7 @@ class OptionsPropertyItemTest extends AbstractTestCase
     {
         $this->stub->setName('name123');
 
-        $this->assertEquals(
-            'name123',
-            $this->stub->getName()
-        );
+        self::assertSame('name123', $this->stub->getName());
     }
 
     /**
@@ -58,10 +55,7 @@ class OptionsPropertyItemTest extends AbstractTestCase
     {
         $this->stub->setText('text123');
 
-        $this->assertEquals(
-            'text123',
-            $this->stub->getText()
-        );
+        self::assertSame('text123', $this->stub->getText());
     }
 
     /**
@@ -73,17 +67,11 @@ class OptionsPropertyItemTest extends AbstractTestCase
     {
         $this->stub->setForce('force123');
 
-        $this->assertEquals(
-            'force123',
-            $this->stub->getForce()
-        );
+        self::assertSame('force123', $this->stub->getForce());
     }
 
     public function testGetPropertyType(): void
     {
-        $this->assertEquals(
-            'options',
-            $this->stub->getPropertyType()
-        );
+        self::assertSame('options', $this->stub->getPropertyType());
     }
 }
diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
index 6faa5c4872..8c8f156ab2 100644
--- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
@@ -43,13 +43,10 @@ class OptionsPropertyOneItemTest extends AbstractTestCase
     {
         $this->stub->setValues([1, 2]);
 
-        $this->assertEquals(
-            [
-                1,
-                2,
-            ],
-            $this->stub->getValues()
-        );
+        self::assertSame([
+            1,
+            2,
+        ], $this->stub->getValues());
     }
 
     /**
@@ -61,10 +58,7 @@ class OptionsPropertyOneItemTest extends AbstractTestCase
     {
         $this->stub->setLen(12);
 
-        $this->assertEquals(
-            12,
-            $this->stub->getLen()
-        );
+        self::assertSame(12, $this->stub->getLen());
     }
 
     /**
@@ -76,10 +70,7 @@ class OptionsPropertyOneItemTest extends AbstractTestCase
     {
         $this->stub->setForce('force123');
 
-        $this->assertEquals(
-            'force123',
-            $this->stub->getForce()
-        );
+        self::assertSame('force123', $this->stub->getForce());
     }
 
     /**
@@ -91,10 +82,7 @@ class OptionsPropertyOneItemTest extends AbstractTestCase
     {
         $this->stub->setDoc('doc123');
 
-        $this->assertEquals(
-            'doc123',
-            $this->stub->getDoc()
-        );
+        self::assertSame('doc123', $this->stub->getDoc());
     }
 
     /**
@@ -106,9 +94,6 @@ class OptionsPropertyOneItemTest extends AbstractTestCase
     {
         $this->stub->setSize(22);
 
-        $this->assertEquals(
-            22,
-            $this->stub->getSize()
-        );
+        self::assertSame(22, $this->stub->getSize());
     }
 }
diff --git a/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
index 69d5a62cf2..ff5b0b9927 100644
--- a/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
+++ b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
@@ -34,10 +34,7 @@ class ExportPluginPropertiesTest extends ImportPluginPropertiesTest
 
     public function testGetItemType(): void
     {
-        $this->assertEquals(
-            'export',
-            $this->object->getItemType()
-        );
+        self::assertSame('export', $this->object->getItemType());
     }
 
     /**
@@ -49,8 +46,6 @@ class ExportPluginPropertiesTest extends ImportPluginPropertiesTest
     {
         $this->object->setForceFile(true);
 
-        $this->assertTrue(
-            $this->object->getForceFile()
-        );
+        self::assertTrue($this->object->getForceFile());
     }
 }
diff --git a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php
index 9e74b6fe70..7285228241 100644
--- a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php
+++ b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php
@@ -35,10 +35,7 @@ class ImportPluginPropertiesTest extends AbstractTestCase
 
     public function testGetItemType(): void
     {
-        $this->assertEquals(
-            'import',
-            $this->object->getItemType()
-        );
+        self::assertSame('import', $this->object->getItemType());
     }
 
     /**
@@ -50,10 +47,7 @@ class ImportPluginPropertiesTest extends AbstractTestCase
     {
         $this->object->setOptionsText('options123');
 
-        $this->assertEquals(
-            'options123',
-            $this->object->getOptionsText()
-        );
+        self::assertSame('options123', $this->object->getOptionsText());
     }
 
     /**
@@ -65,9 +59,6 @@ class ImportPluginPropertiesTest extends AbstractTestCase
     {
         $this->object->setMimeType('mime123');
 
-        $this->assertEquals(
-            'mime123',
-            $this->object->getMimeType()
-        );
+        self::assertSame('mime123', $this->object->getMimeType());
     }
 }
diff --git a/test/classes/Properties/Plugins/PluginPropertyItemTest.php b/test/classes/Properties/Plugins/PluginPropertyItemTest.php
index e905310fd3..d2bca8daf0 100644
--- a/test/classes/Properties/Plugins/PluginPropertyItemTest.php
+++ b/test/classes/Properties/Plugins/PluginPropertyItemTest.php
@@ -35,9 +35,6 @@ class PluginPropertyItemTest extends AbstractTestCase
 
     public function testGetPropertyType(): void
     {
-        $this->assertEquals(
-            'plugin',
-            $this->stub->getPropertyType()
-        );
+        self::assertSame('plugin', $this->stub->getPropertyType());
     }
 }
diff --git a/test/classes/Properties/PropertyItemTest.php b/test/classes/Properties/PropertyItemTest.php
index b32727c5bf..322926b604 100644
--- a/test/classes/Properties/PropertyItemTest.php
+++ b/test/classes/Properties/PropertyItemTest.php
@@ -36,9 +36,6 @@ class PropertyItemTest extends AbstractTestCase
 
     public function testGetGroup(): void
     {
-        $this->assertEquals(
-            null,
-            $this->stub->getGroup()
-        );
+        self::assertNull($this->stub->getGroup());
     }
 }
diff --git a/test/classes/Query/CompatibilityTest.php b/test/classes/Query/CompatibilityTest.php
index a3f9b8b7ea..d851e61662 100644
--- a/test/classes/Query/CompatibilityTest.php
+++ b/test/classes/Query/CompatibilityTest.php
@@ -18,7 +18,7 @@ class CompatibilityTest extends TestCase
      */
     public function testHasAccountLocking(bool $expected, bool $isMariaDb, int $version): void
     {
-        $this->assertSame($expected, Compatibility::hasAccountLocking($isMariaDb, $version));
+        self::assertSame($expected, Compatibility::hasAccountLocking($isMariaDb, $version));
     }
 
     /**
@@ -47,7 +47,7 @@ class CompatibilityTest extends TestCase
         $dbiStub->method('isMariaDB')->willReturn($isMariaDb);
         $dbiStub->method('getVersion')->willReturn($version);
 
-        $this->assertSame($expected, Compatibility::isUUIDSupported($dbiStub));
+        self::assertSame($expected, Compatibility::isUUIDSupported($dbiStub));
     }
 
     /**
diff --git a/test/classes/Query/GeneratorTest.php b/test/classes/Query/GeneratorTest.php
index c83a561c12..1590c2ddcd 100644
--- a/test/classes/Query/GeneratorTest.php
+++ b/test/classes/Query/GeneratorTest.php
@@ -14,150 +14,85 @@ class GeneratorTest extends AbstractTestCase
 {
     public function testGetColumnsSql(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             'SHOW  COLUMNS FROM `mydb`.`mytable`',
-            Generator::getColumnsSql(
-                'mydb',
-                'mytable'
-            )
+            Generator::getColumnsSql('mydb', 'mytable')
         );
-        $this->assertEquals(
+        self::assertSame(
             'SHOW  COLUMNS FROM `mydb`.`mytable` LIKE \'_idcolumn\'',
-            Generator::getColumnsSql(
-                'mydb',
-                'mytable',
-                '_idcolumn'
-            )
+            Generator::getColumnsSql('mydb', 'mytable', '_idcolumn')
         );
-        $this->assertEquals(
+        self::assertSame(
             'SHOW FULL COLUMNS FROM `mydb`.`mytable`',
-            Generator::getColumnsSql(
-                'mydb',
-                'mytable',
-                null,
-                true
-            )
+            Generator::getColumnsSql('mydb', 'mytable', null, true)
         );
-        $this->assertEquals(
+        self::assertSame(
             'SHOW FULL COLUMNS FROM `mydb`.`mytable` LIKE \'_idcolumn\'',
-            Generator::getColumnsSql(
-                'mydb',
-                'mytable',
-                '_idcolumn',
-                true
-            )
+            Generator::getColumnsSql('mydb', 'mytable', '_idcolumn', true)
         );
     }
 
     public function testGetTableIndexesSql(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             'SHOW INDEXES FROM `mydb`.`mytable`',
-            Generator::getTableIndexesSql(
-                'mydb',
-                'mytable'
-            )
+            Generator::getTableIndexesSql('mydb', 'mytable')
         );
-        $this->assertEquals(
+        self::assertSame(
             'SHOW INDEXES FROM `mydb`.`mytable` WHERE (1)',
-            Generator::getTableIndexesSql(
-                'mydb',
-                'mytable',
-                '1'
-            )
+            Generator::getTableIndexesSql('mydb', 'mytable', '1')
         );
     }
 
     public function testGetSqlQueryForIndexRename(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mydb`.`mytable` RENAME INDEX `oldIndexName` TO `newIndexName`;',
-            Generator::getSqlQueryForIndexRename(
-                'mydb',
-                'mytable',
-                'oldIndexName',
-                'newIndexName'
-            )
+            Generator::getSqlQueryForIndexRename('mydb', 'mytable', 'oldIndexName', 'newIndexName')
         );
     }
 
     public function testGetQueryForReorderingTable(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable` ORDER BY `myOrderField` ASC;',
-            Generator::getQueryForReorderingTable(
-                'mytable',
-                'myOrderField',
-                ''
-            )
+            Generator::getQueryForReorderingTable('mytable', 'myOrderField', '')
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable` ORDER BY `myOrderField` ASC;',
-            Generator::getQueryForReorderingTable(
-                'mytable',
-                'myOrderField',
-                'S'
-            )
+            Generator::getQueryForReorderingTable('mytable', 'myOrderField', 'S')
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable` ORDER BY `myOrderField` ASC;',
-            Generator::getQueryForReorderingTable(
-                'mytable',
-                'myOrderField',
-                'DESC'
-            )
+            Generator::getQueryForReorderingTable('mytable', 'myOrderField', 'DESC')
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable` ORDER BY `myOrderField` DESC;',
-            Generator::getQueryForReorderingTable(
-                'mytable',
-                'myOrderField',
-                'desc'
-            )
+            Generator::getQueryForReorderingTable('mytable', 'myOrderField', 'desc')
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable` ORDER BY `myOrderField` ASC;',
-            Generator::getQueryForReorderingTable(
-                'mytable',
-                'myOrderField',
-                null
-            )
+            Generator::getQueryForReorderingTable('mytable', 'myOrderField', null)
         );
     }
 
     public function testGetQueryForPartitioningTable(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable`  PARTITION ;',
-            Generator::getQueryForPartitioningTable(
-                'mytable',
-                '',
-                []
-            )
+            Generator::getQueryForPartitioningTable('mytable', '', [])
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable`  PARTITION p1;',
-            Generator::getQueryForPartitioningTable(
-                'mytable',
-                '',
-                ['p1']
-            )
+            Generator::getQueryForPartitioningTable('mytable', '', ['p1'])
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable`  PARTITION p1, p2;',
-            Generator::getQueryForPartitioningTable(
-                'mytable',
-                '',
-                ['p1', 'p2']
-            )
+            Generator::getQueryForPartitioningTable('mytable', '', ['p1', 'p2'])
         );
-        $this->assertEquals(
+        self::assertSame(
             'ALTER TABLE `mytable` COALESCE PARTITION 2',
-            Generator::getQueryForPartitioningTable(
-                'mytable',
-                'COALESCE',
-                ['p1', 'p2']
-            )
+            Generator::getQueryForPartitioningTable('mytable', 'COALESCE', ['p1', 'p2'])
         );
     }
 }
diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php
index 11f0136205..f1fe9cbaeb 100644
--- a/test/classes/ReplicationGuiTest.php
+++ b/test/classes/ReplicationGuiTest.php
@@ -57,35 +57,35 @@ class ReplicationGuiTest extends AbstractTestCase
         $html = $this->replicationGui->getHtmlForPrimaryReplication();
 
         //validate 1: Primary replication
-        $this->assertStringContainsString('<div class="card-header">Primary replication</div>', $html);
-        $this->assertStringContainsString('This server is configured as primary in a replication process.', $html);
+        self::assertStringContainsString('<div class="card-header">Primary replication</div>', $html);
+        self::assertStringContainsString('This server is configured as primary in a replication process.', $html);
 
         //validate 2: getHtmlForReplicationStatusTable
-        $this->assertStringContainsString('<div id="replication_primary_section"', $html);
+        self::assertStringContainsString('<div id="replication_primary_section"', $html);
 
-        $this->assertStringContainsString('Binlog_Do_DB', $html);
-        $this->assertStringContainsString('Binlog_Ignore_DB', $html);
+        self::assertStringContainsString('Binlog_Do_DB', $html);
+        self::assertStringContainsString('Binlog_Ignore_DB', $html);
 
-        $this->assertStringContainsString('primary-bin.000030', $html);
+        self::assertStringContainsString('primary-bin.000030', $html);
 
         //validate 3: getHtmlForReplicationReplicasTable
-        $this->assertStringContainsString('replication_replicas_section', $html);
-        $this->assertStringContainsString('<th>Server ID</th>', $html);
-        $this->assertStringContainsString('<th>Host</th>', $html);
+        self::assertStringContainsString('replication_replicas_section', $html);
+        self::assertStringContainsString('<th>Server ID</th>', $html);
+        self::assertStringContainsString('<th>Host</th>', $html);
         //replica host
-        $this->assertStringContainsString('<td class="text-end font-monospace">Server_id1</td>', $html);
-        $this->assertStringContainsString('<td class="text-end font-monospace">Server_id2</td>', $html);
-        $this->assertStringContainsString('<td class="text-end font-monospace">Host1</td>', $html);
-        $this->assertStringContainsString('<td class="text-end font-monospace">Host2</td>', $html);
+        self::assertStringContainsString('<td class="text-end font-monospace">Server_id1</td>', $html);
+        self::assertStringContainsString('<td class="text-end font-monospace">Server_id2</td>', $html);
+        self::assertStringContainsString('<td class="text-end font-monospace">Host1</td>', $html);
+        self::assertStringContainsString('<td class="text-end font-monospace">Host2</td>', $html);
         //Notice
-        $this->assertStringContainsString('Only replicas started with the', $html);
+        self::assertStringContainsString('Only replicas started with the', $html);
 
         //validate 4: navigation URL
-        $this->assertStringContainsString('<a href="index.php?route=/server/replication', $html);
-        $this->assertStringContainsString('Add replica replication user', $html);
+        self::assertStringContainsString('<a href="index.php?route=/server/replication', $html);
+        self::assertStringContainsString('Add replica replication user', $html);
 
         //validate 5: 'Add replication replica user' form
-        $this->assertStringContainsString('<div id="primary_addreplicauser_gui">', $html);
+        self::assertStringContainsString('<div id="primary_addreplicauser_gui">', $html);
     }
 
     public function testGetHtmlForReplicaConfiguration(): void
@@ -100,17 +100,17 @@ class ReplicationGuiTest extends AbstractTestCase
         );
 
         //legend
-        $this->assertStringContainsString('<div class="card-header">Replica replication</div>', $html);
-        $this->assertStringContainsString('<div id="replica_configuration_gui">', $html);
+        self::assertStringContainsString('<div class="card-header">Replica replication</div>', $html);
+        self::assertStringContainsString('<div id="replica_configuration_gui">', $html);
         //notice
-        $this->assertStringContainsString('Server is configured as replica in a replication process.', $html);
+        self::assertStringContainsString('Server is configured as replica in a replication process.', $html);
         //replica session
-        $this->assertStringContainsString('<div id="replication_replica_section"', $html);
+        self::assertStringContainsString('<div id="replication_replica_section"', $html);
         //variable
-        $this->assertStringContainsString('Master_SSL_CA_Path', $html);
-        $this->assertStringContainsString('Master_SSL_Cert', $html);
-        $this->assertStringContainsString('Master_SSL_Cipher', $html);
-        $this->assertStringContainsString('Seconds_Behind_Master', $html);
+        self::assertStringContainsString('Master_SSL_CA_Path', $html);
+        self::assertStringContainsString('Master_SSL_Cert', $html);
+        self::assertStringContainsString('Master_SSL_Cipher', $html);
+        self::assertStringContainsString('Seconds_Behind_Master', $html);
     }
 
     public function testGetHtmlForReplicationChangePrimary(): void
@@ -118,10 +118,10 @@ class ReplicationGuiTest extends AbstractTestCase
         //Call the test function
         $html = $this->replicationGui->getHtmlForReplicationChangePrimary('replica_changeprimary');
 
-        $this->assertStringContainsString('<form method="post" action="index.php?route=/server/replication', $html);
-        $this->assertStringContainsString('Replica configuration', $html);
-        $this->assertStringContainsString('Change or reconfigure primary server', $html);
+        self::assertStringContainsString('<form method="post" action="index.php?route=/server/replication', $html);
+        self::assertStringContainsString('Replica configuration', $html);
+        self::assertStringContainsString('Change or reconfigure primary server', $html);
         $notice = 'Make sure you have a unique server-id in your configuration file (my.cnf)';
-        $this->assertStringContainsString($notice, $html);
+        self::assertStringContainsString($notice, $html);
     }
 }
diff --git a/test/classes/ResponseRendererTest.php b/test/classes/ResponseRendererTest.php
index dddd95b337..c855a1e383 100644
--- a/test/classes/ResponseRendererTest.php
+++ b/test/classes/ResponseRendererTest.php
@@ -36,24 +36,24 @@ class ResponseRendererTest extends AbstractTestCase
         $footerReflection = new ReflectionProperty(ResponseRenderer::class, 'footer');
         $footerReflection->setAccessible(true);
         $footer = $footerReflection->getValue($response);
-        $this->assertInstanceOf(Footer::class, $footer);
+        self::assertInstanceOf(Footer::class, $footer);
         $headerIsAjax = new ReflectionProperty(Header::class, 'isAjax');
         $headerIsAjax->setAccessible(true);
         $footerIsAjax = new ReflectionProperty(Footer::class, 'isAjax');
         $footerIsAjax->setAccessible(true);
 
-        $this->assertFalse($response->isAjax());
-        $this->assertFalse($headerIsAjax->getValue($header));
-        $this->assertFalse($footerIsAjax->getValue($footer));
+        self::assertFalse($response->isAjax());
+        self::assertFalse($headerIsAjax->getValue($header));
+        self::assertFalse($footerIsAjax->getValue($footer));
 
         $response->setAjax(true);
-        $this->assertTrue($response->isAjax());
-        $this->assertTrue($headerIsAjax->getValue($header));
-        $this->assertTrue($footerIsAjax->getValue($footer));
+        self::assertTrue($response->isAjax());
+        self::assertTrue($headerIsAjax->getValue($header));
+        self::assertTrue($footerIsAjax->getValue($footer));
 
         $response->setAjax(false);
-        $this->assertFalse($response->isAjax());
-        $this->assertFalse($headerIsAjax->getValue($header));
-        $this->assertFalse($footerIsAjax->getValue($footer));
+        self::assertFalse($response->isAjax());
+        self::assertFalse($headerIsAjax->getValue($header));
+        self::assertFalse($footerIsAjax->getValue($footer));
     }
 }
diff --git a/test/classes/RoutingTest.php b/test/classes/RoutingTest.php
index 4a81089411..2a421f1dd6 100644
--- a/test/classes/RoutingTest.php
+++ b/test/classes/RoutingTest.php
@@ -74,9 +74,9 @@ class RoutingTest extends AbstractTestCase
         $GLOBALS['cfg']['environment'] = 'production';
         $_SESSION['isRoutesCacheFileValid'] = null;
 
-        $this->assertDirectoryIsWritable(CACHE_DIR);
+        self::assertDirectoryIsWritable(CACHE_DIR);
         if (file_exists(Routing::ROUTES_CACHE_FILE)) {
-            $this->assertTrue(unlink(Routing::ROUTES_CACHE_FILE));
+            self::assertTrue(unlink(Routing::ROUTES_CACHE_FILE));
         }
 
         $expected = [Dispatcher::FOUND, HomeController::class, []];
@@ -88,7 +88,7 @@ class RoutingTest extends AbstractTestCase
      */
     public function testGetCurrentRouteNoParams(): void
     {
-        $this->assertSame('/', Routing::getCurrentRoute());
+        self::assertSame('/', Routing::getCurrentRoute());
     }
 
     /**
@@ -97,7 +97,7 @@ class RoutingTest extends AbstractTestCase
     public function testGetCurrentRouteGet(): void
     {
         $_GET['route'] = '/test';
-        $this->assertSame('/test', Routing::getCurrentRoute());
+        self::assertSame('/test', Routing::getCurrentRoute());
     }
 
     /**
@@ -107,7 +107,7 @@ class RoutingTest extends AbstractTestCase
     {
         unset($_GET['route']);
         $_POST['route'] = '/testpost';
-        $this->assertSame('/testpost', Routing::getCurrentRoute());
+        self::assertSame('/testpost', Routing::getCurrentRoute());
     }
 
     /**
@@ -117,7 +117,7 @@ class RoutingTest extends AbstractTestCase
     {
         $_GET['route'] = '/testget';
         $_POST['route'] = '/testpost';
-        $this->assertSame('/testget', Routing::getCurrentRoute());
+        self::assertSame('/testget', Routing::getCurrentRoute());
     }
 
     /**
@@ -128,7 +128,7 @@ class RoutingTest extends AbstractTestCase
         unset($_POST['route']);
         unset($_GET['route']);
         $_GET['db'] = 'testDB';
-        $this->assertSame('/database/structure', Routing::getCurrentRoute());
+        self::assertSame('/database/structure', Routing::getCurrentRoute());
     }
 
     /**
@@ -138,6 +138,6 @@ class RoutingTest extends AbstractTestCase
     {
         $_GET['db'] = 'testDB';
         $_GET['table'] = 'tableTest';
-        $this->assertSame('/sql', Routing::getCurrentRoute());
+        self::assertSame('/sql', Routing::getCurrentRoute());
     }
 }
diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php
index be54f5a656..f99c8db0dc 100644
--- a/test/classes/SanitizeTest.php
+++ b/test/classes/SanitizeTest.php
@@ -26,7 +26,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testXssInHref(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             '[a@javascript:alert(\'XSS\');@target]link</a>',
             Sanitize::sanitizeMessage('[a@javascript:alert(\'XSS\');@target]link[/a]')
         );
@@ -41,7 +41,7 @@ class SanitizeTest extends AbstractTestCase
 
         unset($GLOBALS['server']);
         unset($GLOBALS['lang']);
-        $this->assertEquals(
+        self::assertSame(
             '<a href="./url.php?url=https%3A%2F%2Fwww.phpmyadmin.net%2F" target="target">link</a>',
             Sanitize::sanitizeMessage('[a@https://www.phpmyadmin.net/@target]link[/a]')
         );
@@ -59,7 +59,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testDoc(string $link, string $expected): void
     {
-        $this->assertEquals(
+        self::assertSame(
             '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F'
                 . $expected . '" target="documentation">doclink</a>',
             Sanitize::sanitizeMessage('[doc@' . $link . ']doclink[/doc]')
@@ -98,7 +98,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testInvalidTarget(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             '[a@./Documentation.html@INVALID9]doc</a>',
             Sanitize::sanitizeMessage('[a@./Documentation.html@INVALID9]doc[/a]')
         );
@@ -109,7 +109,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testLinkDocXss(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             '[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>',
             Sanitize::sanitizeMessage('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]')
         );
@@ -120,7 +120,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testLinkAndXssInHref(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2F">doc</a>'
                 . '[a@javascript:alert(\'XSS\');@target]link</a>',
             Sanitize::sanitizeMessage(
@@ -134,10 +134,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testHtmlTags(): void
     {
-        $this->assertEquals(
-            '&lt;div onclick=""&gt;',
-            Sanitize::sanitizeMessage('<div onclick="">')
-        );
+        self::assertSame('&lt;div onclick=""&gt;', Sanitize::sanitizeMessage('<div onclick="">'));
     }
 
     /**
@@ -145,10 +142,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testBBCode(): void
     {
-        $this->assertEquals(
-            '<strong>strong</strong>',
-            Sanitize::sanitizeMessage('[strong]strong[/strong]')
-        );
+        self::assertSame('<strong>strong</strong>', Sanitize::sanitizeMessage('[strong]strong[/strong]'));
     }
 
     /**
@@ -156,7 +150,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testEscape(): void
     {
-        $this->assertEquals(
+        self::assertSame(
             '&lt;strong&gt;strong&lt;/strong&gt;',
             Sanitize::sanitizeMessage('[strong]strong[/strong]', true)
         );
@@ -167,10 +161,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testSanitizeFilename(): void
     {
-        $this->assertEquals(
-            'File_name_123',
-            Sanitize::sanitizeFilename('File_name 123')
-        );
+        self::assertSame('File_name_123', Sanitize::sanitizeFilename('File_name 123'));
     }
 
     /**
@@ -184,21 +175,15 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testGetJsValue(string $key, $value, string $expected): void
     {
-        $this->assertEquals($expected, Sanitize::getJsValue($key, $value));
-        $this->assertEquals('foo = 100', Sanitize::getJsValue('foo', '100', false));
+        self::assertSame($expected, Sanitize::getJsValue($key, $value));
+        self::assertSame('foo = 100', Sanitize::getJsValue('foo', '100', false));
         $array = [
             '1',
             '2',
             '3',
         ];
-        $this->assertEquals(
-            "foo = [\"1\",\"2\",\"3\",];\n",
-            Sanitize::getJsValue('foo', $array)
-        );
-        $this->assertEquals(
-            "foo = \"bar\\\"baz\";\n",
-            Sanitize::getJsValue('foo', 'bar"baz')
-        );
+        self::assertSame("foo = [\"1\",\"2\",\"3\",];\n", Sanitize::getJsValue('foo', $array));
+        self::assertSame("foo = \"bar\\\"baz\";\n", Sanitize::getJsValue('foo', 'bar"baz'));
     }
 
     /**
@@ -206,7 +191,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testJsFormat(): void
     {
-        $this->assertEquals('`foo`', Sanitize::jsFormat('foo'));
+        self::assertSame('`foo`', Sanitize::jsFormat('foo'));
     }
 
     /**
@@ -265,7 +250,7 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testEscapeJsString(string $target, string $source): void
     {
-        $this->assertEquals($target, Sanitize::escapeJsString($source));
+        self::assertSame($target, Sanitize::escapeJsString($source));
     }
 
     /**
@@ -317,9 +302,9 @@ class SanitizeTest extends AbstractTestCase
             'second',
         ];
         Sanitize::removeRequestVars($allow_list);
-        $this->assertArrayNotHasKey('foo', $_REQUEST);
-        $this->assertArrayNotHasKey('second', $_REQUEST);
-        $this->assertArrayHasKey('allow', $_REQUEST);
+        self::assertArrayNotHasKey('foo', $_REQUEST);
+        self::assertArrayNotHasKey('second', $_REQUEST);
+        self::assertArrayHasKey('allow', $_REQUEST);
     }
 
     /**
@@ -440,9 +425,6 @@ class SanitizeTest extends AbstractTestCase
      */
     public function testCheckLink(bool $expected, string $url, bool $http, bool $other): void
     {
-        $this->assertSame(
-            $expected,
-            Sanitize::checkLink($url, $http, $other)
-        );
+        self::assertSame($expected, Sanitize::checkLink($url, $http, $other));
     }
 }
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index 30ad0a4578..709d14793c 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -47,12 +47,9 @@ class ScriptsTest extends AbstractTestCase
 
         $actual = $this->object->getDisplay();
 
-        $this->assertStringContainsString(
-            'src="js/dist/common.js?v=' . rawurlencode(Version::VERSION) . '"',
-            $actual
-        );
-        $this->assertStringContainsString('.add(\'common.js\', 1)', $actual);
-        $this->assertStringContainsString('AJAX.fireOnload(\'common.js\')', $actual);
+        self::assertStringContainsString('src="js/dist/common.js?v=' . rawurlencode(Version::VERSION) . '"', $actual);
+        self::assertStringContainsString('.add(\'common.js\', 1)', $actual);
+        self::assertStringContainsString('AJAX.fireOnload(\'common.js\')', $actual);
     }
 
     /**
@@ -64,7 +61,7 @@ class ScriptsTest extends AbstractTestCase
 
         $actual = $this->object->getDisplay();
 
-        $this->assertStringContainsString('alert(\'CodeAdded\');', $actual);
+        self::assertStringContainsString('alert(\'CodeAdded\');', $actual);
     }
 
     /**
@@ -76,19 +73,16 @@ class ScriptsTest extends AbstractTestCase
         $this->object->addFile('vendor/codemirror/lib/codemirror.js');
 
         $this->object->addFile('common.js');
-        $this->assertEquals(
+        self::assertSame([
             [
-                [
-                    'name' => 'vendor/codemirror/lib/codemirror.js',
-                    'fire' => 0,
-                ],
-                [
-                    'name' => 'common.js',
-                    'fire' => 1,
-                ],
+                'name' => 'vendor/codemirror/lib/codemirror.js',
+                'fire' => 0,
             ],
-            $this->object->getFiles()
-        );
+            [
+                'name' => 'common.js',
+                'fire' => 1,
+            ],
+        ], $this->object->getFiles());
     }
 
     /**
@@ -101,7 +95,7 @@ class ScriptsTest extends AbstractTestCase
 
         // Assert empty _files property of
         // Scripts
-        $this->assertEquals([], $reflection->getValue($this->object));
+        self::assertSame([], $reflection->getValue($this->object));
 
         // Add one script file
         $file = 'common.js';
@@ -114,7 +108,7 @@ class ScriptsTest extends AbstractTestCase
             ],
         ];
         $this->object->addFile($file);
-        $this->assertEquals($_files, $reflection->getValue($this->object));
+        self::assertSame($_files, $reflection->getValue($this->object));
     }
 
     /**
@@ -143,6 +137,6 @@ class ScriptsTest extends AbstractTestCase
             ],
         ];
         $this->object->addFiles($filenames);
-        $this->assertEquals($_files, $reflection->getValue($this->object));
+        self::assertSame($_files, $reflection->getValue($this->object));
     }
 }
diff --git a/test/classes/Server/PluginTest.php b/test/classes/Server/PluginTest.php
index 62c5145824..e2d364b5b8 100644
--- a/test/classes/Server/PluginTest.php
+++ b/test/classes/Server/PluginTest.php
@@ -30,23 +30,20 @@ class PluginTest extends AbstractTestCase
             'authVersion' => '1.0',
         ]);
 
-        $this->assertInstanceOf(Plugin::class, $plugin);
-        $this->assertSame('BLACKHOLE', $plugin->getName());
-        $this->assertSame('1.0', $plugin->getVersion());
-        $this->assertSame('ACTIVE', $plugin->getStatus());
-        $this->assertSame('STORAGE ENGINE', $plugin->getType());
-        $this->assertSame('100316.0', $plugin->getTypeVersion());
-        $this->assertSame('ha_blackhole.so', $plugin->getLibrary());
-        $this->assertSame('1.13', $plugin->getLibraryVersion());
-        $this->assertSame('MySQL AB', $plugin->getAuthor());
-        $this->assertSame('GPL', $plugin->getLicense());
-        $this->assertSame('ON', $plugin->getLoadOption());
-        $this->assertSame('Stable', $plugin->getMaturity());
-        $this->assertSame('1.0', $plugin->getAuthVersion());
-        $this->assertSame(
-            '/dev/null storage engine (anything you write to it disappears)',
-            $plugin->getDescription()
-        );
+        self::assertInstanceOf(Plugin::class, $plugin);
+        self::assertSame('BLACKHOLE', $plugin->getName());
+        self::assertSame('1.0', $plugin->getVersion());
+        self::assertSame('ACTIVE', $plugin->getStatus());
+        self::assertSame('STORAGE ENGINE', $plugin->getType());
+        self::assertSame('100316.0', $plugin->getTypeVersion());
+        self::assertSame('ha_blackhole.so', $plugin->getLibrary());
+        self::assertSame('1.13', $plugin->getLibraryVersion());
+        self::assertSame('MySQL AB', $plugin->getAuthor());
+        self::assertSame('GPL', $plugin->getLicense());
+        self::assertSame('ON', $plugin->getLoadOption());
+        self::assertSame('Stable', $plugin->getMaturity());
+        self::assertSame('1.0', $plugin->getAuthVersion());
+        self::assertSame('/dev/null storage engine (anything you write to it disappears)', $plugin->getDescription());
 
         return $plugin;
     }
@@ -58,7 +55,7 @@ class PluginTest extends AbstractTestCase
      */
     public function testToArray(Plugin $plugin): void
     {
-        $this->assertSame([
+        self::assertSame([
             'name' => 'BLACKHOLE',
             'version' => '1.0',
             'status' => 'ACTIVE',
diff --git a/test/classes/Server/PluginsTest.php b/test/classes/Server/PluginsTest.php
index 620aeed64b..b9aff1bcc3 100644
--- a/test/classes/Server/PluginsTest.php
+++ b/test/classes/Server/PluginsTest.php
@@ -28,13 +28,13 @@ class PluginsTest extends AbstractTestCase
 
         $plugins = $this->plugins->getAll();
 
-        $this->assertIsArray($plugins);
-        $this->assertNotEmpty($plugins);
+        self::assertIsArray($plugins);
+        self::assertNotEmpty($plugins);
 
         $plugin = $plugins[0];
 
-        $this->assertInstanceOf(Plugin::class, $plugin);
-        $this->assertSame([
+        self::assertInstanceOf(Plugin::class, $plugin);
+        self::assertSame([
             'name' => 'BLACKHOLE',
             'version' => '1.0',
             'status' => 'ACTIVE',
@@ -61,13 +61,13 @@ class PluginsTest extends AbstractTestCase
 
         $plugins = $this->plugins->getAll();
 
-        $this->assertIsArray($plugins);
-        $this->assertNotEmpty($plugins);
+        self::assertIsArray($plugins);
+        self::assertNotEmpty($plugins);
 
         $plugin = $plugins[0];
 
-        $this->assertInstanceOf(Plugin::class, $plugin);
-        $this->assertSame([
+        self::assertInstanceOf(Plugin::class, $plugin);
+        self::assertSame([
             'name' => 'partition',
             'version' => null,
             'status' => 'ACTIVE',
@@ -89,18 +89,15 @@ class PluginsTest extends AbstractTestCase
         $GLOBALS['server'] = 0;
         $this->plugins = new Plugins($GLOBALS['dbi']);
         $plugins = $this->plugins->getAuthentication();
-        $this->assertIsArray($plugins);
-        $this->assertNotEmpty($plugins);
-        $this->assertEquals(
-            [
-                'mysql_old_password' => __('Old MySQL-4.0 authentication'),
-                'mysql_native_password' => __('Native MySQL authentication'),
-                'sha256_password' => __('SHA256 password authentication'),
-                'caching_sha2_password' => __('Caching sha2 authentication'),
-                'auth_socket' => __('Unix Socket based authentication'),
-                'unknown_auth_plugin' => 'Unknown authentication',
-            ],
-            $plugins
-        );
+        self::assertIsArray($plugins);
+        self::assertNotEmpty($plugins);
+        self::assertSame([
+            'mysql_old_password' => __('Old MySQL-4.0 authentication'),
+            'mysql_native_password' => __('Native MySQL authentication'),
+            'sha256_password' => __('SHA256 password authentication'),
+            'caching_sha2_password' => __('Caching sha2 authentication'),
+            'auth_socket' => __('Unix Socket based authentication'),
+            'unknown_auth_plugin' => 'Unknown authentication',
+        ], $plugins);
     }
 }
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
index ebef31630d..b506be7a6f 100644
--- a/test/classes/Server/PrivilegesTest.php
+++ b/test/classes/Server/PrivilegesTest.php
@@ -147,12 +147,12 @@ class PrivilegesTest extends AbstractTestCase
             $db_and_table,
             $dbname_is_wildcard,
         ] = $this->serverPrivileges->getDataForDBInfo();
-        $this->assertEquals('PMA_username', $username);
-        $this->assertEquals('PMA_hostname', $hostname);
-        $this->assertEquals('PMA_dbname', $dbname);
-        $this->assertEquals('PMA_tablename', $tablename);
-        $this->assertEquals('`PMA_dbname`.`PMA_tablename`', $db_and_table);
-        $this->assertTrue($dbname_is_wildcard);
+        self::assertSame('PMA_username', $username);
+        self::assertSame('PMA_hostname', $hostname);
+        self::assertSame('PMA_dbname', $dbname);
+        self::assertSame('PMA_tablename', $tablename);
+        self::assertSame('`PMA_dbname`.`PMA_tablename`', $db_and_table);
+        self::assertTrue($dbname_is_wildcard);
 
         //pre variable have been defined
         $_POST['pred_tablename'] = 'PMA_pred__tablename';
@@ -164,10 +164,10 @@ class PrivilegesTest extends AbstractTestCase
             $db_and_table,
             $dbname_is_wildcard,
         ] = $this->serverPrivileges->getDataForDBInfo();
-        $this->assertEquals('PMA_pred_dbname', $dbname);
-        $this->assertEquals('PMA_pred__tablename', $tablename);
-        $this->assertEquals('`PMA_pred_dbname`.`PMA_pred__tablename`', $db_and_table);
-        $this->assertTrue($dbname_is_wildcard);
+        self::assertSame('PMA_pred_dbname', $dbname);
+        self::assertSame('PMA_pred__tablename', $tablename);
+        self::assertSame('`PMA_pred_dbname`.`PMA_pred__tablename`', $db_and_table);
+        self::assertTrue($dbname_is_wildcard);
 
         // Escaped database
         $_POST['pred_tablename'] = 'PMA_pred__tablename';
@@ -179,10 +179,10 @@ class PrivilegesTest extends AbstractTestCase
             $db_and_table,
             $dbname_is_wildcard,
         ] = $this->serverPrivileges->getDataForDBInfo();
-        $this->assertEquals('PMA\_pred\_dbname', $dbname);
-        $this->assertEquals('PMA_pred__tablename', $tablename);
-        $this->assertEquals('`PMA_pred_dbname`.`PMA_pred__tablename`', $db_and_table);
-        $this->assertEquals(false, $dbname_is_wildcard);
+        self::assertSame('PMA\_pred\_dbname', $dbname);
+        self::assertSame('PMA_pred__tablename', $tablename);
+        self::assertSame('`PMA_pred_dbname`.`PMA_pred__tablename`', $db_and_table);
+        self::assertFalse($dbname_is_wildcard);
 
         // Multiselect database - pred
         unset($_POST['pred_tablename'], $_REQUEST['tablename'], $_REQUEST['dbname']);
@@ -193,10 +193,10 @@ class PrivilegesTest extends AbstractTestCase
             $db_and_table,
             $dbname_is_wildcard,
         ] = $this->serverPrivileges->getDataForDBInfo();
-        $this->assertEquals(['PMA\_pred\_dbname', 'PMADbname2'], $dbname);
-        $this->assertEquals(null, $tablename);
-        $this->assertEquals(['PMA\_pred\_dbname.*', 'PMADbname2.*'], $db_and_table);
-        $this->assertEquals(false, $dbname_is_wildcard);
+        self::assertSame(['PMA\_pred\_dbname', 'PMADbname2'], $dbname);
+        self::assertNull($tablename);
+        self::assertSame(['PMA\_pred\_dbname.*', 'PMADbname2.*'], $db_and_table);
+        self::assertFalse($dbname_is_wildcard);
 
         // Multiselect database
         unset($_POST['pred_tablename'], $_REQUEST['tablename'], $_POST['pred_dbname']);
@@ -207,10 +207,10 @@ class PrivilegesTest extends AbstractTestCase
             $db_and_table,
             $dbname_is_wildcard,
         ] = $this->serverPrivileges->getDataForDBInfo();
-        $this->assertEquals(['PMA\_dbname', 'PMADbname2'], $dbname);
-        $this->assertEquals(null, $tablename);
-        $this->assertEquals(['PMA\_dbname.*', 'PMADbname2.*'], $db_and_table);
-        $this->assertEquals(false, $dbname_is_wildcard);
+        self::assertSame(['PMA\_dbname', 'PMADbname2'], $dbname);
+        self::assertNull($tablename);
+        self::assertSame(['PMA\_dbname.*', 'PMADbname2.*'], $db_and_table);
+        self::assertFalse($dbname_is_wildcard);
     }
 
     /**
@@ -221,17 +221,17 @@ class PrivilegesTest extends AbstractTestCase
         $dbname = '';
         $tablename = '';
         $db_and_table = $this->serverPrivileges->wildcardEscapeForGrant($dbname, $tablename);
-        $this->assertEquals('*.*', $db_and_table);
+        self::assertSame('*.*', $db_and_table);
 
         $dbname = 'dbname';
         $tablename = '';
         $db_and_table = $this->serverPrivileges->wildcardEscapeForGrant($dbname, $tablename);
-        $this->assertEquals('`dbname`.*', $db_and_table);
+        self::assertSame('`dbname`.*', $db_and_table);
 
         $dbname = 'dbname';
         $tablename = 'tablename';
         $db_and_table = $this->serverPrivileges->wildcardEscapeForGrant($dbname, $tablename);
-        $this->assertEquals('`dbname`.`tablename`', $db_and_table);
+        self::assertSame('`dbname`.`tablename`', $db_and_table);
     }
 
     /**
@@ -240,16 +240,16 @@ class PrivilegesTest extends AbstractTestCase
     public function testRangeOfUsers(): void
     {
         $ret = $this->serverPrivileges->rangeOfUsers('INIT');
-        $this->assertEquals(" WHERE `User` LIKE 'INIT%' OR `User` LIKE 'init%'", $ret);
+        self::assertSame(" WHERE `User` LIKE 'INIT%' OR `User` LIKE 'init%'", $ret);
 
         $ret = $this->serverPrivileges->rangeOfUsers('%');
-        $this->assertEquals(' WHERE `User` LIKE \'\\%%\' OR `User` LIKE \'\\%%\'', $ret);
+        self::assertSame(' WHERE `User` LIKE \'\\%%\' OR `User` LIKE \'\\%%\'', $ret);
 
         $ret = $this->serverPrivileges->rangeOfUsers('');
-        $this->assertEquals(" WHERE `User` = ''", $ret);
+        self::assertSame(" WHERE `User` = ''", $ret);
 
         $ret = $this->serverPrivileges->rangeOfUsers();
-        $this->assertEquals('', $ret);
+        self::assertSame('', $ret);
     }
 
     /**
@@ -258,22 +258,16 @@ class PrivilegesTest extends AbstractTestCase
     public function testGetTableGrantsArray(): void
     {
         $ret = $this->serverPrivileges->getTableGrantsArray();
-        $this->assertEquals(
-            [
-                'Delete',
-                'DELETE',
-                __('Allows deleting data.'),
-            ],
-            $ret[0]
-        );
-        $this->assertEquals(
-            [
-                'Create',
-                'CREATE',
-                __('Allows creating new tables.'),
-            ],
-            $ret[1]
-        );
+        self::assertSame([
+            'Delete',
+            'DELETE',
+            __('Allows deleting data.'),
+        ], $ret[0]);
+        self::assertSame([
+            'Create',
+            'CREATE',
+            __('Allows creating new tables.'),
+        ], $ret[1]);
     }
 
     /**
@@ -282,22 +276,16 @@ class PrivilegesTest extends AbstractTestCase
     public function testGetGrantsArray(): void
     {
         $ret = $this->serverPrivileges->getGrantsArray();
-        $this->assertEquals(
-            [
-                'Select_priv',
-                'SELECT',
-                __('Allows reading data.'),
-            ],
-            $ret[0]
-        );
-        $this->assertEquals(
-            [
-                'Insert_priv',
-                'INSERT',
-                __('Allows inserting and replacing data.'),
-            ],
-            $ret[1]
-        );
+        self::assertSame([
+            'Select_priv',
+            'SELECT',
+            __('Allows reading data.'),
+        ], $ret[0]);
+        self::assertSame([
+            'Insert_priv',
+            'INSERT',
+            __('Allows inserting and replacing data.'),
+        ], $ret[1]);
     }
 
     /**
@@ -315,7 +303,7 @@ class PrivilegesTest extends AbstractTestCase
         $sql = 'SELECT * FROM `mysql`.`user`'
             . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
             . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "';";
-        $this->assertEquals($sql, $ret);
+        self::assertSame($sql, $ret);
 
         //$table == '*'
         $db = 'pma_db';
@@ -326,7 +314,7 @@ class PrivilegesTest extends AbstractTestCase
             . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
             . ' AND `Db` = \'' . $db . '\'';
 
-        $this->assertEquals($sql, $ret);
+        self::assertSame($sql, $ret);
 
         //$table == 'pma_table'
         $db = 'pma_db';
@@ -338,19 +326,16 @@ class PrivilegesTest extends AbstractTestCase
             . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
             . " AND `Db` = '" . Util::unescapeMysqlWildcards($db) . "'"
             . " AND `Table_name` = '" . $GLOBALS['dbi']->escapeString($table) . "';";
-        $this->assertEquals($sql, $ret);
+        self::assertSame($sql, $ret);
 
         // SQL escaping
         $db = "db' AND";
         $table = 'pma_table';
         $ret = $this->serverPrivileges->getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname);
-        $this->assertEquals(
-            'SELECT `Table_priv` FROM `mysql`.`tables_priv` '
-            . "WHERE `User` = 'pma_username' AND "
-            . "`Host` = 'pma_hostname' AND `Db` = 'db' AND' AND "
-            . "`Table_name` = 'pma_table';",
-            $ret
-        );
+        self::assertSame('SELECT `Table_priv` FROM `mysql`.`tables_priv` '
+        . "WHERE `User` = 'pma_username' AND "
+        . "`Host` = 'pma_hostname' AND `Db` = 'db' AND' AND "
+        . "`Table_name` = 'pma_table';", $ret);
     }
 
     /**
@@ -360,19 +345,16 @@ class PrivilegesTest extends AbstractTestCase
     {
         //$_POST['change_copy'] not set
         [$queries, $password] = $this->serverPrivileges->getDataForChangeOrCopyUser();
-        $this->assertEquals(null, $queries);
-        $this->assertEquals(null, $queries);
+        self::assertNull($queries);
+        self::assertNull($queries);
 
         //$_POST['change_copy'] is set
         $_POST['change_copy'] = true;
         $_POST['old_username'] = 'PMA_old_username';
         $_POST['old_hostname'] = 'PMA_old_hostname';
         [$queries, $password] = $this->serverPrivileges->getDataForChangeOrCopyUser();
-        $this->assertEquals('pma_password', $password);
-        $this->assertEquals(
-            [],
-            $queries
-        );
+        self::assertSame('pma_password', $password);
+        self::assertSame([], $queries);
         unset($_POST['change_copy']);
     }
 
@@ -387,14 +369,14 @@ class PrivilegesTest extends AbstractTestCase
         [$title, $export] = $this->serverPrivileges->getListForExportUserDefinition($username, $hostname);
 
         //validate 1: $export
-        $this->assertStringContainsString('grant user2 delete', $export);
-        $this->assertStringContainsString('grant user1 select', $export);
-        $this->assertStringContainsString('<textarea class="export"', $export);
+        self::assertStringContainsString('grant user2 delete', $export);
+        self::assertStringContainsString('grant user1 select', $export);
+        self::assertStringContainsString('<textarea class="export"', $export);
 
         //validate 2: $title
         $title_user = __('User') . ' `' . htmlspecialchars($username)
             . '`@`' . htmlspecialchars($hostname) . '`';
-        $this->assertStringContainsString($title_user, $title);
+        self::assertStringContainsString($title_user, $title);
     }
 
     /**
@@ -423,17 +405,11 @@ class PrivilegesTest extends AbstractTestCase
             $sql_query,
             $_add_user_error,
         ] = $this->serverPrivileges->addUser($dbname, $username, $hostname, $dbname, true);
-        $this->assertEquals(
-            'You have added a new user.',
-            $ret_message->getMessage()
-        );
-        $this->assertEquals(
-            "CREATE USER ''@'localhost' IDENTIFIED WITH mysql_native_password AS '***';"
-            . "GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
-            . "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';",
-            $sql_query
-        );
-        $this->assertFalse($_add_user_error);
+        self::assertSame('You have added a new user.', $ret_message->getMessage());
+        self::assertSame("CREATE USER ''@'localhost' IDENTIFIED WITH mysql_native_password AS '***';"
+        . "GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
+        . "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';", $sql_query);
+        self::assertFalse($_add_user_error);
     }
 
     /**
@@ -462,18 +438,12 @@ class PrivilegesTest extends AbstractTestCase
             $_add_user_error,
         ] = $this->serverPrivileges->addUser($dbname, $username, $hostname, $dbname, true);
 
-        $this->assertEquals(
-            'You have added a new user.',
-            $ret_message->getMessage()
-        );
-        $this->assertEquals(
-            "CREATE USER ''@'localhost';"
-            . "GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
-            . "SET PASSWORD FOR ''@'localhost' = '***';"
-            . "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';",
-            $sql_query
-        );
-        $this->assertFalse($_add_user_error);
+        self::assertSame('You have added a new user.', $ret_message->getMessage());
+        self::assertSame("CREATE USER ''@'localhost';"
+        . "GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
+        . "SET PASSWORD FOR ''@'localhost' = '***';"
+        . "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';", $sql_query);
+        self::assertFalse($_add_user_error);
     }
 
     /**
@@ -489,7 +459,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $message = $this->serverPrivileges->updatePassword($err_url, $username, $hostname);
 
-        $this->assertEquals(
+        self::assertSame(
             'The password for \'pma_username\'@\'pma_hostname\' was changed successfully.',
             $message->getMessage()
         );
@@ -518,17 +488,14 @@ class PrivilegesTest extends AbstractTestCase
             ''
         );
 
-        $this->assertEquals(
+        self::assertSame(
             "You have revoked the privileges for 'pma_username'@'pma_hostname'.",
             $message->getMessage()
         );
-        $this->assertEquals(
-            'REVOKE ALL PRIVILEGES ON  `pma_dbname`.`pma_tablename` '
-            . "FROM 'pma_username'@'pma_hostname'; "
-            . 'REVOKE GRANT OPTION ON  `pma_dbname`.`pma_tablename` '
-            . "FROM 'pma_username'@'pma_hostname';",
-            $sql_query
-        );
+        self::assertSame('REVOKE ALL PRIVILEGES ON  `pma_dbname`.`pma_tablename` '
+        . "FROM 'pma_username'@'pma_hostname'; "
+        . 'REVOKE GRANT OPTION ON  `pma_dbname`.`pma_tablename` '
+        . "FROM 'pma_username'@'pma_hostname';", $sql_query);
     }
 
     /**
@@ -554,11 +521,11 @@ class PrivilegesTest extends AbstractTestCase
             ''
         );
 
-        $this->assertEquals(
+        self::assertSame(
             "You have updated the privileges for 'pma_username'@'pma_hostname'.",
             $message->getMessage()
         );
-        $this->assertEquals(
+        self::assertSame(
             'REVOKE ALL PRIVILEGES ON  `pma_dbname`.`pma_tablename` FROM \'pma_username\'@\'pma_hostname\';   ',
             $sql_query
         );
@@ -603,16 +570,13 @@ class PrivilegesTest extends AbstractTestCase
             ''
         );
 
-        $this->assertEquals(
+        self::assertSame(
             "You have updated the privileges for 'pma_username'@'pma_hostname'.",
             $message->getMessage()
         );
-        $this->assertEquals(
-            '  GRANT USAGE ON  *.* TO \'pma_username\'@\'pma_hostname\' REQUIRE NONE'
-            . ' WITH GRANT OPTION MAX_QUERIES_PER_HOUR 1000 MAX_CONNECTIONS_PER_HOUR 20'
-            . ' MAX_UPDATES_PER_HOUR 30 MAX_USER_CONNECTIONS 40; ',
-            $sql_query
-        );
+        self::assertSame('  GRANT USAGE ON  *.* TO \'pma_username\'@\'pma_hostname\' REQUIRE NONE'
+        . ' WITH GRANT OPTION MAX_QUERIES_PER_HOUR 1000 MAX_CONNECTIONS_PER_HOUR 20'
+        . ' MAX_UPDATES_PER_HOUR 30 MAX_USER_CONNECTIONS 40; ', $sql_query);
     }
 
     /**
@@ -654,17 +618,14 @@ class PrivilegesTest extends AbstractTestCase
             ''
         );
 
-        $this->assertEquals(
+        self::assertSame(
             "You have updated the privileges for 'pma_username'@'pma_hostname'.",
             $message->getMessage()
         );
-        $this->assertEquals(
-            '  GRANT USAGE ON  *.* TO \'pma_username\'@\'pma_hostname\';'
-            . ' ALTER USER \'pma_username\'@\'pma_hostname\'  REQUIRE NONE'
-            . ' WITH MAX_QUERIES_PER_HOUR 1000 MAX_CONNECTIONS_PER_HOUR'
-            . ' 20 MAX_UPDATES_PER_HOUR 30 MAX_USER_CONNECTIONS 40;',
-            $sql_query
-        );
+        self::assertSame('  GRANT USAGE ON  *.* TO \'pma_username\'@\'pma_hostname\';'
+        . ' ALTER USER \'pma_username\'@\'pma_hostname\'  REQUIRE NONE'
+        . ' WITH MAX_QUERIES_PER_HOUR 1000 MAX_CONNECTIONS_PER_HOUR'
+        . ' 20 MAX_UPDATES_PER_HOUR 30 MAX_USER_CONNECTIONS 40;', $sql_query);
     }
 
     /**
@@ -690,77 +651,50 @@ class PrivilegesTest extends AbstractTestCase
         $GLOBALS['username'] = 'username';
 
         //validate 1: fieldset
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<fieldset id="fieldset_user_privtable_footer" class="pma-fieldset tblFooters">',
             $html
         );
 
         //validate 2: button
-        $this->assertStringContainsString(
-            __('Go'),
-            $html
-        );
+        self::assertStringContainsString(__('Go'), $html);
 
         //validate 3: getHtmlForGlobalOrDbSpecificPrivs
-        $this->assertStringContainsString('<fieldset class="pma-fieldset" id="fieldset_user_global_rights">', $html);
-        $this->assertStringContainsString(
-            '<legend data-submenu-label="' . __('Global') . '">',
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Global privileges'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Check all'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Note: MySQL privilege names are expressed in English'),
-            $html
-        );
+        self::assertStringContainsString('<fieldset class="pma-fieldset" id="fieldset_user_global_rights">', $html);
+        self::assertStringContainsString('<legend data-submenu-label="' . __('Global') . '">', $html);
+        self::assertStringContainsString(__('Global privileges'), $html);
+        self::assertStringContainsString(__('Check all'), $html);
+        self::assertStringContainsString(__('Note: MySQL privilege names are expressed in English'), $html);
 
         //validate 4: getHtmlForGlobalPrivTableWithCheckboxes items
         //Select_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Select_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Select_priv"', $html);
         //Create_user_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Create_user_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Create_user_priv"', $html);
         //Insert_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Insert_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Insert_priv"', $html);
         //Update_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Update_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Update_priv"', $html);
         //Create_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Create_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Create_priv"', $html);
         //Create_routine_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Create_routine_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Create_routine_priv"', $html);
         //Execute_priv
-        $this->assertStringContainsString('<input type="checkbox" class="checkall" name="Execute_priv"', $html);
+        self::assertStringContainsString('<input type="checkbox" class="checkall" name="Execute_priv"', $html);
 
         //validate 5: getHtmlForResourceLimits
-        $this->assertStringContainsString(
-            '<legend>' . __('Resource limits') . '</legend>',
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Note: Setting these options to 0 (zero) removes the limit.'),
-            $html
-        );
-        $this->assertStringContainsString('MAX QUERIES PER HOUR', $html);
-        $this->assertStringContainsString('id="text_max_updates" value="0"', $html);
-        $this->assertStringContainsString(
-            __('Limits the number of new connections the user may open per hour.'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Limits the number of simultaneous connections the user may have.'),
-            $html
-        );
+        self::assertStringContainsString('<legend>' . __('Resource limits') . '</legend>', $html);
+        self::assertStringContainsString(__('Note: Setting these options to 0 (zero) removes the limit.'), $html);
+        self::assertStringContainsString('MAX QUERIES PER HOUR', $html);
+        self::assertStringContainsString('id="text_max_updates" value="0"', $html);
+        self::assertStringContainsString(__('Limits the number of new connections the user may open per hour.'), $html);
+        self::assertStringContainsString(__('Limits the number of simultaneous connections the user may have.'), $html);
 
-        $this->assertStringContainsString('<legend>SSL</legend>', $html);
-        $this->assertStringContainsString('value="NONE"', $html);
-        $this->assertStringContainsString('value="ANY"', $html);
-        $this->assertStringContainsString('value="X509"', $html);
-        $this->assertStringContainsString('value="SPECIFIED"', $html);
+        self::assertStringContainsString('<legend>SSL</legend>', $html);
+        self::assertStringContainsString('value="NONE"', $html);
+        self::assertStringContainsString('value="ANY"', $html);
+        self::assertStringContainsString('value="X509"', $html);
+        self::assertStringContainsString('value="SPECIFIED"', $html);
     }
 
     /**
@@ -784,13 +718,13 @@ class PrivilegesTest extends AbstractTestCase
         ] = $this->serverPrivileges->getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
 
         //validate 1: $create_user_real
-        $this->assertEquals(
+        self::assertSame(
             'CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED WITH mysql_native_password BY \'pma_password\';',
             $create_user_real
         );
 
         //validate 2: $create_user_show
-        $this->assertEquals(
+        self::assertSame(
             'CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED WITH mysql_native_password BY \'***\';',
             $create_user_show
         );
@@ -816,13 +750,13 @@ class PrivilegesTest extends AbstractTestCase
         ] = $this->serverPrivileges->getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
 
         //validate 1: $create_user_real
-        $this->assertEquals(
+        self::assertSame(
             'CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED BY \'pma_password\';',
             $create_user_real
         );
 
         //validate 2: $create_user_show
-        $this->assertEquals('CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED BY \'***\';', $create_user_show);
+        self::assertSame('CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED BY \'***\';', $create_user_show);
     }
 
     /**
@@ -851,26 +785,26 @@ class PrivilegesTest extends AbstractTestCase
         ] = $this->serverPrivileges->getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
 
         //validate 1: $create_user_real
-        $this->assertEquals(
+        self::assertSame(
             'CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED WITH mysql_native_password AS \'pma_password\';',
             $create_user_real
         );
 
         //validate 2: $create_user_show
-        $this->assertEquals(
+        self::assertSame(
             'CREATE USER \'PMA_username\'@\'PMA_hostname\' IDENTIFIED WITH mysql_native_password AS \'***\';',
             $create_user_show
         );
 
         //validate 3:$real_sql_query
-        $this->assertEquals("GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;", $real_sql_query);
+        self::assertSame("GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;", $real_sql_query);
 
         //validate 4:$sql_query
-        $this->assertEquals("GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;", $sql_query);
+        self::assertSame("GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;", $sql_query);
 
-        $this->assertSame('', $alter_real_sql_query);
+        self::assertSame('', $alter_real_sql_query);
 
-        $this->assertSame('', $alter_sql_query);
+        self::assertSame('', $alter_sql_query);
 
         //Test for addUserAndCreateDatabase
         [$sql_query, $message] = $this->serverPrivileges->addUserAndCreateDatabase(
@@ -888,15 +822,12 @@ class PrivilegesTest extends AbstractTestCase
         );
 
         //validate 5: $sql_query
-        $this->assertEquals("GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;", $sql_query);
+        self::assertSame("GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;", $sql_query);
 
-        $this->assertInstanceOf(Message::class, $message);
+        self::assertInstanceOf(Message::class, $message);
 
         //validate 6: $message
-        $this->assertEquals(
-            'You have added a new user.',
-            $message->getMessage()
-        );
+        self::assertSame('You have added a new user.', $message->getMessage());
     }
 
     /**
@@ -912,35 +843,20 @@ class PrivilegesTest extends AbstractTestCase
         $GLOBALS['hostname'] = 'PMA_hostname';
         $html = $this->serverPrivileges->getHtmlToDisplayPrivilegesTable('PMA_db', 'PMA_table');
 
-        $this->assertStringContainsString('checkbox_Update_priv_none', $html);
-        $this->assertStringContainsString('<dfn title="Allows changing data.">UPDATE</dfn>', $html);
-        $this->assertStringContainsString('checkbox_Insert_priv_none', $html);
-        $this->assertStringContainsString(
-            __('Allows reading data.'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Allows inserting and replacing data'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Allows changing data.'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Has no effect in this MySQL version.'),
-            $html
-        );
+        self::assertStringContainsString('checkbox_Update_priv_none', $html);
+        self::assertStringContainsString('<dfn title="Allows changing data.">UPDATE</dfn>', $html);
+        self::assertStringContainsString('checkbox_Insert_priv_none', $html);
+        self::assertStringContainsString(__('Allows reading data.'), $html);
+        self::assertStringContainsString(__('Allows inserting and replacing data'), $html);
+        self::assertStringContainsString(__('Allows changing data.'), $html);
+        self::assertStringContainsString(__('Has no effect in this MySQL version.'), $html);
 
-        $this->assertStringContainsString('title="Allows performing SHOW CREATE VIEW queries." checked>', $html);
-        $this->assertStringContainsString('<dfn title="Allows creating new views.">', $html);
-        $this->assertStringContainsString('CREATE VIEW', $html);
-        $this->assertStringContainsString('Create_view_priv', $html);
-        $this->assertStringContainsString('Show_view_priv', $html);
-        $this->assertStringContainsString(
-            _pgettext('None privileges', 'None'),
-            $html
-        );
+        self::assertStringContainsString('title="Allows performing SHOW CREATE VIEW queries." checked>', $html);
+        self::assertStringContainsString('<dfn title="Allows creating new views.">', $html);
+        self::assertStringContainsString('CREATE VIEW', $html);
+        self::assertStringContainsString('Create_view_priv', $html);
+        self::assertStringContainsString('Show_view_priv', $html);
+        self::assertStringContainsString(_pgettext('None privileges', 'None'), $html);
 
         $GLOBALS['dbi'] = $dbi_old;
         $this->serverPrivileges->dbi = $dbi_old;
@@ -979,29 +895,17 @@ class PrivilegesTest extends AbstractTestCase
         $html = $this->serverPrivileges->getHtmlForLoginInformationFields();
 
         //validate 1: __('Login Information')
-        $this->assertStringContainsString(
-            __('Login Information'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('User name:'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Any user'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Use text field'),
-            $html
-        );
+        self::assertStringContainsString(__('Login Information'), $html);
+        self::assertStringContainsString(__('User name:'), $html);
+        self::assertStringContainsString(__('Any user'), $html);
+        self::assertStringContainsString(__('Use text field'), $html);
 
         $output = Generator::showHint(
             __(
                 'When Host table is used, this field is ignored and values stored in Host table are used instead.'
             )
         );
-        $this->assertStringContainsString($output, $html);
+        self::assertStringContainsString($output, $html);
 
         $GLOBALS['dbi'] = $dbi_old;
         $this->serverPrivileges->dbi = $dbi_old;
@@ -1022,7 +926,7 @@ class PrivilegesTest extends AbstractTestCase
         $expect = 'WITH GRANT OPTION MAX_QUERIES_PER_HOUR 10 '
             . 'MAX_CONNECTIONS_PER_HOUR 20'
             . ' MAX_UPDATES_PER_HOUR 30 MAX_USER_CONNECTIONS 40';
-        $this->assertStringContainsString($expect, $sql_query);
+        self::assertStringContainsString($expect, $sql_query);
     }
 
     /**
@@ -1062,40 +966,25 @@ class PrivilegesTest extends AbstractTestCase
         $html = $this->serverPrivileges->getHtmlForAddUser($dbname);
 
         //validate 1: Url::getHiddenInputs
-        $this->assertStringContainsString(
-            Url::getHiddenInputs('', ''),
-            $html
-        );
+        self::assertStringContainsString(Url::getHiddenInputs('', ''), $html);
 
         //validate 2: getHtmlForLoginInformationFields
-        $this->assertStringContainsString(
-            $this->serverPrivileges->getHtmlForLoginInformationFields('new'),
-            $html
-        );
+        self::assertStringContainsString($this->serverPrivileges->getHtmlForLoginInformationFields('new'), $html);
 
         //validate 3: Database for user
-        $this->assertStringContainsString(
-            __('Database for user'),
-            $html
-        );
+        self::assertStringContainsString(__('Database for user'), $html);
 
-        $this->assertStringContainsString(
-            __('Grant all privileges on wildcard name (username\\_%).'),
-            $html
-        );
-        $this->assertStringContainsString('<input type="checkbox" name="createdb-2" id="createdb-2">', $html);
+        self::assertStringContainsString(__('Grant all privileges on wildcard name (username\\_%).'), $html);
+        self::assertStringContainsString('<input type="checkbox" name="createdb-2" id="createdb-2">', $html);
 
         //validate 4: getHtmlToDisplayPrivilegesTable
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             $this->serverPrivileges->getHtmlToDisplayPrivilegesTable('*', '*', false),
             $html
         );
 
         //validate 5: button
-        $this->assertStringContainsString(
-            __('Go'),
-            $html
-        );
+        self::assertStringContainsString(__('Go'), $html);
 
         $GLOBALS['dbi'] = $dbi_old;
         $this->serverPrivileges->dbi = $dbi_old;
@@ -1121,11 +1010,8 @@ class PrivilegesTest extends AbstractTestCase
             'tablename' => $tablename,
             'routinename' => '',
         ], '');
-        $this->assertStringContainsString($url_html, $html);
-        $this->assertStringContainsString(
-            __('Edit privileges'),
-            $html
-        );
+        self::assertStringContainsString($url_html, $html);
+        self::assertStringContainsString(__('Edit privileges'), $html);
 
         $dbname = 'pma_dbname';
         $html = $this->serverPrivileges->getUserLink('revoke', $username, $hostname, $dbname, $tablename, '');
@@ -1142,11 +1028,8 @@ class PrivilegesTest extends AbstractTestCase
             ],
             ''
         );
-        $this->assertStringContainsString($url_html, $html);
-        $this->assertStringContainsString(
-            __('Revoke'),
-            $html
-        );
+        self::assertStringContainsString($url_html, $html);
+        self::assertStringContainsString(__('Revoke'), $html);
 
         $html = $this->serverPrivileges->getUserLink('export', $username, $hostname);
 
@@ -1156,11 +1039,8 @@ class PrivilegesTest extends AbstractTestCase
             'initial' => '',
             'export' => 1,
         ], '');
-        $this->assertStringContainsString($url_html, $html);
-        $this->assertStringContainsString(
-            __('Export'),
-            $html
-        );
+        self::assertStringContainsString($url_html, $html);
+        self::assertStringContainsString(__('Export'), $html);
     }
 
     /**
@@ -1183,11 +1063,8 @@ class PrivilegesTest extends AbstractTestCase
             'tablename' => $tablename,
             'routinename' => '',
         ], '');
-        $this->assertStringContainsString($url_html, $html);
-        $this->assertStringContainsString(
-            __('Edit privileges'),
-            $html
-        );
+        self::assertStringContainsString($url_html, $html);
+        self::assertStringContainsString(__('Edit privileges'), $html);
 
         $dbname = 'pma\_dbname';
         $html = $this->serverPrivileges->getUserLink('revoke', $username, $hostname, $dbname, $tablename, '');
@@ -1204,11 +1081,8 @@ class PrivilegesTest extends AbstractTestCase
             ],
             ''
         );
-        $this->assertStringContainsString($url_html, $html);
-        $this->assertStringContainsString(
-            __('Revoke'),
-            $html
-        );
+        self::assertStringContainsString($url_html, $html);
+        self::assertStringContainsString(__('Revoke'), $html);
 
         $html = $this->serverPrivileges->getUserLink('export', $username, $hostname);
 
@@ -1218,11 +1092,8 @@ class PrivilegesTest extends AbstractTestCase
             'initial' => '',
             'export' => 1,
         ], '');
-        $this->assertStringContainsString($url_html, $html);
-        $this->assertStringContainsString(
-            __('Export'),
-            $html
-        );
+        self::assertStringContainsString($url_html, $html);
+        self::assertStringContainsString(__('Export'), $html);
     }
 
     /**
@@ -1245,35 +1116,26 @@ class PrivilegesTest extends AbstractTestCase
         $extra_data = $this->serverPrivileges->getExtraDataForAjaxBehavior($password, $sql_query, $hostname, $username);
 
         //user_exists
-        $this->assertFalse($extra_data['user_exists']);
+        self::assertFalse($extra_data['user_exists']);
 
         //db_wildcard_privs
-        $this->assertTrue($extra_data['db_wildcard_privs']);
+        self::assertTrue($extra_data['db_wildcard_privs']);
 
         //user_exists
-        $this->assertFalse($extra_data['db_specific_privs']);
+        self::assertFalse($extra_data['db_specific_privs']);
 
         //new_user_initial
-        $this->assertEquals('P', $extra_data['new_user_initial']);
+        self::assertSame('P', $extra_data['new_user_initial']);
 
         //sql_query
-        $this->assertEquals(
-            Generator::getMessage('', $sql_query),
-            $extra_data['sql_query']
-        );
+        self::assertSame(Generator::getMessage('', $sql_query), $extra_data['sql_query']);
 
         //new_user_string
-        $this->assertStringContainsString(
-            htmlspecialchars($hostname),
-            $extra_data['new_user_string']
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($username),
-            $extra_data['new_user_string']
-        );
+        self::assertStringContainsString(htmlspecialchars($hostname), $extra_data['new_user_string']);
+        self::assertStringContainsString(htmlspecialchars($username), $extra_data['new_user_string']);
 
         //new_privileges
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             implode(', ', $this->serverPrivileges->extractPrivInfo(null, true)),
             $extra_data['new_privileges']
         );
@@ -1303,7 +1165,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $returned_userGroup = $this->serverPrivileges->getUserGroupForUser($username);
 
-        $this->assertEquals($expected_userGroup, $returned_userGroup);
+        self::assertSame($expected_userGroup, $returned_userGroup);
 
         $GLOBALS['dbi'] = $dbi_old;
         $this->serverPrivileges->dbi = $dbi_old;
@@ -1321,76 +1183,34 @@ class PrivilegesTest extends AbstractTestCase
         $html = $this->serverPrivileges->getUsersOverview($resultStub, $db_rights, $text_dir);
 
         //Url::getHiddenInputs
-        $this->assertStringContainsString(
-            Url::getHiddenInputs('', ''),
-            $html
-        );
+        self::assertStringContainsString(Url::getHiddenInputs('', ''), $html);
 
         //items
-        $this->assertStringContainsString(
-            __('User'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Host'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Password'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Global privileges'),
-            $html
-        );
+        self::assertStringContainsString(__('User'), $html);
+        self::assertStringContainsString(__('Host'), $html);
+        self::assertStringContainsString(__('Password'), $html);
+        self::assertStringContainsString(__('Global privileges'), $html);
 
         //Util::showHint
-        $this->assertStringContainsString(
-            Generator::showHint(
-                __('Note: MySQL privilege names are expressed in English.')
-            ),
-            $html
-        );
+        self::assertStringContainsString(Generator::showHint(
+            __('Note: MySQL privilege names are expressed in English.')
+        ), $html);
 
         //__('User group')
-        $this->assertStringContainsString(
-            __('User group'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Grant'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Action'),
-            $html
-        );
+        self::assertStringContainsString(__('User group'), $html);
+        self::assertStringContainsString(__('Grant'), $html);
+        self::assertStringContainsString(__('Action'), $html);
 
         //$text_dir
-        $this->assertStringContainsString($text_dir, $html);
+        self::assertStringContainsString($text_dir, $html);
 
-        $this->assertStringContainsString(
-            Url::getCommon(['adduser' => 1], ''),
-            $html
-        );
+        self::assertStringContainsString(Url::getCommon(['adduser' => 1], ''), $html);
 
         //labels
-        $this->assertStringContainsString(
-            __('Add user account'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Remove selected user accounts'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Drop the databases that have the same names as the users.'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Drop the databases that have the same names as the users.'),
-            $html
-        );
+        self::assertStringContainsString(__('Add user account'), $html);
+        self::assertStringContainsString(__('Remove selected user accounts'), $html);
+        self::assertStringContainsString(__('Drop the databases that have the same names as the users.'), $html);
+        self::assertStringContainsString(__('Drop the databases that have the same names as the users.'), $html);
     }
 
     /**
@@ -1412,7 +1232,7 @@ class PrivilegesTest extends AbstractTestCase
             "# Deleting 'old_username'@'old_hostname' ...",
             "DROP USER 'old_username'@'old_hostname';",
         ];
-        $this->assertEquals($item, $ret);
+        self::assertSame($item, $ret);
     }
 
     /**
@@ -1422,18 +1242,9 @@ class PrivilegesTest extends AbstractTestCase
     {
         $html = $this->serverPrivileges->getAddUserHtmlFieldset();
 
-        $this->assertStringContainsString(
-            Url::getCommon(['adduser' => 1], ''),
-            $html
-        );
-        $this->assertStringContainsString(
-            Generator::getIcon('b_usradd'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Add user'),
-            $html
-        );
+        self::assertStringContainsString(Url::getCommon(['adduser' => 1], ''), $html);
+        self::assertStringContainsString(Generator::getIcon('b_usradd'), $html);
+        self::assertStringContainsString(__('Add user'), $html);
     }
 
     /**
@@ -1461,14 +1272,8 @@ class PrivilegesTest extends AbstractTestCase
         );
 
         //title
-        $this->assertStringContainsString(
-            __('Edit privileges:'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('User account'),
-            $html
-        );
+        self::assertStringContainsString(__('Edit privileges:'), $html);
+        self::assertStringContainsString(__('User account'), $html);
 
         //Url::getCommon
         $item = Url::getCommon([
@@ -1477,29 +1282,17 @@ class PrivilegesTest extends AbstractTestCase
             'dbname' => '',
             'tablename' => '',
         ], '');
-        $this->assertStringContainsString($item, $html);
+        self::assertStringContainsString($item, $html);
 
         //$username & $hostname
-        $this->assertStringContainsString(
-            htmlspecialchars($username),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($hostname),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($username), $html);
+        self::assertStringContainsString(htmlspecialchars($hostname), $html);
 
         //$dbname_is_wildcard = true
-        $this->assertStringContainsString(
-            __('Databases'),
-            $html
-        );
+        self::assertStringContainsString(__('Databases'), $html);
 
         //$dbname_is_wildcard = true
-        $this->assertStringContainsString(
-            __('Databases'),
-            $html
-        );
+        self::assertStringContainsString(__('Databases'), $html);
 
         //Url::getCommon
         $item = Url::getCommon([
@@ -1508,8 +1301,8 @@ class PrivilegesTest extends AbstractTestCase
             'dbname' => $url_dbname,
             'tablename' => '',
         ], '');
-        $this->assertStringContainsString($item, $html);
-        $this->assertStringContainsString($dbname, $html);
+        self::assertStringContainsString($item, $html);
+        self::assertStringContainsString($dbname, $html);
     }
 
     /**
@@ -1517,7 +1310,7 @@ class PrivilegesTest extends AbstractTestCase
      */
     public function testGetHtmlForViewUsersError(): void
     {
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'Not enough privilege to view users.',
             $this->serverPrivileges->getHtmlForViewUsersError()
         );
@@ -1569,69 +1362,54 @@ class PrivilegesTest extends AbstractTestCase
         $GLOBALS['hostname'] = 'host';
 
         $actual = $serverPrivileges->getHtmlForUserProperties(false, 'sakila', 'user', 'host', 'sakila', 'actor');
-        $this->assertStringContainsString('addUsersForm', $actual);
-        $this->assertStringContainsString('SELECT', $actual);
-        $this->assertStringContainsString('Allows reading data.', $actual);
-        $this->assertStringContainsString('INSERT', $actual);
-        $this->assertStringContainsString('Allows inserting and replacing data.', $actual);
-        $this->assertStringContainsString('UPDATE', $actual);
-        $this->assertStringContainsString('Allows changing data.', $actual);
-        $this->assertStringContainsString('DELETE', $actual);
-        $this->assertStringContainsString('Allows deleting data.', $actual);
-        $this->assertStringContainsString('CREATE', $actual);
-        $this->assertStringContainsString('Allows creating new tables.', $actual);
+        self::assertStringContainsString('addUsersForm', $actual);
+        self::assertStringContainsString('SELECT', $actual);
+        self::assertStringContainsString('Allows reading data.', $actual);
+        self::assertStringContainsString('INSERT', $actual);
+        self::assertStringContainsString('Allows inserting and replacing data.', $actual);
+        self::assertStringContainsString('UPDATE', $actual);
+        self::assertStringContainsString('Allows changing data.', $actual);
+        self::assertStringContainsString('DELETE', $actual);
+        self::assertStringContainsString('Allows deleting data.', $actual);
+        self::assertStringContainsString('CREATE', $actual);
+        self::assertStringContainsString('Allows creating new tables.', $actual);
 
-        $this->assertStringContainsString(
-            Url::getHiddenInputs(),
-            $actual
-        );
+        self::assertStringContainsString(Url::getHiddenInputs(), $actual);
 
         //$username & $hostname
-        $this->assertStringContainsString('user', $actual);
-        $this->assertStringContainsString('host', $actual);
+        self::assertStringContainsString('user', $actual);
+        self::assertStringContainsString('host', $actual);
 
         //Create a new user with the same privileges
-        $this->assertStringContainsString('Create a new user account with the same privileges', $actual);
+        self::assertStringContainsString('Create a new user account with the same privileges', $actual);
 
-        $this->assertStringContainsString(
-            __('Database'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'],
-                'database'
-            ),
-            $actual
-        );
+        self::assertStringContainsString(__('Database'), $actual);
+        self::assertStringContainsString(Util::getScriptNameForOption(
+            $GLOBALS['cfg']['DefaultTabDatabase'],
+            'database'
+        ), $actual);
         $item = Url::getCommon([
             'db' => 'sakila',
             'reload' => 1,
         ], '');
-        $this->assertStringContainsString($item, $actual);
-        $this->assertStringContainsString('sakila', $actual);
+        self::assertStringContainsString($item, $actual);
+        self::assertStringContainsString('sakila', $actual);
 
         //$tablename
-        $this->assertStringContainsString(
-            __('Table'),
-            $actual
-        );
-        $this->assertStringContainsString(
-            Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabTable'],
-                'table'
-            ),
-            $actual
-        );
+        self::assertStringContainsString(__('Table'), $actual);
+        self::assertStringContainsString(Util::getScriptNameForOption(
+            $GLOBALS['cfg']['DefaultTabTable'],
+            'table'
+        ), $actual);
         $item = Url::getCommon([
             'db' => 'sakila',
             'table' => 'actor',
             'reload' => 1,
         ], '');
-        $this->assertStringContainsString($item, $actual);
-        $this->assertStringContainsString('table', $actual);
+        self::assertStringContainsString($item, $actual);
+        self::assertStringContainsString('table', $actual);
         $item = Util::getTitleForTarget($GLOBALS['cfg']['DefaultTabTable']);
-        $this->assertStringContainsString((string) $item, $actual);
+        self::assertStringContainsString((string) $item, $actual);
     }
 
     /**
@@ -1641,8 +1419,8 @@ class PrivilegesTest extends AbstractTestCase
     {
         $_REQUEST = ['ajax_page_request' => '1'];
         $actual = $this->serverPrivileges->getHtmlForUserOverview('ltr');
-        $this->assertStringContainsString('Note: MySQL privilege names are expressed in English.', $actual);
-        $this->assertStringContainsString(
+        self::assertStringContainsString('Note: MySQL privilege names are expressed in English.', $actual);
+        self::assertStringContainsString(
             'Note: phpMyAdmin gets the users’ privileges directly from MySQL’s privilege tables.',
             $actual
         );
@@ -1655,10 +1433,10 @@ class PrivilegesTest extends AbstractTestCase
     {
         // Test case 1
         $actual = $this->serverPrivileges->getHtmlForAllTableSpecificRights('pma', 'host', 'table', 'pmadb');
-        $this->assertStringContainsString('<input type="hidden" name="username" value="pma">', $actual);
-        $this->assertStringContainsString('<input type="hidden" name="hostname" value="host">', $actual);
-        $this->assertStringContainsString('<legend data-submenu-label="Table">', $actual);
-        $this->assertStringContainsString('Table-specific privileges', $actual);
+        self::assertStringContainsString('<input type="hidden" name="username" value="pma">', $actual);
+        self::assertStringContainsString('<input type="hidden" name="hostname" value="host">', $actual);
+        self::assertStringContainsString('<legend data-submenu-label="Table">', $actual);
+        self::assertStringContainsString('Table-specific privileges', $actual);
 
         // Test case 2
         $GLOBALS['dblist'] = new stdClass();
@@ -1668,8 +1446,8 @@ class PrivilegesTest extends AbstractTestCase
             'z',
         ];
         $actual = $this->serverPrivileges->getHtmlForAllTableSpecificRights('pma2', 'host2', 'database', '');
-        $this->assertStringContainsString('<legend data-submenu-label="Database">', $actual);
-        $this->assertStringContainsString('Database-specific privileges', $actual);
+        self::assertStringContainsString('<legend data-submenu-label="Database">', $actual);
+        self::assertStringContainsString('Database-specific privileges', $actual);
     }
 
     /**
@@ -1692,37 +1470,37 @@ class PrivilegesTest extends AbstractTestCase
         $this->serverPrivileges->dbi = $dbi;
 
         $actual = $this->serverPrivileges->getHtmlForInitials();
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<a class="page-link" href="#" tabindex="-1" aria-disabled="true">A</a>',
             $actual
         );
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Z</a>',
             $actual
         );
-        $this->assertMatchesRegularExpressionCompat(
+        self::assertMatchesRegularExpressionCompat(
             '/<a class="page-link" href="index.php\?route=\/server\/privileges&initial=-&lang=en">\s*-\s*<\/a>/',
             $actual
         );
-        $this->assertMatchesRegularExpressionCompat(
+        self::assertMatchesRegularExpressionCompat(
             '/<a class="page-link" href="index.php\?route=\/server\/privileges&initial=%22&lang=en">\s*&quot;\s*<\/a>/',
             $actual
         );
-        $this->assertMatchesRegularExpressionCompat(
+        self::assertMatchesRegularExpressionCompat(
             '/<a class="page-link" href="index.php\?route=\/server\/privileges&initial=%25&lang=en">\s*%\s*<\/a>/',
             $actual
         );
-        $this->assertMatchesRegularExpressionCompat(
+        self::assertMatchesRegularExpressionCompat(
             '/<a class="page-link" href="index.php\?route=\/server\/privileges&initial=%5C&lang=en">\s*\\\\\s*<\/a>/',
             $actual
         );
-        $this->assertMatchesRegularExpressionCompat(
+        self::assertMatchesRegularExpressionCompat(
             '/<a class="page-link" href="index.php\?route=\/server\/privileges&initial=&lang=en">\s*' .
-                '<span class="text-danger text-nowrap">' . preg_quote(__('Any')) . '<\/span>' .
-                '\s*<\/a>/',
+            '<span class="text-danger text-nowrap">' . preg_quote(__('Any')) . '<\/span>' .
+            '\s*<\/a>/',
             $actual
         );
-        $this->assertStringContainsString('Show all', $actual);
+        self::assertStringContainsString('Show all', $actual);
     }
 
     /**
@@ -1773,7 +1551,7 @@ class PrivilegesTest extends AbstractTestCase
             ],
         ];
         $actual = $this->serverPrivileges->getDbRightsForUserOverview();
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -1803,37 +1581,28 @@ class PrivilegesTest extends AbstractTestCase
         // Test case 1 : empty queries
         $queries = [];
         $actual = $this->serverPrivileges->deleteUser($queries);
-        $this->assertArrayHasKey(0, $actual);
-        $this->assertArrayHasKey(1, $actual);
-        $this->assertEquals('', $actual[0]);
-        $this->assertEquals(
-            'No users selected for deleting!',
-            $actual[1]->getMessage()
-        );
+        self::assertArrayHasKey(0, $actual);
+        self::assertArrayHasKey(1, $actual);
+        self::assertSame('', $actual[0]);
+        self::assertSame('No users selected for deleting!', $actual[1]->getMessage());
 
         // Test case 2 : all successful queries
         $_POST['mode'] = 3;
         $queries = ['foo'];
         $actual = $this->serverPrivileges->deleteUser($queries);
-        $this->assertArrayHasKey(0, $actual);
-        $this->assertArrayHasKey(1, $actual);
-        $this->assertEquals("foo\n# Reloading the privileges …\nFLUSH PRIVILEGES;", $actual[0]);
-        $this->assertEquals(
-            'The selected users have been deleted successfully.',
-            $actual[1]->getMessage()
-        );
+        self::assertArrayHasKey(0, $actual);
+        self::assertArrayHasKey(1, $actual);
+        self::assertSame("foo\n# Reloading the privileges …\nFLUSH PRIVILEGES;", $actual[0]);
+        self::assertSame('The selected users have been deleted successfully.', $actual[1]->getMessage());
 
         // Test case 3 : failing queries
         $_POST['mode'] = 1;
         $queries = ['bar'];
         $actual = $this->serverPrivileges->deleteUser($queries);
-        $this->assertArrayHasKey(0, $actual);
-        $this->assertArrayHasKey(1, $actual);
-        $this->assertEquals('bar', $actual[0]);
-        $this->assertEquals(
-            'Some error occurred!' . "\n",
-            $actual[1]->getMessage()
-        );
+        self::assertArrayHasKey(0, $actual);
+        self::assertArrayHasKey(1, $actual);
+        self::assertSame('bar', $actual[0]);
+        self::assertSame('Some error occurred!' . "\n", $actual[1]->getMessage());
     }
 
     public function testGetFormForChangePassword(): void
@@ -1846,44 +1615,20 @@ class PrivilegesTest extends AbstractTestCase
 
         $html = $this->serverPrivileges->getFormForChangePassword($username, $hostname, false);
 
-        $this->assertStringContainsString(
-            Url::getFromRoute('/server/privileges'),
-            $html
-        );
+        self::assertStringContainsString(Url::getFromRoute('/server/privileges'), $html);
 
         //Url::getHiddenInputs
-        $this->assertStringContainsString(
-            Url::getHiddenInputs(),
-            $html
-        );
+        self::assertStringContainsString(Url::getHiddenInputs(), $html);
 
         //$username & $hostname
-        $this->assertStringContainsString(
-            htmlspecialchars($username),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($hostname),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($username), $html);
+        self::assertStringContainsString(htmlspecialchars($hostname), $html);
 
         //labels
-        $this->assertStringContainsString(
-            __('Change password'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('No Password'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Password:'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Password:'),
-            $html
-        );
+        self::assertStringContainsString(__('Change password'), $html);
+        self::assertStringContainsString(__('No Password'), $html);
+        self::assertStringContainsString(__('Password:'), $html);
+        self::assertStringContainsString(__('Password:'), $html);
     }
 
     /**
@@ -1929,6 +1674,6 @@ class PrivilegesTest extends AbstractTestCase
         /** @var array|null $actual */
         $actual = $method->invokeArgs($serverPrivileges, ['test.user', 'test.host', true]);
 
-        $this->assertEquals(['Host' => 'test.host', 'User' => 'test.user', 'account_locked' => 'Y'], $actual);
+        self::assertSame(['Host' => 'test.host', 'User' => 'test.user', 'account_locked' => 'Y'], $actual);
     }
 }
diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php
index 1c1f13a701..3c9a9bc070 100644
--- a/test/classes/Server/SelectTest.php
+++ b/test/classes/Server/SelectTest.php
@@ -75,32 +75,23 @@ class SelectTest extends AbstractTestCase
 
         if ($not_only_options) {
             if (! $omit_fieldset) {
-                $this->assertStringContainsString('</fieldset>', $html);
+                self::assertStringContainsString('</fieldset>', $html);
             }
 
-            $this->assertStringContainsString(
-                Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabServer'],
-                    'server'
-                ),
-                $html
-            );
+            self::assertStringContainsString(Util::getScriptNameForOption(
+                $GLOBALS['cfg']['DefaultTabServer'],
+                'server'
+            ), $html);
 
-            $this->assertStringContainsString(
-                __('Current server:'),
-                $html
-            );
-            $this->assertStringContainsString(
-                '(' . __('Servers') . ')',
-                $html
-            );
+            self::assertStringContainsString(__('Current server:'), $html);
+            self::assertStringContainsString('(' . __('Servers') . ')', $html);
         }
 
         //server items
-        $this->assertStringContainsString($server['host'], $html);
-        $this->assertStringContainsString($server['port'], $html);
-        $this->assertStringContainsString($server['only_db'], $html);
-        $this->assertStringContainsString($server['user'], $html);
+        self::assertStringContainsString($server['host'], $html);
+        self::assertStringContainsString($server['port'], $html);
+        self::assertStringContainsString($server['only_db'], $html);
+        self::assertStringContainsString($server['user'], $html);
     }
 
     public static function renderDataProvider(): array
diff --git a/test/classes/Server/SysInfo/SysInfoTest.php b/test/classes/Server/SysInfo/SysInfoTest.php
index 37d73cb21a..09b62a51be 100644
--- a/test/classes/Server/SysInfo/SysInfoTest.php
+++ b/test/classes/Server/SysInfo/SysInfoTest.php
@@ -23,10 +23,7 @@ class SysInfoTest extends AbstractTestCase
      */
     public function testGetSysInfoOs(string $os, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            SysInfo::getOs($os)
-        );
+        self::assertSame($expected, SysInfo::getOs($os));
     }
 
     /**
@@ -59,7 +56,7 @@ class SysInfoTest extends AbstractTestCase
      */
     public function testGetSysInfo(): void
     {
-        $this->assertInstanceOf(Base::class, SysInfo::get());
+        self::assertInstanceOf(Base::class, SysInfo::get());
     }
 
     /**
@@ -67,6 +64,6 @@ class SysInfoTest extends AbstractTestCase
      */
     public function testGetSysInfoSupported(): void
     {
-        $this->assertTrue(SysInfo::get()->supported());
+        self::assertTrue(SysInfo::get()->supported());
     }
 }
diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
index 985feb404d..62fa39d018 100644
--- a/test/classes/Setup/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -52,25 +52,19 @@ class ConfigGeneratorTest extends AbstractTestCase
 
         $result = ConfigGenerator::getConfigFile($cf);
 
-        $this->assertStringContainsString(
-            "<?php\n" .
-            "/**\n" .
-            " * Generated configuration file\n" .
-            ' * Generated by: phpMyAdmin ' . Version::VERSION . " setup script\n",
-            $result
-        );
+        self::assertStringContainsString("<?php\n" .
+        "/**\n" .
+        " * Generated configuration file\n" .
+        ' * Generated by: phpMyAdmin ' . Version::VERSION . " setup script\n", $result);
 
-        $this->assertStringContainsString(
-            "/* Servers configuration */\n" .
-            '$i = 0;' . "\n\n" .
-            "/* Server: localhost [0] */\n" .
-            '$i++;' . "\n" .
-            '$cfg[\'Servers\'][$i][\'0\'] = 1;' . "\n" .
-            '$cfg[\'Servers\'][$i][\'1\'] = 2;' . "\n" .
-            '$cfg[\'Servers\'][$i][\'2\'] = 3;' . "\n\n" .
-            "/* End of servers configuration */\n\n",
-            $result
-        );
+        self::assertStringContainsString("/* Servers configuration */\n" .
+        '$i = 0;' . "\n\n" .
+        "/* Server: localhost [0] */\n" .
+        '$i++;' . "\n" .
+        '$cfg[\'Servers\'][$i][\'0\'] = 1;' . "\n" .
+        '$cfg[\'Servers\'][$i][\'1\'] = 2;' . "\n" .
+        '$cfg[\'Servers\'][$i][\'2\'] = 3;' . "\n\n" .
+        "/* End of servers configuration */\n\n", $result);
     }
 
     /**
@@ -82,44 +76,32 @@ class ConfigGeneratorTest extends AbstractTestCase
         $method = $reflection->getMethod('getVarExport');
         $method->setAccessible(true);
 
-        $this->assertEquals(
-            '$cfg[\'var_name\'] = 1;' . "\n",
-            $method->invoke(null, 'var_name', 1, "\n")
-        );
+        self::assertSame('$cfg[\'var_name\'] = 1;' . "\n", $method->invoke(null, 'var_name', 1, "\n"));
 
-        $this->assertEquals(
-            '$cfg[\'var_name\'] = array (' .
-            "\n);\n",
-            $method->invoke(null, 'var_name', [], "\n")
-        );
+        self::assertSame('$cfg[\'var_name\'] = array (' .
+        "\n);\n", $method->invoke(null, 'var_name', [], "\n"));
 
-        $this->assertEquals(
-            '$cfg[\'var_name\'] = [1, 2, 3];' . "\n",
-            $method->invoke(
-                null,
-                'var_name',
-                [
-                    1,
-                    2,
-                    3,
-                ],
-                "\n"
-            )
-        );
+        self::assertSame('$cfg[\'var_name\'] = [1, 2, 3];' . "\n", $method->invoke(
+            null,
+            'var_name',
+            [
+                1,
+                2,
+                3,
+            ],
+            "\n"
+        ));
 
-        $this->assertEquals(
-            '$cfg[\'var_name\'][\'1a\'] = \'foo\';' . "\n" .
-            '$cfg[\'var_name\'][\'b\'] = \'bar\';' . "\n",
-            $method->invoke(
-                null,
-                'var_name',
-                [
-                    '1a' => 'foo',
-                    'b' => 'bar',
-                ],
-                "\n"
-            )
-        );
+        self::assertSame('$cfg[\'var_name\'][\'1a\'] = \'foo\';' . "\n" .
+        '$cfg[\'var_name\'][\'b\'] = \'bar\';' . "\n", $method->invoke(
+            null,
+            'var_name',
+            [
+                '1a' => 'foo',
+                'b' => 'bar',
+            ],
+            "\n"
+        ));
     }
 
     public function testGetVarExportForBlowfishSecret(): void
@@ -128,7 +110,7 @@ class ConfigGeneratorTest extends AbstractTestCase
         $method = $reflection->getMethod('getVarExport');
         $method->setAccessible(true);
 
-        $this->assertEquals(
+        self::assertSame(
             '$cfg[\'blowfish_secret\'] = \sodium_hex2bin(\''
             . '6161616161616161616161616161616161616161616161616161616161616161\');' . "\n",
             $method->invoke(null, 'blowfish_secret', str_repeat('a', SODIUM_CRYPTO_SECRETBOX_KEYBYTES), "\n")
@@ -136,13 +118,13 @@ class ConfigGeneratorTest extends AbstractTestCase
 
         /** @var string $actual */
         $actual = $method->invoke(null, 'blowfish_secret', 'invalid secret', "\n");
-        $this->assertStringStartsWith('$cfg[\'blowfish_secret\'] = \sodium_hex2bin(\'', $actual);
-        $this->assertStringEndsWith('\');' . "\n", $actual);
+        self::assertStringStartsWith('$cfg[\'blowfish_secret\'] = \sodium_hex2bin(\'', $actual);
+        self::assertStringEndsWith('\');' . "\n", $actual);
         $pieces = explode('\'', $actual);
-        $this->assertCount(5, $pieces);
+        self::assertCount(5, $pieces);
         $binaryString = hex2bin($pieces[3]);
-        $this->assertIsString($binaryString);
-        $this->assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($binaryString, '8bit'));
+        self::assertIsString($binaryString);
+        self::assertSame(SODIUM_CRYPTO_SECRETBOX_KEYBYTES, mb_strlen($binaryString, '8bit'));
     }
 
     /**
@@ -154,44 +136,36 @@ class ConfigGeneratorTest extends AbstractTestCase
         $method = $reflection->getMethod('isZeroBasedArray');
         $method->setAccessible(true);
 
-        $this->assertFalse(
-            $method->invoke(
-                null,
-                [
-                    'a' => 1,
-                    'b' => 2,
-                ]
-            )
-        );
+        self::assertFalse($method->invoke(
+            null,
+            [
+                'a' => 1,
+                'b' => 2,
+            ]
+        ));
 
-        $this->assertFalse(
-            $method->invoke(
-                null,
-                [
-                    0 => 1,
-                    1 => 2,
-                    3 => 3,
-                ]
-            )
-        );
+        self::assertFalse($method->invoke(
+            null,
+            [
+                0 => 1,
+                1 => 2,
+                3 => 3,
+            ]
+        ));
 
-        $this->assertTrue(
-            $method->invoke(
-                null,
-                []
-            )
-        );
+        self::assertTrue($method->invoke(
+            null,
+            []
+        ));
 
-        $this->assertTrue(
-            $method->invoke(
-                null,
-                [
-                    1,
-                    2,
-                    3,
-                ]
-            )
-        );
+        self::assertTrue($method->invoke(
+            null,
+            [
+                1,
+                2,
+                3,
+            ]
+        ));
     }
 
     /**
@@ -212,7 +186,7 @@ class ConfigGeneratorTest extends AbstractTestCase
 
         $result = $method->invoke(null, $arr, "\n");
 
-        $this->assertEquals('[1, 2, 3, 4]', $result);
+        self::assertSame('[1, 2, 3, 4]', $result);
 
         $arr = [
             1,
@@ -225,15 +199,12 @@ class ConfigGeneratorTest extends AbstractTestCase
 
         $result = $method->invoke(null, $arr, "\n");
 
-        $this->assertEquals(
-            '[' . "\n" .
-            '    1,' . "\n" .
-            '    2,' . "\n" .
-            '    3,' . "\n" .
-            '    4,' . "\n" .
-            '    7,' . "\n" .
-            '    \'foo\']',
-            $result
-        );
+        self::assertSame('[' . "\n" .
+        '    1,' . "\n" .
+        '    2,' . "\n" .
+        '    3,' . "\n" .
+        '    4,' . "\n" .
+        '    7,' . "\n" .
+        '    \'foo\']', $result);
     }
 }
diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php
index 66dba10fdb..fe748e0f98 100644
--- a/test/classes/Setup/FormProcessingTest.php
+++ b/test/classes/Setup/FormProcessingTest.php
@@ -81,15 +81,15 @@ class FormProcessingTest extends AbstractNetworkTestCase
         FormProcessing::process($formDisplay);
         $result = ob_get_clean();
 
-        $this->assertIsString($result);
+        self::assertIsString($result);
 
-        $this->assertStringContainsString('<div class="error">', $result);
+        self::assertStringContainsString('<div class="error">', $result);
 
-        $this->assertStringContainsString('mode=revert', $result);
+        self::assertStringContainsString('mode=revert', $result);
 
-        $this->assertStringContainsString('<a class="btn" href="index.php?', $result);
+        self::assertStringContainsString('<a class="btn" href="index.php?', $result);
 
-        $this->assertStringContainsString('mode=edit', $result);
+        self::assertStringContainsString('mode=edit', $result);
 
         // case 3
         $formDisplay = $this->getMockBuilder(FormDisplay::class)
diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php
index 26a33aacce..6a53b53e9f 100644
--- a/test/classes/Setup/IndexTest.php
+++ b/test/classes/Setup/IndexTest.php
@@ -35,35 +35,29 @@ class IndexTest extends AbstractTestCase
 
         SetupIndex::messagesBegin();
 
-        $this->assertEquals(
+        self::assertSame([
             [
                 [
-                    [
-                        0 => 'foo',
-                        'fresh' => false,
-                        'active' => false,
-                    ],
-                    [
-                        0 => 'bar',
-                        'fresh' => false,
-                        'active' => false,
-                    ],
+                    0 => 'foo',
+                    'fresh' => false,
+                    'active' => false,
+                ],
+                [
+                    0 => 'bar',
+                    'fresh' => false,
+                    'active' => false,
                 ],
             ],
-            $_SESSION['messages']
-        );
+        ], $_SESSION['messages']);
 
         // case 2
 
         unset($_SESSION['messages']);
         SetupIndex::messagesBegin();
-        $this->assertEquals(
-            [
-                'error' => [],
-                'notice' => [],
-            ],
-            $_SESSION['messages']
-        );
+        self::assertSame([
+            'error' => [],
+            'notice' => [],
+        ], $_SESSION['messages']);
     }
 
     /**
@@ -73,15 +67,12 @@ class IndexTest extends AbstractTestCase
     {
         SetupIndex::messagesSet('type', '123', 'testTitle', 'msg');
 
-        $this->assertEquals(
-            [
-                'fresh' => true,
-                'active' => true,
-                'title' => 'testTitle',
-                'message' => 'msg',
-            ],
-            $_SESSION['messages']['type']['123']
-        );
+        self::assertSame([
+            'fresh' => true,
+            'active' => true,
+            'title' => 'testTitle',
+            'message' => 'msg',
+        ], $_SESSION['messages']['type']['123']);
     }
 
     /**
@@ -104,17 +95,14 @@ class IndexTest extends AbstractTestCase
 
         SetupIndex::messagesEnd();
 
-        $this->assertEquals(
+        self::assertEquals([
             [
-                [
-                    '1' => [
-                        'msg' => 'bar',
-                        'active' => 1,
-                    ],
+                '1' => [
+                    'msg' => 'bar',
+                    'active' => 1,
                 ],
             ],
-            $_SESSION['messages']
-        );
+        ], $_SESSION['messages']);
     }
 
     /**
@@ -154,6 +142,6 @@ class IndexTest extends AbstractTestCase
             ],
         ];
 
-        $this->assertEquals($expected, SetupIndex::messagesShowHtml());
+        self::assertSame($expected, SetupIndex::messagesShowHtml());
     }
 }
diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php
index fdf4d7711d..22adb1d85f 100644
--- a/test/classes/SqlQueryFormTest.php
+++ b/test/classes/SqlQueryFormTest.php
@@ -98,34 +98,25 @@ class SqlQueryFormTest extends AbstractTestCase
         $html = $this->sqlQueryForm->getHtml('PMA_db', 'PMA_table', $query);
 
         //validate 1: query
-        $this->assertStringContainsString(
-            htmlspecialchars($query),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($query), $html);
 
         //validate 2: enable auto select text in textarea
         $auto_sel = ' data-textarea-auto-select="true"';
-        $this->assertStringContainsString($auto_sel, $html);
+        self::assertStringContainsString($auto_sel, $html);
 
         //validate 3: MySQLDocumentation::show
-        $this->assertStringContainsString(
-            MySQLDocumentation::show('SELECT'),
-            $html
-        );
+        self::assertStringContainsString(MySQLDocumentation::show('SELECT'), $html);
 
         //validate 4: $fields_list
-        $this->assertStringContainsString('<input type="button" value="DELETE" id="delete"', $html);
-        $this->assertStringContainsString('<input type="button" value="UPDATE" id="update"', $html);
-        $this->assertStringContainsString('<input type="button" value="INSERT" id="insert"', $html);
-        $this->assertStringContainsString('<input type="button" value="SELECT" id="select"', $html);
-        $this->assertStringContainsString('<input type="button" value="SELECT *" id="selectall"', $html);
+        self::assertStringContainsString('<input type="button" value="DELETE" id="delete"', $html);
+        self::assertStringContainsString('<input type="button" value="UPDATE" id="update"', $html);
+        self::assertStringContainsString('<input type="button" value="INSERT" id="insert"', $html);
+        self::assertStringContainsString('<input type="button" value="SELECT" id="select"', $html);
+        self::assertStringContainsString('<input type="button" value="SELECT *" id="selectall"', $html);
 
         //validate 5: Clear button
-        $this->assertStringContainsString('<input type="button" value="DELETE" id="delete"', $html);
-        $this->assertStringContainsString(
-            __('Clear'),
-            $html
-        );
+        self::assertStringContainsString('<input type="button" value="DELETE" id="delete"', $html);
+        self::assertStringContainsString(__('Clear'), $html);
     }
 
     /**
@@ -139,38 +130,26 @@ class SqlQueryFormTest extends AbstractTestCase
         $html = $this->sqlQueryForm->getHtml('PMA_db', 'PMA_table', $query);
 
         //validate 1: query
-        $this->assertStringContainsString(
-            htmlspecialchars($query),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($query), $html);
 
         //validate 2: $enctype
         $enctype = ' enctype="multipart/form-data">';
-        $this->assertStringContainsString($enctype, $html);
+        self::assertStringContainsString($enctype, $html);
 
         //validate 3: sqlqueryform
-        $this->assertStringContainsString('id="sqlqueryform" name="sqlform"', $html);
+        self::assertStringContainsString('id="sqlqueryform" name="sqlform"', $html);
 
         //validate 4: $db, $table
         $table = $GLOBALS['table'];
         $db = $GLOBALS['db'];
-        $this->assertStringContainsString(
-            Url::getHiddenInputs($db, $table),
-            $html
-        );
+        self::assertStringContainsString(Url::getHiddenInputs($db, $table), $html);
 
         //validate 5: $goto
         $goto = empty($GLOBALS['goto']) ? Url::getFromRoute('/table/sql') : $GLOBALS['goto'];
-        $this->assertStringContainsString(
-            htmlspecialchars($goto),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($goto), $html);
 
         //validate 6: Kanji encoding form
-        $this->assertStringContainsString(
-            Encoding::kanjiEncodingForm(),
-            $html
-        );
+        self::assertStringContainsString(Encoding::kanjiEncodingForm(), $html);
         $GLOBALS['lang'] = 'en';
     }
 }
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
index bfe359931f..e0ad892385 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -73,7 +73,7 @@ class SqlTest extends AbstractTestCase
         $GLOBALS['_SESSION']['tmpval']['max_rows'] = 2;
 
         $analyzed_sql_results = $this->parseAndAnalyze('SELECT * FROM test LIMIT 0, 10');
-        $this->assertEquals(
+        self::assertSame(
             'SELECT * FROM test LIMIT 1, 2 ',
             $this->callFunction($this->sql, Sql::class, 'getSqlWithLimitClause', [&$analyzed_sql_results])
         );
@@ -87,35 +87,25 @@ class SqlTest extends AbstractTestCase
         // Test environment.
         $GLOBALS['cfg']['RememberSorting'] = true;
 
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
-                $this->parseAndAnalyze('SELECT * FROM tbl'),
-            ])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
+            $this->parseAndAnalyze('SELECT * FROM tbl'),
+        ]));
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
-                $this->parseAndAnalyze('SELECT col FROM tbl'),
-            ])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
+            $this->parseAndAnalyze('SELECT col FROM tbl'),
+        ]));
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
-                $this->parseAndAnalyze('SELECT 1'),
-            ])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
+            $this->parseAndAnalyze('SELECT 1'),
+        ]));
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
-                $this->parseAndAnalyze('SELECT col1, col2 FROM tbl'),
-            ])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
+            $this->parseAndAnalyze('SELECT col1, col2 FROM tbl'),
+        ]));
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
-                $this->parseAndAnalyze('SELECT COUNT(*) from tbl'),
-            ])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'isRememberSortingOrder', [
+            $this->parseAndAnalyze('SELECT COUNT(*) from tbl'),
+        ]));
     }
 
     /**
@@ -126,17 +116,13 @@ class SqlTest extends AbstractTestCase
         // Test environment.
         $GLOBALS['_SESSION']['tmpval']['max_rows'] = 10;
 
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'isAppendLimitClause', [
-                $this->parseAndAnalyze('SELECT * FROM tbl'),
-            ])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'isAppendLimitClause', [
+            $this->parseAndAnalyze('SELECT * FROM tbl'),
+        ]));
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'isAppendLimitClause', [
-                $this->parseAndAnalyze('SELECT * from tbl LIMIT 0, 10'),
-            ])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'isAppendLimitClause', [
+            $this->parseAndAnalyze('SELECT * from tbl LIMIT 0, 10'),
+        ]));
     }
 
     public function testIsJustBrowsing(): void
@@ -144,17 +130,17 @@ class SqlTest extends AbstractTestCase
         // Test environment.
         $GLOBALS['_SESSION']['tmpval']['max_rows'] = 10;
 
-        $this->assertTrue(Sql::isJustBrowsing(
+        self::assertTrue(Sql::isJustBrowsing(
             $this->parseAndAnalyze('SELECT * FROM db.tbl'),
             null
         ));
 
-        $this->assertTrue(Sql::isJustBrowsing(
+        self::assertTrue(Sql::isJustBrowsing(
             $this->parseAndAnalyze('SELECT * FROM tbl WHERE 1'),
             null
         ));
 
-        $this->assertFalse(Sql::isJustBrowsing(
+        self::assertFalse(Sql::isJustBrowsing(
             $this->parseAndAnalyze('SELECT * from tbl1, tbl2 LIMIT 0, 10'),
             null
         ));
@@ -165,23 +151,17 @@ class SqlTest extends AbstractTestCase
      */
     public function testIsDeleteTransformationInfo(): void
     {
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'isDeleteTransformationInfo', [
-                $this->parseAndAnalyze('ALTER TABLE tbl DROP COLUMN col'),
-            ])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'isDeleteTransformationInfo', [
+            $this->parseAndAnalyze('ALTER TABLE tbl DROP COLUMN col'),
+        ]));
 
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'isDeleteTransformationInfo', [
-                $this->parseAndAnalyze('DROP TABLE tbl'),
-            ])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'isDeleteTransformationInfo', [
+            $this->parseAndAnalyze('DROP TABLE tbl'),
+        ]));
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'isDeleteTransformationInfo', [
-                $this->parseAndAnalyze('SELECT * from tbl'),
-            ])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'isDeleteTransformationInfo', [
+            $this->parseAndAnalyze('SELECT * from tbl'),
+        ]));
     }
 
     /**
@@ -189,29 +169,23 @@ class SqlTest extends AbstractTestCase
      */
     public function testHasNoRightsToDropDatabase(): void
     {
-        $this->assertTrue(
-            $this->sql->hasNoRightsToDropDatabase(
-                $this->parseAndAnalyze('DROP DATABASE db'),
-                false,
-                false
-            )
-        );
+        self::assertTrue($this->sql->hasNoRightsToDropDatabase(
+            $this->parseAndAnalyze('DROP DATABASE db'),
+            false,
+            false
+        ));
 
-        $this->assertFalse(
-            $this->sql->hasNoRightsToDropDatabase(
-                $this->parseAndAnalyze('DROP TABLE tbl'),
-                false,
-                false
-            )
-        );
+        self::assertFalse($this->sql->hasNoRightsToDropDatabase(
+            $this->parseAndAnalyze('DROP TABLE tbl'),
+            false,
+            false
+        ));
 
-        $this->assertFalse(
-            $this->sql->hasNoRightsToDropDatabase(
-                $this->parseAndAnalyze('SELECT * from tbl'),
-                false,
-                false
-            )
-        );
+        self::assertFalse($this->sql->hasNoRightsToDropDatabase(
+            $this->parseAndAnalyze('SELECT * from tbl'),
+            false,
+            false
+        ));
     }
 
     /**
@@ -231,9 +205,7 @@ class SqlTest extends AbstractTestCase
             $col2,
             $col3,
         ];
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
 
         // should not matter on where the odd column occurs
         $fields_meta = [
@@ -241,18 +213,14 @@ class SqlTest extends AbstractTestCase
             $col3,
             $col1,
         ];
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
 
         $fields_meta = [
             $col3,
             $col1,
             $col2,
         ];
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
     }
 
     /**
@@ -272,9 +240,7 @@ class SqlTest extends AbstractTestCase
             $col3,
         ];
 
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
     }
 
     /**
@@ -295,9 +261,7 @@ class SqlTest extends AbstractTestCase
             $col2,
             $col3,
         ];
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
 
         // should not matter on where the function column occurs
         $fields_meta = [
@@ -305,18 +269,14 @@ class SqlTest extends AbstractTestCase
             $col3,
             $col1,
         ];
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
 
         $fields_meta = [
             $col3,
             $col1,
             $col2,
         ];
-        $this->assertTrue(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertTrue($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
     }
 
     /**
@@ -337,9 +297,7 @@ class SqlTest extends AbstractTestCase
             $col3,
         ];
 
-        $this->assertFalse(
-            $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta])
-        );
+        self::assertFalse($this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fields_meta]));
     }
 
     /**
@@ -622,7 +580,7 @@ class SqlTest extends AbstractTestCase
                 $analyzed_sql_results,
             ]
         );
-        $this->assertSame($expectedNumRows, $result);
+        self::assertSame($expectedNumRows, $result);
         $this->assertAllQueriesConsumed();
     }
 
@@ -789,21 +747,21 @@ class SqlTest extends AbstractTestCase
             'SELECT * FROM `sakila`.`country` LIMIT 0, 3;',
             null
         );
-        $this->assertStringContainsString('Showing rows 0 -  2 (3 total', $actual);
-        $this->assertStringContainsString('SELECT * FROM `sakila`.`country` LIMIT 0, 3;', $actual);
-        $this->assertStringContainsString('Afghanistan', $actual);
-        $this->assertStringContainsString('Algeria', $actual);
-        $this->assertStringContainsString('American Samoa', $actual);
-        $this->assertStringContainsString('data-type="int"', $actual);
-        $this->assertStringContainsString('data-type="string"', $actual);
-        $this->assertStringContainsString('data-type="timestamp"', $actual);
+        self::assertStringContainsString('Showing rows 0 -  2 (3 total', $actual);
+        self::assertStringContainsString('SELECT * FROM `sakila`.`country` LIMIT 0, 3;', $actual);
+        self::assertStringContainsString('Afghanistan', $actual);
+        self::assertStringContainsString('Algeria', $actual);
+        self::assertStringContainsString('American Samoa', $actual);
+        self::assertStringContainsString('data-type="int"', $actual);
+        self::assertStringContainsString('data-type="string"', $actual);
+        self::assertStringContainsString('data-type="timestamp"', $actual);
     }
 
     public function testGetDetailedProfilingStatsWithoutData(): void
     {
         $method = new ReflectionMethod($this->sql, 'getDetailedProfilingStats');
         $method->setAccessible(true);
-        $this->assertSame(
+        self::assertSame(
             ['total_time' => 0, 'states' => [], 'chart' => [], 'profile' => []],
             $method->invoke($this->sql, [])
         );
@@ -922,6 +880,6 @@ class SqlTest extends AbstractTestCase
                 ['status' => 'Reset For Next Command', 'duration' => '9 µ', 'duration_raw' => '0.000009'],
             ],
         ];
-        $this->assertSame($expected, $method->invoke($this->sql, $profiling));
+        self::assertSame($expected, $method->invoke($this->sql, $profiling));
     }
 }
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 794e1bbd6a..a9b36af495 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -59,47 +59,41 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetStorageEngines(): void
     {
-        $this->assertEquals(
-            [
-                'dummy' => [
-                    'Engine' => 'dummy',
-                    'Support' => 'YES',
-                    'Comment' => 'dummy comment',
-                ],
-                'dummy2' => [
-                    'Engine' => 'dummy2',
-                    'Support' => 'NO',
-                    'Comment' => 'dummy2 comment',
-                ],
-                'FEDERATED' => [
-                    'Engine' => 'FEDERATED',
-                    'Support' => 'NO',
-                    'Comment' => 'Federated MySQL storage engine',
-                ],
-                'Pbxt' => [
-                    'Engine' => 'Pbxt',
-                    'Support' => 'NO',
-                    'Comment' => 'Pbxt storage engine',
-                ],
+        self::assertSame([
+            'dummy' => [
+                'Engine' => 'dummy',
+                'Support' => 'YES',
+                'Comment' => 'dummy comment',
             ],
-            $this->object->getStorageEngines()
-        );
+            'dummy2' => [
+                'Engine' => 'dummy2',
+                'Support' => 'NO',
+                'Comment' => 'dummy2 comment',
+            ],
+            'FEDERATED' => [
+                'Engine' => 'FEDERATED',
+                'Support' => 'NO',
+                'Comment' => 'Federated MySQL storage engine',
+            ],
+            'Pbxt' => [
+                'Engine' => 'Pbxt',
+                'Support' => 'NO',
+                'Comment' => 'Pbxt storage engine',
+            ],
+        ], $this->object->getStorageEngines());
     }
 
     public function testGetArray(): void
     {
         $actual = $this->object->getArray();
 
-        $this->assertEquals(
-            [
-                'dummy' => [
-                    'name' => 'dummy',
-                    'comment' => 'dummy comment',
-                    'is_default' => false,
-                ],
+        self::assertSame([
+            'dummy' => [
+                'name' => 'dummy',
+                'comment' => 'dummy comment',
+                'is_default' => false,
             ],
-            $actual
-        );
+        ], $actual);
     }
 
     /**
@@ -114,7 +108,7 @@ class StorageEngineTest extends AbstractTestCase
     public function testGetEngine(string $expectedClass, string $engineName): void
     {
         $actual = StorageEngine::getEngine($engineName);
-        $this->assertInstanceOf($expectedClass, $actual);
+        self::assertInstanceOf($expectedClass, $actual);
     }
 
     /**
@@ -185,18 +179,10 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testIsValid(): void
     {
-        $this->assertTrue(
-            $this->object->isValid('PBMS')
-        );
-        $this->assertTrue(
-            $this->object->isValid('dummy')
-        );
-        $this->assertTrue(
-            $this->object->isValid('dummy2')
-        );
-        $this->assertFalse(
-            $this->object->isValid('invalid')
-        );
+        self::assertTrue($this->object->isValid('PBMS'));
+        self::assertTrue($this->object->isValid('dummy'));
+        self::assertTrue($this->object->isValid('dummy2'));
+        self::assertFalse($this->object->isValid('invalid'));
     }
 
     /**
@@ -204,10 +190,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetPage(): void
     {
-        $this->assertEquals(
-            '',
-            $this->object->getPage('Foo')
-        );
+        self::assertSame('', $this->object->getPage('Foo'));
     }
 
     /**
@@ -215,10 +198,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetInfoPages(): void
     {
-        $this->assertEquals(
-            [],
-            $this->object->getInfoPages()
-        );
+        self::assertSame([], $this->object->getInfoPages());
     }
 
     /**
@@ -226,10 +206,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetVariablesLikePattern(): void
     {
-        $this->assertEquals(
-            '',
-            $this->object->getVariablesLikePattern()
-        );
+        self::assertSame('', $this->object->getVariablesLikePattern());
     }
 
     /**
@@ -237,10 +214,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetMysqlHelpPage(): void
     {
-        $this->assertEquals(
-            'dummy-storage-engine',
-            $this->object->getMysqlHelpPage()
-        );
+        self::assertSame('dummy-storage-engine', $this->object->getMysqlHelpPage());
     }
 
     /**
@@ -248,10 +222,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetVariables(): void
     {
-        $this->assertEquals(
-            [],
-            $this->object->getVariables()
-        );
+        self::assertSame([], $this->object->getVariables());
     }
 
     /**
@@ -259,25 +230,19 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetSupportInformationMessage(): void
     {
-        $this->assertEquals(
-            'dummy is available on this MySQL server.',
-            $this->object->getSupportInformationMessage()
-        );
+        self::assertSame('dummy is available on this MySQL server.', $this->object->getSupportInformationMessage());
 
         $this->object->support = 1;
-        $this->assertEquals(
+        self::assertSame(
             'dummy has been disabled for this MySQL server.',
             $this->object->getSupportInformationMessage()
         );
 
         $this->object->support = 2;
-        $this->assertEquals(
-            'dummy is available on this MySQL server.',
-            $this->object->getSupportInformationMessage()
-        );
+        self::assertSame('dummy is available on this MySQL server.', $this->object->getSupportInformationMessage());
 
         $this->object->support = 3;
-        $this->assertEquals(
+        self::assertSame(
             'dummy is the default storage engine on this MySQL server.',
             $this->object->getSupportInformationMessage()
         );
@@ -288,10 +253,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetComment(): void
     {
-        $this->assertEquals(
-            'dummy comment',
-            $this->object->getComment()
-        );
+        self::assertSame('dummy comment', $this->object->getComment());
     }
 
     /**
@@ -299,10 +261,7 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testGetTitle(): void
     {
-        $this->assertEquals(
-            'dummy',
-            $this->object->getTitle()
-        );
+        self::assertSame('dummy', $this->object->getTitle());
     }
 
     /**
@@ -310,13 +269,10 @@ class StorageEngineTest extends AbstractTestCase
      */
     public function testResolveTypeSize(): void
     {
-        $this->assertEquals(
-            [
-                0 => 12,
-                1 => 'B',
-            ],
-            $this->object->resolveTypeSize(12)
-        );
+        self::assertEquals([
+            0 => 12,
+            1 => 'B',
+        ], $this->object->resolveTypeSize(12));
     }
 
     public function testHasMroongaEngine(): void
@@ -326,13 +282,13 @@ class StorageEngineTest extends AbstractTestCase
                 (string) json_encode([]), // Fake result
             ],
         ]);
-        $this->assertTrue(StorageEngine::hasMroongaEngine());
-        $this->assertTrue(StorageEngine::hasMroongaEngine()); // Does not call any query
+        self::assertTrue(StorageEngine::hasMroongaEngine());
+        self::assertTrue(StorageEngine::hasMroongaEngine()); // Does not call any query
 
         Cache::remove('storage-engine.mroonga.has.mroonga_command'); // Cache clear
 
         $this->dummyDbi->addResult('SELECT mroonga_command(\'object_list\');', false);
-        $this->assertFalse(StorageEngine::hasMroongaEngine());
+        self::assertFalse(StorageEngine::hasMroongaEngine());
 
         $this->assertAllQueriesConsumed();
     }
@@ -703,7 +659,7 @@ class StorageEngineTest extends AbstractTestCase
         $this->dummyDbi->addSelectDb('my_db');
         $lengths = StorageEngine::getMroongaLengths('my_db', 'idx_correo');
         $this->assertAllSelectsConsumed();
-        $this->assertSame([4521984, 578126], $lengths);
+        self::assertSame([4521984, 578126], $lengths);
 
         $this->assertAllQueriesConsumed();
     }
diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php
index 8652a4eae9..8cb7f9aed3 100644
--- a/test/classes/SystemDatabaseTest.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -69,7 +69,7 @@ class SystemDatabaseTest extends AbstractTestCase
         $ret = $this->sysDb->getExistingTransformationData($db);
 
         //validate that is the same as $dbi->tryQuery
-        $this->assertInstanceOf(DummyResult::class, $ret);
+        self::assertInstanceOf(DummyResult::class, $ret);
     }
 
     /**
@@ -116,6 +116,6 @@ class SystemDatabaseTest extends AbstractTestCase
             . "('PMA_db', 'view_name', 'column_name', 'comment', 'mimetype', "
             . "'transformation', 'transformation_options')";
 
-        $this->assertEquals($sql, $ret);
+        self::assertSame($sql, $ret);
     }
 }
diff --git a/test/classes/Table/ColumnsDefinitionTest.php b/test/classes/Table/ColumnsDefinitionTest.php
index 6a4bee7432..455b8d1388 100644
--- a/test/classes/Table/ColumnsDefinitionTest.php
+++ b/test/classes/Table/ColumnsDefinitionTest.php
@@ -26,7 +26,7 @@ class ColumnsDefinitionTest extends AbstractTestCase
     {
         $result = ColumnsDefinition::decorateColumnMetaDefault($columnMeta);
 
-        $this->assertEquals($expected, $result);
+        self::assertEquals($expected, $result);
     }
 
     /**
diff --git a/test/classes/Table/IndexesTest.php b/test/classes/Table/IndexesTest.php
index a71da5456c..694190f4ed 100644
--- a/test/classes/Table/IndexesTest.php
+++ b/test/classes/Table/IndexesTest.php
@@ -90,8 +90,8 @@ class IndexesTest extends AbstractTestCase
         $_POST['preview_sql'] = true;
         $indexes->doSaveData($index, false, $GLOBALS['db'], $GLOBALS['table']);
         $jsonArray = $response->getJSONResult();
-        $this->assertArrayHasKey('sql_data', $jsonArray);
-        $this->assertStringContainsString($sql_query, $jsonArray['sql_data']);
+        self::assertArrayHasKey('sql_data', $jsonArray);
+        self::assertStringContainsString($sql_query, $jsonArray['sql_data']);
 
         // Alter success
         $response->clear();
@@ -99,8 +99,8 @@ class IndexesTest extends AbstractTestCase
         unset($_POST['preview_sql']);
         $indexes->doSaveData($index, false, $GLOBALS['db'], $GLOBALS['table']);
         $jsonArray = $response->getJSONResult();
-        $this->assertArrayHasKey('index_table', $jsonArray);
-        $this->assertArrayHasKey('message', $jsonArray);
+        self::assertArrayHasKey('index_table', $jsonArray);
+        self::assertArrayHasKey('message', $jsonArray);
         ResponseRenderer::getInstance()->setAjax(false);
     }
 }
diff --git a/test/classes/Table/Maintenance/MessageTest.php b/test/classes/Table/Maintenance/MessageTest.php
index 84dde10cf5..8af8131b3c 100644
--- a/test/classes/Table/Maintenance/MessageTest.php
+++ b/test/classes/Table/Maintenance/MessageTest.php
@@ -20,10 +20,10 @@ class MessageTest extends TestCase
     public function testFromArray(array $row, string $table, string $operation, string $type, string $text): void
     {
         $message = Message::fromArray($row);
-        $this->assertSame($message->table, $table);
-        $this->assertSame($message->operation, $operation);
-        $this->assertSame($message->type, $type);
-        $this->assertSame($message->text, $text);
+        self::assertSame($message->table, $table);
+        self::assertSame($message->operation, $operation);
+        self::assertSame($message->type, $type);
+        self::assertSame($message->text, $text);
     }
 
     /**
diff --git a/test/classes/Table/SearchTest.php b/test/classes/Table/SearchTest.php
index faee63a0ec..d6cf0fdbef 100644
--- a/test/classes/Table/SearchTest.php
+++ b/test/classes/Table/SearchTest.php
@@ -32,17 +32,14 @@ class SearchTest extends AbstractTestCase
         $_POST['order'] = 'asc';
         $_POST['customWhereClause'] = "name='pma'";
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT DISTINCT *  FROM `PMA` WHERE name=\'pma\' ORDER BY `name` asc',
             $this->search->buildSqlQuery()
         );
 
         unset($_POST['customWhereClause']);
 
-        $this->assertEquals(
-            'SELECT DISTINCT *  FROM `PMA` ORDER BY `name` asc',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT DISTINCT *  FROM `PMA` ORDER BY `name` asc', $this->search->buildSqlQuery());
 
         $_POST['criteriaValues'] = [
             'value1',
@@ -94,10 +91,7 @@ class SearchTest extends AbstractTestCase
             . ' AND `id` > value2 AND `index` IS NULL AND `index2` LIKE \'%value4%\''
             . ' AND `index3` REGEXP ^value5$ AND `index4` IN (value6) AND `index5`'
             . ' BETWEEN value7 AND value8 ORDER BY `name` asc';
-        $this->assertEquals(
-            $expected,
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame($expected, $this->search->buildSqlQuery());
     }
 
     public function testBuildSqlQueryWithWhereClause(): void
@@ -105,17 +99,11 @@ class SearchTest extends AbstractTestCase
         $_POST['zoom_submit'] = true;
         $_POST['table'] = 'PMA';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA`',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA`', $this->search->buildSqlQuery());
 
         $_POST['customWhereClause'] = '`table` = \'WhereClause\'';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA` WHERE `table` = \'WhereClause\'',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA` WHERE `table` = \'WhereClause\'', $this->search->buildSqlQuery());
 
         unset($_POST['customWhereClause']);
         $_POST['criteriaColumnNames'] = [
@@ -143,7 +131,7 @@ class SearchTest extends AbstractTestCase
             'int(11)',
         ];
 
-        $this->assertEquals(
+        self::assertSame(
             'SELECT *  FROM `PMA` WHERE `b` <= 10 AND `a` = 2 AND `c` IS NULL AND `d` IS NOT NULL',
             $this->search->buildSqlQuery()
         );
@@ -154,17 +142,11 @@ class SearchTest extends AbstractTestCase
         $_POST['zoom_submit'] = true;
         $_POST['table'] = 'PMA';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA`',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA`', $this->search->buildSqlQuery());
 
         $_POST['customWhereClause'] = '`table` = \'WhereClause\'';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA` WHERE `table` = \'WhereClause\'',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA` WHERE `table` = \'WhereClause\'', $this->search->buildSqlQuery());
 
         unset($_POST['customWhereClause']);
         $_POST['criteriaColumnNames'] = ['b'];
@@ -173,10 +155,7 @@ class SearchTest extends AbstractTestCase
         $_POST['criteriaValues'] = ['1'];
         $_POST['criteriaColumnTypes'] = ['geometry'];
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA` WHERE Dimension(`b`) = \'1\'',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA` WHERE Dimension(`b`) = \'1\'', $this->search->buildSqlQuery());
     }
 
     public function testBuildSqlQueryWithWhereClauseEnum(): void
@@ -184,17 +163,11 @@ class SearchTest extends AbstractTestCase
         $_POST['zoom_submit'] = true;
         $_POST['table'] = 'PMA';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA`',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA`', $this->search->buildSqlQuery());
 
         $_POST['customWhereClause'] = '`table` = \'WhereClause\'';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA` WHERE `table` = \'WhereClause\'',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA` WHERE `table` = \'WhereClause\'', $this->search->buildSqlQuery());
 
         unset($_POST['customWhereClause']);
         $_POST['criteriaColumnNames'] = ['rating'];
@@ -203,10 +176,7 @@ class SearchTest extends AbstractTestCase
         $_POST['criteriaValues'] = ['PG-13'];
         $_POST['criteriaColumnTypes'] = ['enum(\'G\', \'PG\', \'PG-13\', \'R\', \'NC-17\')'];
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA` WHERE `rating` = \'PG-13\'',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA` WHERE `rating` = \'PG-13\'', $this->search->buildSqlQuery());
     }
 
     public function testBuildSqlQueryWithWhereClauseUUID(): void
@@ -214,17 +184,11 @@ class SearchTest extends AbstractTestCase
         $_POST['zoom_submit'] = true;
         $_POST['table'] = 'PMA';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA`',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA`', $this->search->buildSqlQuery());
 
         $_POST['customWhereClause'] = '';
 
-        $this->assertEquals(
-            'SELECT *  FROM `PMA`',
-            $this->search->buildSqlQuery()
-        );
+        self::assertSame('SELECT *  FROM `PMA`', $this->search->buildSqlQuery());
 
         unset($_POST['customWhereClause']);
         $_POST['criteriaColumnNames'] = ['id'];
@@ -233,7 +197,7 @@ class SearchTest extends AbstractTestCase
         $_POST['criteriaValues'] = ['07ca1fdd-4805-11ed-a4dc-0242ac110002'];
         $_POST['criteriaColumnTypes'] = ['uuid'];
 
-        $this->assertEquals(
+        self::assertSame(
             "SELECT *  FROM `PMA` WHERE `id` = '07ca1fdd-4805-11ed-a4dc-0242ac110002'",
             $this->search->buildSqlQuery()
         );
@@ -253,6 +217,6 @@ class SearchTest extends AbstractTestCase
         $_POST['ajax_request'] = 'true';
         $_POST['displayAllColumns'] = 'true';
 
-        $this->assertSame('SELECT *  FROM `world_cities`', $this->search->buildSqlQuery());
+        self::assertSame('SELECT *  FROM `world_cities`', $this->search->buildSqlQuery());
     }
 }
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 6de9da59e8..d964a62583 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -296,7 +296,7 @@ class TableTest extends AbstractTestCase
     public function testCreate(): void
     {
         $table = new Table('table1', 'pma_test');
-        $this->assertInstanceOf(Table::class, $table);
+        self::assertInstanceOf(Table::class, $table);
     }
 
     /**
@@ -305,22 +305,10 @@ class TableTest extends AbstractTestCase
     public function testConstruct(): void
     {
         $table = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            'PMA_BookMark',
-            $table->__toString()
-        );
-        $this->assertEquals(
-            'PMA_BookMark',
-            $table->getName()
-        );
-        $this->assertEquals(
-            'PMA',
-            $table->getDbName()
-        );
-        $this->assertEquals(
-            'PMA.PMA_BookMark',
-            $table->getFullName()
-        );
+        self::assertSame('PMA_BookMark', $table->__toString());
+        self::assertSame('PMA_BookMark', $table->getName());
+        self::assertSame('PMA', $table->getDbName());
+        self::assertSame('PMA.PMA_BookMark', $table->getFullName());
     }
 
     /**
@@ -329,22 +317,10 @@ class TableTest extends AbstractTestCase
     public function testGetName(): void
     {
         $table = new Table('table1', 'pma_test');
-        $this->assertEquals(
-            'table1',
-            $table->getName()
-        );
-        $this->assertEquals(
-            '`table1`',
-            $table->getName(true)
-        );
-        $this->assertEquals(
-            'pma_test',
-            $table->getDbName()
-        );
-        $this->assertEquals(
-            '`pma_test`',
-            $table->getDbName(true)
-        );
+        self::assertSame('table1', $table->getName());
+        self::assertSame('`table1`', $table->getName(true));
+        self::assertSame('pma_test', $table->getDbName());
+        self::assertSame('`pma_test`', $table->getDbName(true));
     }
 
     /**
@@ -361,14 +337,8 @@ class TableTest extends AbstractTestCase
         $table->messages[] = 'messages2';
         $table->messages[] = 'messages3';
 
-        $this->assertEquals(
-            'error3',
-            $table->getLastError()
-        );
-        $this->assertEquals(
-            'messages3',
-            $table->getLastMessage()
-        );
+        self::assertSame('error3', $table->getLastError());
+        self::assertSame('messages3', $table->getLastMessage());
     }
 
     /**
@@ -382,10 +352,7 @@ class TableTest extends AbstractTestCase
      */
     public function testValidateName(string $name, bool $result, bool $is_backquoted = false): void
     {
-        $this->assertEquals(
-            $result,
-            Table::isValidName($name, $is_backquoted)
-        );
+        self::assertSame($result, Table::isValidName($name, $is_backquoted));
     }
 
     /**
@@ -446,20 +413,14 @@ class TableTest extends AbstractTestCase
     public function testIsView(): void
     {
         $table = new Table('', '');
-        $this->assertFalse(
-            $table->isView()
-        );
+        self::assertFalse($table->isView());
 
         //validate that it is the same as DBI fetchResult
         $table = new Table('PMA_BookMark', 'PMA');
-        $this->assertTrue(
-            $table->isView()
-        );
+        self::assertTrue($table->isView());
 
         $table = new Table('PMA_BookMark_2', 'PMA');
-        $this->assertFalse(
-            $table->isView()
-        );
+        self::assertFalse($table->isView());
     }
 
     /**
@@ -497,7 +458,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` BIT(12) PMA_attribute NULL DEFAULT b\'10\' AUTO_INCREMENT COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -519,7 +480,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` DOUBLE(12) PMA_attribute NULL DEFAULT \'12\' AUTO_INCREMENT COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -541,7 +502,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT TRUE AUTO_INCREMENT COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -563,7 +524,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT NULL AUTO_INCREMENT COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -585,11 +546,8 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
-            '`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT CURRENT_TIMESTAMP '
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
+        self::assertSame('`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT CURRENT_TIMESTAMP '
+        . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST", $query);
 
         //$default_type is current_timestamp()
         $default_type = 'current_timestamp()';
@@ -608,11 +566,8 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
-            '`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT current_timestamp() '
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
+        self::assertSame('`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT current_timestamp() '
+        . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST", $query);
 
         // $type is 'TIMESTAMP(3), $default_type is CURRENT_TIMESTAMP(3)
         $type = 'TIMESTAMP';
@@ -634,7 +589,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` TIMESTAMP(3) PMA_attribute NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -659,7 +614,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` TIMESTAMP PMA_attribute NULL DEFAULT \'0000-00-00 00:00:00\' COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -684,7 +639,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
+        self::assertSame(
             '`PMA_name` TIMESTAMP PMA_attribute NULL DEFAULT \'0000-00-00 00:00:00.0\' COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -709,11 +664,8 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
-            '`PMA_name` TIMESTAMP PMA_attribute NULL DEFAULT \'0000-00-00 00:00:00.000000\' '
-            . "COMMENT 'PMA_comment' FIRST",
-            $query
-        );
+        self::assertSame('`PMA_name` TIMESTAMP PMA_attribute NULL DEFAULT \'0000-00-00 00:00:00.000000\' '
+        . "COMMENT 'PMA_comment' FIRST", $query);
 
         //$default_type is UUID
         $type = 'UUID';
@@ -734,10 +686,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
-            '`PMA_name` UUID PMA_attribute NULL DEFAULT uuid()',
-            $query
-        );
+        self::assertSame('`PMA_name` UUID PMA_attribute NULL DEFAULT uuid()', $query);
 
         //$default_type is uuid()
         $type = 'UUID';
@@ -758,10 +707,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals(
-            '`PMA_name` UUID PMA_attribute NULL DEFAULT uuid()',
-            $query
-        );
+        self::assertSame('`PMA_name` UUID PMA_attribute NULL DEFAULT uuid()', $query);
 
         //$default_type is NONE
         $type = 'BOOLEAN';
@@ -783,7 +729,7 @@ class TableTest extends AbstractTestCase
             $expression,
             $move_to
         );
-        $this->assertEquals('`PMA_name` BOOLEAN PMA_attribute NULL INCREMENT COMMENT \'PMA_comment\' FIRST', $query);
+        self::assertSame('`PMA_name` BOOLEAN PMA_attribute NULL INCREMENT COMMENT \'PMA_comment\' FIRST', $query);
 
         $default_type = 'NONE';
         $move_to = '-first';
@@ -804,7 +750,7 @@ class TableTest extends AbstractTestCase
             ['id'],
             'id'
         );
-        $this->assertEquals('`ids` INT(11) PMA_attribute NULL AUTO_INCREMENT COMMENT \'PMA_comment\' FIRST', $query);
+        self::assertSame('`ids` INT(11) PMA_attribute NULL AUTO_INCREMENT COMMENT \'PMA_comment\' FIRST', $query);
 
         $default_type = 'NONE';
         $move_to = '-first';
@@ -826,11 +772,8 @@ class TableTest extends AbstractTestCase
             'id'
         );
         // Add primary key for AUTO_INCREMENT if missing
-        $this->assertEquals(
-            '`ids` INT(11) PMA_attribute NULL AUTO_INCREMENT '
-            . "COMMENT 'PMA_comment' FIRST, add PRIMARY KEY (`ids`)",
-            $query
-        );
+        self::assertSame('`ids` INT(11) PMA_attribute NULL AUTO_INCREMENT '
+        . "COMMENT 'PMA_comment' FIRST, add PRIMARY KEY (`ids`)", $query);
 
         $default_type = 'NONE';
         $move_to = '-first';
@@ -852,7 +795,7 @@ class TableTest extends AbstractTestCase
             'id'
         );
         // Do not add PK
-        $this->assertEquals('`id` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST', $query);
+        self::assertSame('`id` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST', $query);
 
         $default_type = 'NONE';
         $move_to = '-first';
@@ -874,7 +817,7 @@ class TableTest extends AbstractTestCase
             'id'
         );
         // Do not add PK
-        $this->assertEquals('`ids` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST', $query);
+        self::assertSame('`ids` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST', $query);
 
         $default_type = 'NONE';
         $move_to = '-first';
@@ -896,7 +839,7 @@ class TableTest extends AbstractTestCase
             'id'
         );
         // Add it beaucause it is missing
-        $this->assertEquals(
+        self::assertSame(
             '`ids` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST, add PRIMARY KEY (`ids`)',
             $query
         );
@@ -921,7 +864,7 @@ class TableTest extends AbstractTestCase
             'id'
         );
         // Do not add PK since it is not a AUTO_INCREMENT
-        $this->assertEquals(
+        self::assertSame(
             '`ids` INT(11) PMA_attribute AS (1) VIRTUAL NULL USER_DEFINED COMMENT \'PMA_comment\' FIRST',
             $query
         );
@@ -953,7 +896,7 @@ class TableTest extends AbstractTestCase
         $_SESSION = ['relation' => [$GLOBALS['server'] => $relationParameters->toArray()]];
 
         $ret = Table::duplicateInfo('relwork', 'relation', $get_fields, $where_fields, $new_fields);
-        $this->assertSame(-1, $ret);
+        self::assertSame(-1, $ret);
     }
 
     /**
@@ -962,20 +905,14 @@ class TableTest extends AbstractTestCase
     public function testIsUpdatableView(): void
     {
         $table = new Table('', '');
-        $this->assertFalse(
-            $table->isUpdatableView()
-        );
+        self::assertFalse($table->isUpdatableView());
 
         //validate that it is the same as DBI fetchResult
         $table = new Table('PMA_BookMark', 'PMA');
-        $this->assertTrue(
-            $table->isUpdatableView()
-        );
+        self::assertTrue($table->isUpdatableView());
 
         $table = new Table('PMA_BookMark_2', 'PMA');
-        $this->assertFalse(
-            $table->isUpdatableView()
-        );
+        self::assertFalse($table->isUpdatableView());
     }
 
     /**
@@ -984,15 +921,10 @@ class TableTest extends AbstractTestCase
     public function testIsMergeCase1(): void
     {
         $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            '',
-            $tableObj->isMerge()
-        );
+        self::assertEquals('', $tableObj->isMerge());
 
         $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertFalse(
-            $tableObj->isMerge()
-        );
+        self::assertFalse($tableObj->isMerge());
     }
 
     /**
@@ -1008,9 +940,7 @@ class TableTest extends AbstractTestCase
         );
 
         $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertTrue(
-            $tableObj->isMerge()
-        );
+        self::assertTrue($tableObj->isMerge());
     }
 
     /**
@@ -1026,9 +956,7 @@ class TableTest extends AbstractTestCase
         );
 
         $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertTrue(
-            $tableObj->isMerge()
-        );
+        self::assertTrue($tableObj->isMerge());
     }
 
     /**
@@ -1037,9 +965,7 @@ class TableTest extends AbstractTestCase
     public function testIsMergeCase4(): void
     {
         $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertFalse(
-            $tableObj->isMerge()
-        );
+        self::assertFalse($tableObj->isMerge());
     }
 
     /**
@@ -1084,7 +1010,7 @@ class TableTest extends AbstractTestCase
             . "charset1 NULL DEFAULT 'VARCHAR' "
             . "AUTO_INCREMENT COMMENT 'PMA comment' AFTER `new_name`";
 
-        $this->assertEquals($expect, $result);
+        self::assertSame($expect, $result);
     }
 
     /**
@@ -1100,37 +1026,31 @@ class TableTest extends AbstractTestCase
         //rename to same name
         $table_new = 'PMA_BookMark';
         $result = $table->rename($table_new);
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         //isValidName
         //space in table name
         $table_new = 'PMA_BookMark ';
         $result = $table->rename($table_new);
-        $this->assertFalse($result);
+        self::assertFalse($result);
         //empty name
         $table_new = '';
         $result = $table->rename($table_new);
-        $this->assertFalse($result);
+        self::assertFalse($result);
         //dot in table name
         $table_new = 'PMA_.BookMark';
         $result = $table->rename($table_new);
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         //message
-        $this->assertEquals(
-            'Table PMA_BookMark has been renamed to PMA_.BookMark.',
-            $table->getLastMessage()
-        );
+        self::assertSame('Table PMA_BookMark has been renamed to PMA_.BookMark.', $table->getLastMessage());
 
         $table_new = 'PMA_BookMark_new';
         $db_new = 'PMA_new';
         $result = $table->rename($table_new, $db_new);
-        $this->assertTrue($result);
+        self::assertTrue($result);
         //message
-        $this->assertEquals(
-            'Table PMA_.BookMark has been renamed to PMA_BookMark_new.',
-            $table->getLastMessage()
-        );
+        self::assertSame('Table PMA_.BookMark has been renamed to PMA_BookMark_new.', $table->getLastMessage());
     }
 
     /**
@@ -1148,7 +1068,7 @@ class TableTest extends AbstractTestCase
             '`PMA`.`PMA_BookMark`.`index3`',
             '`PMA`.`PMA_BookMark`.`index5`',
         ];
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
     }
 
     /**
@@ -1169,7 +1089,7 @@ class TableTest extends AbstractTestCase
             '`PMA`.`PMA_BookMark`.`ADD`',
             '`PMA`.`PMA_BookMark`.`ALL`',
         ];
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
     }
 
     /**
@@ -1197,10 +1117,7 @@ class TableTest extends AbstractTestCase
 
         $tableObj = new Table('table', 'db');
 
-        $this->assertEquals(
-            $tableObj->getColumnsMeta(),
-            ['aNonValidExampleToRefactor']
-        );
+        self::assertSame($tableObj->getColumnsMeta(), ['aNonValidExampleToRefactor']);
     }
 
     /**
@@ -1237,7 +1154,7 @@ class TableTest extends AbstractTestCase
         $sql_excepted = 'ALTER TABLE `PMA_table` ADD  '
             . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
             . '`foreignDb`.`foreignTable`(`foreignField1`, `foreignField2`);';
-        $this->assertEquals($sql_excepted, $sql);
+        self::assertSame($sql_excepted, $sql);
 
         // Exclude db name when relations are made between table in the same db
         $sql = $this->callFunction(
@@ -1255,7 +1172,7 @@ class TableTest extends AbstractTestCase
         $sql_excepted = 'ALTER TABLE `PMA_table` ADD  '
             . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
             . '`foreignTable`(`foreignField1`, `foreignField2`);';
-        $this->assertEquals($sql_excepted, $sql);
+        self::assertSame($sql_excepted, $sql);
     }
 
     /**
@@ -1273,7 +1190,7 @@ class TableTest extends AbstractTestCase
         $table = new Table($table, $db);
         $sql = $table->getSqlQueryForIndexCreateOrEdit($index, $error);
 
-        $this->assertEquals('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;', $sql);
+        self::assertSame('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;', $sql);
     }
 
     /**
@@ -1291,7 +1208,7 @@ class TableTest extends AbstractTestCase
         $table = new Table($table, $db);
         $sql = $table->getSqlQueryForIndexCreateOrEdit($index, $error);
 
-        $this->assertEquals('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;', $sql);
+        self::assertSame('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;', $sql);
     }
 
     /**
@@ -1312,7 +1229,7 @@ class TableTest extends AbstractTestCase
             '`PMA`.`PMA_BookMark`.`ADD`',
             '`PMA`.`PMA_BookMark`.`ALL`',
         ];
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
 
         $return = $table->getReservedColumnNames();
         $expect = [
@@ -1320,7 +1237,7 @@ class TableTest extends AbstractTestCase
             'ADD',
             'ALL',
         ];
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
     }
 
     /**
@@ -1363,17 +1280,17 @@ class TableTest extends AbstractTestCase
         // Case 1 : Check if table is non-empty
         $return = $tableObj->checkIfMinRecordsExist();
         $expect = true;
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
 
         // Case 2 : Check if table contains at least 100
         $return = $tableObj->checkIfMinRecordsExist(100);
         $expect = false;
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
 
         // Case 3 : Check if table contains at least 100
         $return = $tableObj->checkIfMinRecordsExist(100);
         $expect = true;
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
 
         $GLOBALS['dbi'] = $old_dbi;
     }
@@ -1396,10 +1313,7 @@ class TableTest extends AbstractTestCase
         $db = 'PMA';
         $tableObj = new Table($table, $db, $dbi);
 
-        $this->assertEquals(
-            20,
-            $tableObj->countRecords(true)
-        );
+        self::assertSame(20, $tableObj->countRecords(true));
     }
 
     /**
@@ -1418,16 +1332,16 @@ class TableTest extends AbstractTestCase
         $table->setUiProp($property, $value, $table_create_time);
 
         //set UI prop successfully
-        $this->assertEquals($value, $table->uiprefs[$property]);
+        self::assertSame($value, $table->uiprefs[$property]);
 
         //removeUiProp
         $table->removeUiProp($property);
         $is_define_property = isset($table->uiprefs[$property]);
-        $this->assertFalse($is_define_property);
+        self::assertFalse($is_define_property);
 
         //getUiProp after removeUiProp
         $is_define_property = $table->getUiProp($property);
-        $this->assertFalse($is_define_property);
+        self::assertFalse($is_define_property);
     }
 
     /**
@@ -1465,25 +1379,25 @@ class TableTest extends AbstractTestCase
 
         //successfully
         $expect = true;
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
         $sql_query = 'INSERT INTO `PMA_new`.`PMA_BookMark_new`(`COLUMN_NAME1`)'
             . ' SELECT `COLUMN_NAME1` FROM '
             . '`PMA`.`PMA_BookMark`';
-        $this->assertStringContainsString($sql_query, $GLOBALS['sql_query']);
+        self::assertStringContainsString($sql_query, $GLOBALS['sql_query']);
         $sql_query = 'DROP VIEW `PMA`.`PMA_BookMark`';
-        $this->assertStringContainsString($sql_query, $GLOBALS['sql_query']);
+        self::assertStringContainsString($sql_query, $GLOBALS['sql_query']);
 
         $return = Table::moveCopy($source_db, $source_table, $target_db, $target_table, $what, false, $mode, true);
 
         //successfully
         $expect = true;
-        $this->assertEquals($expect, $return);
+        self::assertSame($expect, $return);
         $sql_query = 'INSERT INTO `PMA_new`.`PMA_BookMark_new`(`COLUMN_NAME1`)'
             . ' SELECT `COLUMN_NAME1` FROM '
             . '`PMA`.`PMA_BookMark`';
-        $this->assertStringContainsString($sql_query, $GLOBALS['sql_query']);
+        self::assertStringContainsString($sql_query, $GLOBALS['sql_query']);
         $sql_query = 'DROP VIEW `PMA`.`PMA_BookMark`';
-        $this->assertStringNotContainsString($sql_query, $GLOBALS['sql_query']);
+        self::assertStringNotContainsString($sql_query, $GLOBALS['sql_query']);
 
         // Renaming DB with a view bug
         $resultStub = $this->createMock(DummyResult::class);
@@ -1518,14 +1432,11 @@ class TableTest extends AbstractTestCase
             'db_copy',
             true
         );
-        $this->assertEquals(true, $return);
-        $this->assertStringContainsString('DROP TABLE IF EXISTS `bb`.`ad`;', $GLOBALS['sql_query']);
-        $this->assertStringContainsString(
-            'CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost`' .
-                ' SQL SECURITY DEFINER VIEW `bb`.`ad`  AS SELECT `bb`.`ac` AS `ac` FROM `bb` ;',
-            $GLOBALS['sql_query']
-        );
-        $this->assertStringContainsString('DROP VIEW `aa`.`ad`;', $GLOBALS['sql_query']);
+        self::assertTrue($return);
+        self::assertStringContainsString('DROP TABLE IF EXISTS `bb`.`ad`;', $GLOBALS['sql_query']);
+        self::assertStringContainsString('CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost`' .
+            ' SQL SECURITY DEFINER VIEW `bb`.`ad`  AS SELECT `bb`.`ac` AS `ac` FROM `bb` ;', $GLOBALS['sql_query']);
+        self::assertStringContainsString('DROP VIEW `aa`.`ad`;', $GLOBALS['sql_query']);
     }
 
     /**
@@ -1541,7 +1452,7 @@ class TableTest extends AbstractTestCase
         $tbl_object->getStatusInfo(null, true);
         $expect = 'DBIDUMMY';
         $tbl_storage_engine = $dbi->getTable($target_db, $target_table)->getStorageEngine();
-        $this->assertEquals($expect, $tbl_storage_engine);
+        self::assertSame($expect, $tbl_storage_engine);
     }
 
     /**
@@ -1557,7 +1468,7 @@ class TableTest extends AbstractTestCase
         $tbl_object->getStatusInfo(null, true);
         $expect = 'Test comment for "table1" in \'pma_test\'';
         $show_comment = $dbi->getTable($target_db, $target_table)->getComment();
-        $this->assertEquals($expect, $show_comment);
+        self::assertSame($expect, $show_comment);
     }
 
     /**
@@ -1573,7 +1484,7 @@ class TableTest extends AbstractTestCase
         $tbl_object->getStatusInfo(null, true);
         $expect = 'utf8mb4_general_ci';
         $tbl_collation = $dbi->getTable($target_db, $target_table)->getCollation();
-        $this->assertEquals($expect, $tbl_collation);
+        self::assertSame($expect, $tbl_collation);
     }
 
     /**
@@ -1589,7 +1500,7 @@ class TableTest extends AbstractTestCase
         $tbl_object->getStatusInfo(null, true);
         $expect = 'Redundant';
         $row_format = $dbi->getTable($target_db, $target_table)->getRowFormat();
-        $this->assertEquals($expect, $row_format);
+        self::assertSame($expect, $row_format);
     }
 
     /**
@@ -1605,7 +1516,7 @@ class TableTest extends AbstractTestCase
         $tbl_object->getStatusInfo(null, true);
         $expect = '5';
         $auto_increment = $dbi->getTable($target_db, $target_table)->getAutoIncrement();
-        $this->assertEquals($expect, $auto_increment);
+        self::assertSame($expect, $auto_increment);
     }
 
     /**
@@ -1624,6 +1535,6 @@ class TableTest extends AbstractTestCase
             'row_format' => 'REDUNDANT',
         ];
         $create_options = $dbi->getTable($target_db, $target_table)->getCreateOptions();
-        $this->assertEquals($expect, $create_options);
+        self::assertEquals($expect, $create_options);
     }
 }
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index 5fa69b648f..93b6cb404b 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -37,12 +37,12 @@ class TemplateTest extends AbstractTestCase
 
         $cfg['environment'] = 'production';
         $twig = Template::getTwigEnvironment(null);
-        $this->assertFalse($twig->isDebug());
-        $this->assertFalse(TransNode::$enableAddDebugInfo);
+        self::assertFalse($twig->isDebug());
+        self::assertFalse(TransNode::$enableAddDebugInfo);
         $cfg['environment'] = 'development';
         $twig = Template::getTwigEnvironment(null);
-        $this->assertTrue($twig->isDebug());
-        $this->assertTrue(TransNode::$enableAddDebugInfo);
+        self::assertTrue($twig->isDebug());
+        self::assertTrue(TransNode::$enableAddDebugInfo);
     }
 
     /**
@@ -58,8 +58,8 @@ class TemplateTest extends AbstractTestCase
             'variable1' => 'value1',
             'variable2' => 'value2',
         ]);
-        $this->assertStringContainsString('value1', $result);
-        $this->assertStringContainsString('value2', $result);
+        self::assertStringContainsString('value1', $result);
+        self::assertStringContainsString('value2', $result);
     }
 
     /**
@@ -85,10 +85,7 @@ class TemplateTest extends AbstractTestCase
      */
     public function testDynamicRender(string $templateFile, string $key, string $value): void
     {
-        $this->assertEquals(
-            $value,
-            $this->template->render($templateFile, [$key => $value])
-        );
+        self::assertSame($value, $this->template->render($templateFile, [$key => $value]));
     }
 
     /**
@@ -126,10 +123,7 @@ class TemplateTest extends AbstractTestCase
      */
     public function testRender(string $templateFile, string $expectedResult): void
     {
-        $this->assertEquals(
-            $expectedResult,
-            $this->template->render($templateFile)
-        );
+        self::assertSame($expectedResult, $this->template->render($templateFile));
     }
 
     /**
@@ -158,10 +152,7 @@ class TemplateTest extends AbstractTestCase
      */
     public function testRenderGettext(string $templateFile, array $renderParams, string $expectedResult): void
     {
-        $this->assertEquals(
-            $expectedResult,
-            $this->template->render($templateFile, $renderParams)
-        );
+        self::assertSame($expectedResult, $this->template->render($templateFile, $renderParams));
     }
 
     /**
diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php
index 5d8f9bcea4..60df5ff8b0 100644
--- a/test/classes/ThemeManagerTest.php
+++ b/test/classes/ThemeManagerTest.php
@@ -37,7 +37,7 @@ class ThemeManagerTest extends AbstractTestCase
     public function testCookieName(): void
     {
         $tm = new ThemeManager();
-        $this->assertEquals('pma_theme', $tm->getThemeCookieName());
+        self::assertSame('pma_theme', $tm->getThemeCookieName());
     }
 
     /**
@@ -47,20 +47,20 @@ class ThemeManagerTest extends AbstractTestCase
     {
         $tm = new ThemeManager();
         $tm->setThemePerServer(true);
-        $this->assertEquals('pma_theme-99', $tm->getThemeCookieName());
+        self::assertSame('pma_theme-99', $tm->getThemeCookieName());
     }
 
     public function testGetThemesArray(): void
     {
         $tm = new ThemeManager();
         $themes = $tm->getThemesArray();
-        $this->assertIsArray($themes);
-        $this->assertArrayHasKey(0, $themes);
-        $this->assertIsArray($themes[0]);
-        $this->assertArrayHasKey('id', $themes[0]);
-        $this->assertArrayHasKey('name', $themes[0]);
-        $this->assertArrayHasKey('version', $themes[0]);
-        $this->assertArrayHasKey('is_active', $themes[0]);
+        self::assertIsArray($themes);
+        self::assertArrayHasKey(0, $themes);
+        self::assertIsArray($themes[0]);
+        self::assertArrayHasKey('id', $themes[0]);
+        self::assertArrayHasKey('name', $themes[0]);
+        self::assertArrayHasKey('version', $themes[0]);
+        self::assertArrayHasKey('is_active', $themes[0]);
     }
 
     /**
@@ -69,8 +69,6 @@ class ThemeManagerTest extends AbstractTestCase
     public function testSetThemeCookie(): void
     {
         $tm = new ThemeManager();
-        $this->assertTrue(
-            $tm->setThemeCookie()
-        );
+        self::assertTrue($tm->setThemeCookie());
     }
 }
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index 4b335624f8..c19f8ab91a 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -61,7 +61,7 @@ class ThemeTest extends AbstractTestCase
     public function testCheckImgPathNotExisted(): void
     {
         $this->object->setPath('path/to/nowhere');
-        $this->assertFalse($this->object->loadInfo());
+        self::assertFalse($this->object->loadInfo());
     }
 
     /**
@@ -70,10 +70,7 @@ class ThemeTest extends AbstractTestCase
     public function testCheckImgPathIncorrect(): void
     {
         $this->object->setPath(TEST_PATH . 'test/classes/_data/incorrect_theme');
-        $this->assertFalse(
-            $this->object->loadInfo(),
-            'Theme name is not properly set'
-        );
+        self::assertFalse($this->object->loadInfo(), 'Theme name is not properly set');
     }
 
     /**
@@ -82,9 +79,9 @@ class ThemeTest extends AbstractTestCase
     public function testCheckImgPathFull(): void
     {
         $this->object->setFsPath(TEST_PATH . 'test/classes/_data/gen_version_info/');
-        $this->assertTrue($this->object->loadInfo());
-        $this->assertEquals('Test Theme', $this->object->getName());
-        $this->assertEquals('5.1', $this->object->getVersion());
+        self::assertTrue($this->object->loadInfo());
+        self::assertSame('Test Theme', $this->object->getName());
+        self::assertSame('5.1', $this->object->getVersion());
     }
 
     /**
@@ -94,17 +91,14 @@ class ThemeTest extends AbstractTestCase
     {
         $this->object->setFsPath(ROOT_PATH . 'themes/original/');
         $infofile = $this->object->getFsPath() . 'theme.json';
-        $this->assertTrue($this->object->loadInfo());
+        self::assertTrue($this->object->loadInfo());
 
-        $this->assertEquals(
-            filemtime($infofile),
-            $this->object->mtimeInfo
-        );
+        self::assertSame(filemtime($infofile), $this->object->mtimeInfo);
 
         $this->object->setPath(ROOT_PATH . 'themes/original');
         $this->object->mtimeInfo = (int) filemtime($infofile);
-        $this->assertTrue($this->object->loadInfo());
-        $this->assertEquals('Original', $this->object->getName());
+        self::assertTrue($this->object->loadInfo());
+        self::assertSame('Original', $this->object->getName());
     }
 
     /**
@@ -117,8 +111,8 @@ class ThemeTest extends AbstractTestCase
             ThemeManager::getThemesFsDir() . 'original' . DIRECTORY_SEPARATOR,
             'original'
         );
-        $this->assertNotNull($newTheme);
-        $this->assertInstanceOf(Theme::class, $newTheme);
+        self::assertNotNull($newTheme);
+        self::assertInstanceOf(Theme::class, $newTheme);
     }
 
     /**
@@ -126,13 +120,11 @@ class ThemeTest extends AbstractTestCase
      */
     public function testLoadNonExistent(): void
     {
-        $this->assertNull(
-            Theme::load(
-                ThemeManager::getThemesDir() . 'nonexistent',
-                ThemeManager::getThemesFsDir() . 'nonexistent' . DIRECTORY_SEPARATOR,
-                'nonexistent'
-            )
-        );
+        self::assertNull(Theme::load(
+            ThemeManager::getThemesDir() . 'nonexistent',
+            ThemeManager::getThemesFsDir() . 'nonexistent' . DIRECTORY_SEPARATOR,
+            'nonexistent'
+        ));
     }
 
     /**
@@ -141,7 +133,7 @@ class ThemeTest extends AbstractTestCase
     public function testCheckImgPathFallback(): void
     {
         $this->object->setPath('path/to/nowhere');
-        $this->assertTrue($this->object->checkImgPath());
+        self::assertTrue($this->object->checkImgPath());
     }
 
     /**
@@ -150,7 +142,7 @@ class ThemeTest extends AbstractTestCase
     public function testCheckImgPath(): void
     {
         $this->object->setPath(ROOT_PATH . 'themes/original');
-        $this->assertTrue($this->object->checkImgPath());
+        self::assertTrue($this->object->checkImgPath());
     }
 
     /**
@@ -158,10 +150,10 @@ class ThemeTest extends AbstractTestCase
      */
     public function testGetSetPath(): void
     {
-        $this->assertEmpty($this->object->getPath());
+        self::assertEmpty($this->object->getPath());
         $this->object->setPath(ROOT_PATH . 'themes/original');
 
-        $this->assertEquals(ROOT_PATH . 'themes/original', $this->object->getPath());
+        self::assertSame(ROOT_PATH . 'themes/original', $this->object->getPath());
     }
 
     /**
@@ -171,17 +163,13 @@ class ThemeTest extends AbstractTestCase
      */
     public function testGetSetCheckVersion(): void
     {
-        $this->assertEquals(
-            '0.0.0.0',
-            $this->object->getVersion(),
-            'Version 0.0.0.0 by default'
-        );
+        self::assertSame('0.0.0.0', $this->object->getVersion(), 'Version 0.0.0.0 by default');
 
         $this->object->setVersion('1.2.3.4');
-        $this->assertEquals('1.2.3.4', $this->object->getVersion());
+        self::assertSame('1.2.3.4', $this->object->getVersion());
 
-        $this->assertFalse($this->object->checkVersion('0.0.1.1'));
-        $this->assertTrue($this->object->checkVersion('2.0.1.1'));
+        self::assertFalse($this->object->checkVersion('0.0.1.1'));
+        self::assertTrue($this->object->checkVersion('2.0.1.1'));
     }
 
     /**
@@ -189,10 +177,10 @@ class ThemeTest extends AbstractTestCase
      */
     public function testGetSetName(): void
     {
-        $this->assertEmpty($this->object->getName(), 'Name is empty by default');
+        self::assertEmpty($this->object->getName(), 'Name is empty by default');
         $this->object->setName('New Theme Name');
 
-        $this->assertEquals('New Theme Name', $this->object->getName());
+        self::assertSame('New Theme Name', $this->object->getName());
     }
 
     /**
@@ -200,10 +188,10 @@ class ThemeTest extends AbstractTestCase
      */
     public function testGetSetId(): void
     {
-        $this->assertEmpty($this->object->getId(), 'ID is empty by default');
+        self::assertEmpty($this->object->getId(), 'ID is empty by default');
         $this->object->setId('NewID');
 
-        $this->assertEquals('NewID', $this->object->getId());
+        self::assertSame('NewID', $this->object->getId());
     }
 
     /**
@@ -211,13 +199,10 @@ class ThemeTest extends AbstractTestCase
      */
     public function testGetSetImgPath(): void
     {
-        $this->assertEmpty(
-            $this->object->getImgPath(),
-            'ImgPath is empty by default'
-        );
+        self::assertEmpty($this->object->getImgPath(), 'ImgPath is empty by default');
         $this->object->setImgPath('/new/path');
 
-        $this->assertEquals('/new/path', $this->object->getImgPath());
+        self::assertSame('/new/path', $this->object->getImgPath());
     }
 
     /**
@@ -231,10 +216,7 @@ class ThemeTest extends AbstractTestCase
      */
     public function testGetImgPath(?string $file, ?string $fallback, string $output): void
     {
-        $this->assertEquals(
-            $this->object->getImgPath($file, $fallback),
-            $output
-        );
+        self::assertSame($this->object->getImgPath($file, $fallback), $output);
     }
 
     /**
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index 4003445a83..8936fe1535 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -53,13 +53,9 @@ class TrackerTest extends AbstractTestCase
      */
     public function testEnabled(): void
     {
-        $this->assertFalse(
-            Cache::has(Tracker::TRACKER_ENABLED_CACHE_KEY)
-        );
+        self::assertFalse(Cache::has(Tracker::TRACKER_ENABLED_CACHE_KEY));
         Tracker::enable();
-        $this->assertTrue(
-            Cache::get(Tracker::TRACKER_ENABLED_CACHE_KEY)
-        );
+        self::assertTrue(Cache::get(Tracker::TRACKER_ENABLED_CACHE_KEY));
     }
 
     /**
@@ -67,22 +63,16 @@ class TrackerTest extends AbstractTestCase
      */
     public function testIsActive(): void
     {
-        $this->assertFalse(
-            Cache::has(Tracker::TRACKER_ENABLED_CACHE_KEY)
-        );
+        self::assertFalse(Cache::has(Tracker::TRACKER_ENABLED_CACHE_KEY));
 
-        $this->assertFalse(
-            Tracker::isActive()
-        );
+        self::assertFalse(Tracker::isActive());
 
         Tracker::enable();
 
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([])->toArray();
 
-        $this->assertFalse(
-            Tracker::isActive()
-        );
+        self::assertFalse(Tracker::isActive());
 
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([
@@ -91,9 +81,7 @@ class TrackerTest extends AbstractTestCase
             'tracking' => 'tracking',
         ])->toArray();
 
-        $this->assertTrue(
-            Tracker::isActive()
-        );
+        self::assertTrue(Tracker::isActive());
     }
 
     /**
@@ -106,10 +94,7 @@ class TrackerTest extends AbstractTestCase
      */
     public function testGetTableName(string $string, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            $this->callFunction(null, Tracker::class, 'getTableName', [$string])
-        );
+        self::assertSame($expected, $this->callFunction(null, Tracker::class, 'getTableName', [$string]));
     }
 
     /**
@@ -140,22 +125,16 @@ class TrackerTest extends AbstractTestCase
      */
     public function testIsTracked(): void
     {
-        $this->assertFalse(
-            Cache::has(Tracker::TRACKER_ENABLED_CACHE_KEY)
-        );
+        self::assertFalse(Cache::has(Tracker::TRACKER_ENABLED_CACHE_KEY));
 
-        $this->assertFalse(
-            Tracker::isTracked('', '')
-        );
+        self::assertFalse(Tracker::isTracked('', ''));
 
         Tracker::enable();
 
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([])->toArray();
 
-        $this->assertFalse(
-            Tracker::isTracked('', '')
-        );
+        self::assertFalse(Tracker::isTracked('', ''));
 
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([
@@ -164,13 +143,9 @@ class TrackerTest extends AbstractTestCase
             'tracking' => 'tracking',
         ])->toArray();
 
-        $this->assertTrue(
-            Tracker::isTracked('pma_test_db', 'pma_test_table')
-        );
+        self::assertTrue(Tracker::isTracked('pma_test_db', 'pma_test_table'));
 
-        $this->assertFalse(
-            Tracker::isTracked('pma_test_db', 'pma_test_table2')
-        );
+        self::assertFalse(Tracker::isTracked('pma_test_db', 'pma_test_table2'));
     }
 
     /**
@@ -181,10 +156,7 @@ class TrackerTest extends AbstractTestCase
         $date = Util::date('Y-m-d H:i:s');
         $GLOBALS['cfg']['Server']['user'] = 'pma_test_user';
 
-        $this->assertEquals(
-            '# log ' . $date . " pma_test_user\n",
-            Tracker::getLogComment()
-        );
+        self::assertSame('# log ' . $date . " pma_test_user\n", Tracker::getLogComment());
     }
 
     /**
@@ -255,7 +227,7 @@ class TrackerTest extends AbstractTestCase
             ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Tracker::createVersion('pma_test', 'pma_tbl', '1', '11', true));
+        self::assertTrue(Tracker::createVersion('pma_test', 'pma_tbl', '1', '11', true));
     }
 
     /**
@@ -282,7 +254,7 @@ class TrackerTest extends AbstractTestCase
             ->will($this->returnArgument(0));
 
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Tracker::deleteTracking('testdb', 'testtable'));
+        self::assertTrue(Tracker::deleteTracking('testdb', 'testtable'));
     }
 
     /**
@@ -315,7 +287,7 @@ class TrackerTest extends AbstractTestCase
             ->will($this->returnArgument(0));
 
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Tracker::createDatabaseVersion('pma_test', '1', 'SHOW DATABASES'));
+        self::assertTrue(Tracker::createDatabaseVersion('pma_test', '1', 'SHOW DATABASES'));
     }
 
     /**
@@ -375,9 +347,7 @@ class TrackerTest extends AbstractTestCase
      */
     public function testChangeTrackingData(): void
     {
-        $this->assertFalse(
-            Tracker::changeTrackingData('', '', '', '', '')
-        );
+        self::assertFalse(Tracker::changeTrackingData('', '', '', '', ''));
 
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
@@ -433,25 +403,21 @@ class TrackerTest extends AbstractTestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $this->assertTrue(
-            Tracker::changeTrackingData(
-                'pma_db',
-                'pma_table',
-                '1.0',
-                'DDL',
-                '# new_data_processed'
-            )
-        );
+        self::assertTrue(Tracker::changeTrackingData(
+            'pma_db',
+            'pma_table',
+            '1.0',
+            'DDL',
+            '# new_data_processed'
+        ));
 
-        $this->assertTrue(
-            Tracker::changeTrackingData(
-                'pma_db',
-                'pma_table',
-                '1.0',
-                'DML',
-                $new_data
-            )
-        );
+        self::assertTrue(Tracker::changeTrackingData(
+            'pma_db',
+            'pma_table',
+            '1.0',
+            'DML',
+            $new_data
+        ));
     }
 
     /**
@@ -518,7 +484,7 @@ class TrackerTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
         $result = Tracker::getTrackedData("pma'db", "pma'table", '1.0');
 
-        $this->assertEquals($expectedArray, $result);
+        self::assertEquals($expectedArray, $result);
     }
 
     /**
@@ -634,21 +600,21 @@ class TrackerTest extends AbstractTestCase
     ): void {
         $result = Tracker::parseQuery($query);
 
-        $this->assertEquals($type, $result['type']);
+        self::assertSame($type, $result['type']);
 
-        $this->assertEquals($identifier, $result['identifier']);
+        self::assertSame($identifier, $result['identifier']);
 
-        $this->assertEquals($tablename, $result['tablename']);
+        self::assertSame($tablename, $result['tablename']);
 
         if ($db) {
-            $this->assertEquals($db, $GLOBALS['db']);
+            self::assertSame($db, $GLOBALS['db']);
         }
 
         if (! $tablename_after_rename) {
             return;
         }
 
-        $this->assertEquals($result['tablename_after_rename'], $tablename_after_rename);
+        self::assertSame($result['tablename_after_rename'], $tablename_after_rename);
     }
 
     /**
diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php
index 2400c3dd19..19db41f432 100644
--- a/test/classes/TrackingTest.php
+++ b/test/classes/TrackingTest.php
@@ -80,8 +80,8 @@ class TrackingTest extends AbstractTestCase
 
         $ret = $this->tracking->filter($data, $filter_ts_from, $filter_ts_to, $filter_users);
 
-        $this->assertEquals('username1', $ret[0]['username']);
-        $this->assertEquals('statement1', $ret[0]['statement']);
+        self::assertSame('username1', $ret[0]['username']);
+        self::assertSame('statement1', $ret[0]['statement']);
     }
 
     /**
@@ -103,38 +103,32 @@ class TrackingTest extends AbstractTestCase
             ],
         ];
         $untracked_tables = $this->tracking->extractTableNames($table_list, 'db', true);
-        $this->assertContains('hello_world', $untracked_tables);
-        $this->assertContains('hello_lovely_world', $untracked_tables);
-        $this->assertContains('hello_lovely_world2', $untracked_tables);
+        self::assertContains('hello_world', $untracked_tables);
+        self::assertContains('hello_lovely_world', $untracked_tables);
+        self::assertContains('hello_lovely_world2', $untracked_tables);
     }
 
     public function testGetHtmlForMain(): void
     {
         $html = $this->tracking->getHtmlForMainPage('PMA_db', 'PMA_table', [], 'ltr');
 
-        $this->assertStringContainsString('PMA_db.PMA_table', $html);
-        $this->assertStringContainsString('<td>date_created</td>', $html);
-        $this->assertStringContainsString(__('Delete version'), $html);
-        $this->assertStringContainsString('<div class="card mt-3">', $html);
-        $this->assertStringContainsString('<div class="card-header">', $html);
-        $this->assertStringContainsString('<div class="card-body">', $html);
-        $this->assertStringContainsString('<div class="card-footer">', $html);
-        $this->assertStringContainsString(Url::getHiddenInputs($GLOBALS['db']), $html);
-        $this->assertStringContainsString(
-            sprintf(
-                __('Create version %1$s of %2$s'),
-                2,
-                htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-            ),
-            $html
-        );
-        $this->assertStringContainsString(
-            '<input type="checkbox" name="delete" value="true"'
-                . ' checked="checked">' . "\n" . '            DELETE<br>',
-            $html
-        );
-        $this->assertStringContainsString(__('Create version'), $html);
-        $this->assertStringContainsString('Deactivate now', $html);
+        self::assertStringContainsString('PMA_db.PMA_table', $html);
+        self::assertStringContainsString('<td>date_created</td>', $html);
+        self::assertStringContainsString(__('Delete version'), $html);
+        self::assertStringContainsString('<div class="card mt-3">', $html);
+        self::assertStringContainsString('<div class="card-header">', $html);
+        self::assertStringContainsString('<div class="card-body">', $html);
+        self::assertStringContainsString('<div class="card-footer">', $html);
+        self::assertStringContainsString(Url::getHiddenInputs($GLOBALS['db']), $html);
+        self::assertStringContainsString(sprintf(
+            __('Create version %1$s of %2$s'),
+            2,
+            htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
+        ), $html);
+        self::assertStringContainsString('<input type="checkbox" name="delete" value="true"'
+            . ' checked="checked">' . "\n" . '            DELETE<br>', $html);
+        self::assertStringContainsString(__('Create version'), $html);
+        self::assertStringContainsString('Deactivate now', $html);
     }
 
     /**
@@ -143,10 +137,10 @@ class TrackingTest extends AbstractTestCase
     public function testGetTableLastVersionNumber(): void
     {
         $sql_result = $this->tracking->getSqlResultForSelectableTables('PMA_db');
-        $this->assertNotFalse($sql_result);
+        self::assertNotFalse($sql_result);
 
         $last_version = $this->tracking->getTableLastVersionNumber($sql_result);
-        $this->assertSame(10, $last_version);
+        self::assertSame(10, $last_version);
     }
 
     /**
@@ -156,7 +150,7 @@ class TrackingTest extends AbstractTestCase
     {
         $ret = $this->tracking->getSqlResultForSelectableTables('PMA_db');
 
-        $this->assertNotFalse($ret);
+        self::assertNotFalse($ret);
     }
 
     /**
@@ -187,69 +181,27 @@ class TrackingTest extends AbstractTestCase
 
         $html = $this->tracking->getHtmlForColumns($columns);
 
-        $this->assertStringContainsString(
-            __('Column'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Type'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Collation'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Default'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Comment'),
-            $html
-        );
+        self::assertStringContainsString(__('Column'), $html);
+        self::assertStringContainsString(__('Type'), $html);
+        self::assertStringContainsString(__('Collation'), $html);
+        self::assertStringContainsString(__('Default'), $html);
+        self::assertStringContainsString(__('Comment'), $html);
 
         //column1
         $item1 = $columns[0];
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Field']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Type']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Collation']),
-            $html
-        );
-        $this->assertStringContainsString('<em>NULL</em>', $html);
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Comment']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($item1['Field']), $html);
+        self::assertStringContainsString(htmlspecialchars($item1['Type']), $html);
+        self::assertStringContainsString(htmlspecialchars($item1['Collation']), $html);
+        self::assertStringContainsString('<em>NULL</em>', $html);
+        self::assertStringContainsString(htmlspecialchars($item1['Comment']), $html);
 
         //column2
         $item1 = $columns[1];
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Field']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Type']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Collation']),
-            $html
-        );
-        $this->assertStringContainsString(
-            _pgettext('None for default', 'None'),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($item1['Comment']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($item1['Field']), $html);
+        self::assertStringContainsString(htmlspecialchars($item1['Type']), $html);
+        self::assertStringContainsString(htmlspecialchars($item1['Collation']), $html);
+        self::assertStringContainsString(_pgettext('None for default', 'None'), $html);
+        self::assertStringContainsString(htmlspecialchars($item1['Comment']), $html);
     }
 
     /**
@@ -259,7 +211,7 @@ class TrackingTest extends AbstractTestCase
     {
         $ret = $this->tracking->getListOfVersionsOfTable('PMA_db', 'PMA_table');
 
-        $this->assertNotFalse($ret);
+        self::assertNotFalse($ret);
     }
 
     /**
@@ -296,56 +248,32 @@ class TrackingTest extends AbstractTestCase
             $filter_users
         );
 
-        $this->assertStringContainsString(
-            __('Tracking report'),
-            $html
-        );
+        self::assertStringContainsString(__('Tracking report'), $html);
 
-        $this->assertStringContainsString(
-            __('Tracking statements'),
-            $html
-        );
+        self::assertStringContainsString(__('Tracking statements'), $html);
 
-        $this->assertStringContainsString($data['tracking'], $html);
+        self::assertStringContainsString($data['tracking'], $html);
 
         $version = Url::getHiddenInputs($url_params + [
             'report' => 'true',
             'version' => $_POST['version'],
         ]);
 
-        $this->assertStringContainsString($version, $html);
+        self::assertStringContainsString($version, $html);
 
-        $this->assertStringContainsString($version, $html);
+        self::assertStringContainsString($version, $html);
 
-        $this->assertStringContainsString(
-            __('Structure only'),
-            $html
-        );
+        self::assertStringContainsString(__('Structure only'), $html);
 
-        $this->assertStringContainsString(
-            __('Data only'),
-            $html
-        );
+        self::assertStringContainsString(__('Data only'), $html);
 
-        $this->assertStringContainsString(
-            __('Structure and data'),
-            $html
-        );
+        self::assertStringContainsString(__('Structure and data'), $html);
 
-        $this->assertStringContainsString(
-            htmlspecialchars($_POST['date_from']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($_POST['date_from']), $html);
 
-        $this->assertStringContainsString(
-            htmlspecialchars($_POST['date_to']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($_POST['date_to']), $html);
 
-        $this->assertStringContainsString(
-            htmlspecialchars($_POST['users']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($_POST['users']), $html);
     }
 
     /**
@@ -382,24 +310,15 @@ class TrackingTest extends AbstractTestCase
             $drop_image_or_text
         );
 
-        $this->assertStringContainsString(
-            __('Date'),
-            $html
-        );
+        self::assertStringContainsString(__('Date'), $html);
 
-        $this->assertStringContainsString(
-            __('Username'),
-            $html
-        );
+        self::assertStringContainsString(__('Username'), $html);
 
-        $this->assertStringContainsString(
-            __('Data manipulation statement'),
-            $html
-        );
+        self::assertStringContainsString(__('Data manipulation statement'), $html);
 
-        $this->assertStringContainsString($data['dmlog'][0]['date'], $html);
+        self::assertStringContainsString($data['dmlog'][0]['date'], $html);
 
-        $this->assertStringContainsString($data['dmlog'][0]['username'], $html);
+        self::assertStringContainsString($data['dmlog'][0]['username'], $html);
     }
 
     /**
@@ -435,33 +354,18 @@ class TrackingTest extends AbstractTestCase
             $drop_image_or_text
         );
 
-        $this->assertStringContainsString(
-            __('Date'),
-            $html
-        );
+        self::assertStringContainsString(__('Date'), $html);
 
-        $this->assertStringContainsString(
-            __('Username'),
-            $html
-        );
+        self::assertStringContainsString(__('Username'), $html);
 
-        $this->assertStringContainsString(
-            __('Data definition statement'),
-            $html
-        );
+        self::assertStringContainsString(__('Data definition statement'), $html);
 
-        $this->assertStringContainsString(
-            __('Action'),
-            $html
-        );
+        self::assertStringContainsString(__('Action'), $html);
 
         //PMA_getHtmlForDataDefinitionStatement
-        $this->assertStringContainsString(
-            htmlspecialchars($data['ddlog'][0]['username']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($data['ddlog'][0]['username']), $html);
 
-        $this->assertEquals(2, $count);
+        self::assertSame(2, $count);
     }
 
     /**
@@ -485,55 +389,19 @@ class TrackingTest extends AbstractTestCase
 
         $html = $this->tracking->getHtmlForIndexes($indexs);
 
-        $this->assertStringContainsString(
-            __('Indexes'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Keyname'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Type'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Unique'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Packed'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Column'),
-            $html
-        );
-        $this->assertStringContainsString(
-            __('Cardinality'),
-            $html
-        );
+        self::assertStringContainsString(__('Indexes'), $html);
+        self::assertStringContainsString(__('Keyname'), $html);
+        self::assertStringContainsString(__('Type'), $html);
+        self::assertStringContainsString(__('Unique'), $html);
+        self::assertStringContainsString(__('Packed'), $html);
+        self::assertStringContainsString(__('Column'), $html);
+        self::assertStringContainsString(__('Cardinality'), $html);
         // items
-        $this->assertStringContainsString(
-            htmlspecialchars($indexs[0]['Key_name']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($indexs[0]['Index_type']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($indexs[0]['Column_name']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($indexs[0]['Cardinality']),
-            $html
-        );
-        $this->assertStringContainsString(
-            htmlspecialchars($indexs[0]['Collation']),
-            $html
-        );
+        self::assertStringContainsString(htmlspecialchars($indexs[0]['Key_name']), $html);
+        self::assertStringContainsString(htmlspecialchars($indexs[0]['Index_type']), $html);
+        self::assertStringContainsString(htmlspecialchars($indexs[0]['Column_name']), $html);
+        self::assertStringContainsString(htmlspecialchars($indexs[0]['Cardinality']), $html);
+        self::assertStringContainsString(htmlspecialchars($indexs[0]['Collation']), $html);
     }
 
     /**
@@ -553,7 +421,7 @@ class TrackingTest extends AbstractTestCase
         $_POST['truncate'] = true;
 
         $tracking_set = $this->tracking->getTrackingSet();
-        $this->assertEquals('RENAME TABLE,CREATE TABLE,DROP TABLE,DROP INDEX,INSERT,DELETE,TRUNCATE', $tracking_set);
+        self::assertSame('RENAME TABLE,CREATE TABLE,DROP TABLE,DROP INDEX,INSERT,DELETE,TRUNCATE', $tracking_set);
 
         //other set to true
         $_POST['alter_table'] = true;
@@ -568,7 +436,7 @@ class TrackingTest extends AbstractTestCase
         $_POST['truncate'] = false;
 
         $tracking_set = $this->tracking->getTrackingSet();
-        $this->assertEquals('ALTER TABLE,CREATE INDEX,UPDATE', $tracking_set);
+        self::assertSame('ALTER TABLE,CREATE INDEX,UPDATE', $tracking_set);
     }
 
     /**
@@ -599,7 +467,7 @@ class TrackingTest extends AbstractTestCase
         $filter_ts_from = 0;
 
         $entries = $this->tracking->getEntries($data, $filter_ts_from, $filter_ts_to, $filter_users);
-        $this->assertEquals('username3', $entries[0]['username']);
-        $this->assertEquals('statement1', $entries[0]['statement']);
+        self::assertSame('username3', $entries[0]['username']);
+        self::assertSame('statement1', $entries[0]['statement']);
     }
 }
diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php
index 016a3f0a2f..c077728a11 100644
--- a/test/classes/TransformationsTest.php
+++ b/test/classes/TransformationsTest.php
@@ -51,10 +51,7 @@ class TransformationsTest extends AbstractTestCase
      */
     public function testGetOptions(string $input, array $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            $this->transformations->getOptions($input)
-        );
+        self::assertSame($expected, $this->transformations->getOptions($input));
     }
 
     /**
@@ -104,88 +101,85 @@ class TransformationsTest extends AbstractTestCase
      */
     public function testGetTypes(): void
     {
-        $this->assertEquals(
-            [
-                'mimetype' => [
-                    'Application/Octetstream' => 'Application/Octetstream',
-                    'Image/JPEG' => 'Image/JPEG',
-                    'Image/PNG' => 'Image/PNG',
-                    'Text/Plain' => 'Text/Plain',
-                    'Text/Octetstream' => 'Text/Octetstream',
-                ],
-                'transformation' => [
-                    0 => 'Application/Octetstream: Download',
-                    1 => 'Application/Octetstream: Hex',
-                    2 => 'Image/JPEG: Inline',
-                    3 => 'Image/JPEG: Link',
-                    4 => 'Image/PNG: Inline',
-                    5 => 'Text/Octetstream: Sql',
-                    6 => 'Text/Plain: Binarytoip',
-                    7 => 'Text/Plain: Bool2Text',
-                    8 => 'Text/Plain: Dateformat',
-                    9 => 'Text/Plain: External',
-                    10 => 'Text/Plain: Formatted',
-                    11 => 'Text/Plain: Imagelink',
-                    12 => 'Text/Plain: Json',
-                    13 => 'Text/Plain: Sql',
-                    14 => 'Text/Plain: Xml',
-                    15 => 'Text/Plain: Link',
-                    16 => 'Text/Plain: Longtoipv4',
-                    17 => 'Text/Plain: PreApPend',
-                    18 => 'Text/Plain: Substring',
-                ],
-                'transformation_file' => [
-                    0 => 'Output/Application_Octetstream_Download.php',
-                    1 => 'Output/Application_Octetstream_Hex.php',
-                    2 => 'Output/Image_JPEG_Inline.php',
-                    3 => 'Output/Image_JPEG_Link.php',
-                    4 => 'Output/Image_PNG_Inline.php',
-                    5 => 'Output/Text_Octetstream_Sql.php',
-                    6 => 'Output/Text_Plain_Binarytoip.php',
-                    7 => 'Output/Text_Plain_Bool2Text.php',
-                    8 => 'Output/Text_Plain_Dateformat.php',
-                    9 => 'Output/Text_Plain_External.php',
-                    10 => 'Output/Text_Plain_Formatted.php',
-                    11 => 'Output/Text_Plain_Imagelink.php',
-                    12 => 'Output/Text_Plain_Json.php',
-                    13 => 'Output/Text_Plain_Sql.php',
-                    14 => 'Output/Text_Plain_Xml.php',
-                    15 => 'Text_Plain_Link.php',
-                    16 => 'Text_Plain_Longtoipv4.php',
-                    17 => 'Text_Plain_PreApPend.php',
-                    18 => 'Text_Plain_Substring.php',
-                ],
-                'input_transformation' => [
-                    'Image/JPEG: Upload',
-                    'Text/Plain: FileUpload',
-                    'Text/Plain: Iptobinary',
-                    'Text/Plain: Iptolong',
-                    'Text/Plain: JsonEditor',
-                    'Text/Plain: RegexValidation',
-                    'Text/Plain: SqlEditor',
-                    'Text/Plain: XmlEditor',
-                    'Text/Plain: Link',
-                    'Text/Plain: Longtoipv4',
-                    'Text/Plain: PreApPend',
-                    'Text/Plain: Substring',
-                ],
-                'input_transformation_file' => [
-                    'Input/Image_JPEG_Upload.php',
-                    'Input/Text_Plain_FileUpload.php',
-                    'Input/Text_Plain_Iptobinary.php',
-                    'Input/Text_Plain_Iptolong.php',
-                    'Input/Text_Plain_JsonEditor.php',
-                    'Input/Text_Plain_RegexValidation.php',
-                    'Input/Text_Plain_SqlEditor.php',
-                    'Input/Text_Plain_XmlEditor.php',
-                    'Text_Plain_Link.php',
-                    'Text_Plain_Longtoipv4.php',
-                    'Text_Plain_PreApPend.php',
-                    'Text_Plain_Substring.php',
-                ],
+        self::assertEquals([
+            'mimetype' => [
+                'Application/Octetstream' => 'Application/Octetstream',
+                'Image/JPEG' => 'Image/JPEG',
+                'Image/PNG' => 'Image/PNG',
+                'Text/Plain' => 'Text/Plain',
+                'Text/Octetstream' => 'Text/Octetstream',
             ],
-            $this->transformations->getAvailableMimeTypes()
-        );
+            'transformation' => [
+                0 => 'Application/Octetstream: Download',
+                1 => 'Application/Octetstream: Hex',
+                2 => 'Image/JPEG: Inline',
+                3 => 'Image/JPEG: Link',
+                4 => 'Image/PNG: Inline',
+                5 => 'Text/Octetstream: Sql',
+                6 => 'Text/Plain: Binarytoip',
+                7 => 'Text/Plain: Bool2Text',
+                8 => 'Text/Plain: Dateformat',
+                9 => 'Text/Plain: External',
+                10 => 'Text/Plain: Formatted',
+                11 => 'Text/Plain: Imagelink',
+                12 => 'Text/Plain: Json',
+                13 => 'Text/Plain: Sql',
+                14 => 'Text/Plain: Xml',
+                15 => 'Text/Plain: Link',
+                16 => 'Text/Plain: Longtoipv4',
+                17 => 'Text/Plain: PreApPend',
+                18 => 'Text/Plain: Substring',
+            ],
+            'transformation_file' => [
+                0 => 'Output/Application_Octetstream_Download.php',
+                1 => 'Output/Application_Octetstream_Hex.php',
+                2 => 'Output/Image_JPEG_Inline.php',
+                3 => 'Output/Image_JPEG_Link.php',
+                4 => 'Output/Image_PNG_Inline.php',
+                5 => 'Output/Text_Octetstream_Sql.php',
+                6 => 'Output/Text_Plain_Binarytoip.php',
+                7 => 'Output/Text_Plain_Bool2Text.php',
+                8 => 'Output/Text_Plain_Dateformat.php',
+                9 => 'Output/Text_Plain_External.php',
+                10 => 'Output/Text_Plain_Formatted.php',
+                11 => 'Output/Text_Plain_Imagelink.php',
+                12 => 'Output/Text_Plain_Json.php',
+                13 => 'Output/Text_Plain_Sql.php',
+                14 => 'Output/Text_Plain_Xml.php',
+                15 => 'Text_Plain_Link.php',
+                16 => 'Text_Plain_Longtoipv4.php',
+                17 => 'Text_Plain_PreApPend.php',
+                18 => 'Text_Plain_Substring.php',
+            ],
+            'input_transformation' => [
+                'Image/JPEG: Upload',
+                'Text/Plain: FileUpload',
+                'Text/Plain: Iptobinary',
+                'Text/Plain: Iptolong',
+                'Text/Plain: JsonEditor',
+                'Text/Plain: RegexValidation',
+                'Text/Plain: SqlEditor',
+                'Text/Plain: XmlEditor',
+                'Text/Plain: Link',
+                'Text/Plain: Longtoipv4',
+                'Text/Plain: PreApPend',
+                'Text/Plain: Substring',
+            ],
+            'input_transformation_file' => [
+                'Input/Image_JPEG_Upload.php',
+                'Input/Text_Plain_FileUpload.php',
+                'Input/Text_Plain_Iptobinary.php',
+                'Input/Text_Plain_Iptolong.php',
+                'Input/Text_Plain_JsonEditor.php',
+                'Input/Text_Plain_RegexValidation.php',
+                'Input/Text_Plain_SqlEditor.php',
+                'Input/Text_Plain_XmlEditor.php',
+                'Text_Plain_Link.php',
+                'Text_Plain_Longtoipv4.php',
+                'Text_Plain_PreApPend.php',
+                'Text_Plain_Substring.php',
+            ],
+        ], $this->transformations->getAvailableMimeTypes());
     }
 
     /**
@@ -200,27 +194,24 @@ class TransformationsTest extends AbstractTestCase
             'trackingwork' => true,
             'column_info' => 'column_info',
         ])->toArray();
-        $this->assertEquals(
-            [
-                'o' => [
-                    'column_name' => 'o',
-                    'mimetype' => 'Text/plain',
-                    'transformation' => 'Sql',
-                    'transformation_options' => '',
-                    'input_transformation' => 'regex',
-                    'input_transformation_options' => '/pma/i',
-                ],
-                'col' => [
-                    'column_name' => 'col',
-                    'mimetype' => 'T',
-                    'transformation' => 'O/P',
-                    'transformation_options' => '',
-                    'input_transformation' => 'i/p',
-                    'input_transformation_options' => '',
-                ],
+        self::assertSame([
+            'o' => [
+                'column_name' => 'o',
+                'mimetype' => 'Text/plain',
+                'transformation' => 'Sql',
+                'transformation_options' => '',
+                'input_transformation' => 'regex',
+                'input_transformation_options' => '/pma/i',
             ],
-            $this->transformations->getMime('pma_test', 'table1')
-        );
+            'col' => [
+                'column_name' => 'col',
+                'mimetype' => 'T',
+                'transformation' => 'O/P',
+                'transformation_options' => '',
+                'input_transformation' => 'i/p',
+                'input_transformation_options' => '',
+            ],
+        ], $this->transformations->getMime('pma_test', 'table1'));
     }
 
     /**
@@ -239,7 +230,7 @@ class TransformationsTest extends AbstractTestCase
 
         // Case 1 : no configuration storage
         $actual = $this->transformations->clear('db');
-        $this->assertFalse($actual);
+        self::assertFalse($actual);
 
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([
@@ -250,15 +241,15 @@ class TransformationsTest extends AbstractTestCase
 
         // Case 2 : database delete
         $actual = $this->transformations->clear('db');
-        $this->assertTrue($actual);
+        self::assertTrue($actual);
 
         // Case 3 : table delete
         $actual = $this->transformations->clear('db', 'table');
-        $this->assertTrue($actual);
+        self::assertTrue($actual);
 
         // Case 4 : column delete
         $actual = $this->transformations->clear('db', 'table', 'col');
-        $this->assertTrue($actual);
+        self::assertTrue($actual);
     }
 
     /**
@@ -269,10 +260,7 @@ class TransformationsTest extends AbstractTestCase
      */
     public function testFixup(string $value, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            $this->transformations->fixUpMime($value)
-        );
+        self::assertSame($expected, $this->transformations->fixUpMime($value));
     }
 
     public static function fixupData(): array
@@ -311,10 +299,7 @@ class TransformationsTest extends AbstractTestCase
      */
     public function testGetDescription(string $file, string $expectedDescription): void
     {
-        $this->assertEquals(
-            $expectedDescription,
-            $this->transformations->getDescription($file)
-        );
+        self::assertSame($expectedDescription, $this->transformations->getDescription($file));
     }
 
     public static function providerGetDescription(): array
@@ -345,10 +330,7 @@ class TransformationsTest extends AbstractTestCase
      */
     public function testGetName(string $file, string $expectedName): void
     {
-        $this->assertEquals(
-            $expectedName,
-            $this->transformations->getName($file)
-        );
+        self::assertSame($expectedName, $this->transformations->getName($file));
     }
 
     public static function providerGetName(): array
diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php
index 48e04cb3bc..6e1cfb9ce7 100644
--- a/test/classes/TwoFactorTest.php
+++ b/test/classes/TwoFactorTest.php
@@ -167,21 +167,21 @@ class TwoFactorTest extends AbstractTestCase
     {
         $object = $this->getTwoFactorAndLoadConfig('user', ['type' => 'db']);
         $backend = $object->getBackend();
-        $this->assertEquals('', $backend::$id);
+        self::assertSame('', $backend::$id);
         // Is always valid
-        $this->assertTrue($object->check(true));
+        self::assertTrue($object->check(true));
         // Test session persistence
-        $this->assertTrue($object->check());
-        $this->assertTrue($object->check());
-        $this->assertEquals('', $object->render());
+        self::assertTrue($object->check());
+        self::assertTrue($object->check());
+        self::assertSame('', $object->render());
 
         $this->assertAllQueriesConsumed();
 
         $this->loadResultForConfig(['type' => 'db']);
         $this->loadQueriesForConfigure('');
 
-        $this->assertTrue($object->configure(''));
-        $this->assertEquals('', $object->setup());
+        self::assertTrue($object->configure(''));
+        self::assertSame('', $object->setup());
     }
 
     public function testSimple(): void
@@ -189,26 +189,26 @@ class TwoFactorTest extends AbstractTestCase
         $GLOBALS['cfg']['DBG']['simple2fa'] = true;
         $object = $this->getTwoFactorAndLoadConfig('user', ['type' => 'db', 'backend' => 'simple']);
         $backend = $object->getBackend();
-        $this->assertEquals('simple', $backend::$id);
+        self::assertSame('simple', $backend::$id);
         $GLOBALS['cfg']['DBG']['simple2fa'] = false;
 
         unset($_POST['2fa_confirm']);
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
 
         $_POST['2fa_confirm'] = 1;
-        $this->assertTrue($object->check(true));
+        self::assertTrue($object->check(true));
         unset($_POST['2fa_confirm']);
 
         /* Test rendering */
-        $this->assertNotEquals('', $object->render());
-        $this->assertEquals('', $object->setup());
+        self::assertNotEquals('', $object->render());
+        self::assertSame('', $object->setup());
     }
 
     public function testLoad(): void
     {
         $object = $this->getTwoFactorAndLoadConfig('user', null);
         $backend = $object->getBackend();
-        $this->assertEquals('', $backend::$id);
+        self::assertSame('', $backend::$id);
     }
 
     public function testConfigureSimple(): void
@@ -221,18 +221,18 @@ class TwoFactorTest extends AbstractTestCase
         $this->loadResultForConfig([]);
         $this->loadQueriesForConfigure('simple');
 
-        $this->assertTrue($object->configure('simple'));
+        self::assertTrue($object->configure('simple'));
         $backend = $object->getBackend();
-        $this->assertEquals('simple', $backend::$id);
+        self::assertSame('simple', $backend::$id);
 
         $this->assertAllQueriesConsumed();
 
         $this->loadResultForConfig([]);
         $this->loadQueriesForConfigure('');
 
-        $this->assertTrue($object->configure(''));
+        self::assertTrue($object->configure(''));
         $backend = $object->getBackend();
-        $this->assertEquals('', $backend::$id);
+        self::assertSame('', $backend::$id);
 
         $this->assertAllQueriesConsumed();
 
@@ -240,7 +240,7 @@ class TwoFactorTest extends AbstractTestCase
 
         $GLOBALS['cfg']['DBG']['simple2fa'] = false;
         $object = $this->getTwoFactorAndLoadConfig('user', null);
-        $this->assertFalse($object->configure('simple'));
+        self::assertFalse($object->configure('simple'));
         $this->assertAllQueriesConsumed();
     }
 
@@ -260,11 +260,11 @@ class TwoFactorTest extends AbstractTestCase
 
         /* Without providing code this should fail */
         unset($_POST['2fa_code']);
-        $this->assertFalse($object->configure('application'));
+        self::assertFalse($object->configure('application'));
 
         /* Invalid code */
         $_POST['2fa_code'] = 'invalid';
-        $this->assertFalse($object->configure('application'));
+        self::assertFalse($object->configure('application'));
 
         /* Generate valid code */
         /** @var Application $app */
@@ -281,26 +281,26 @@ class TwoFactorTest extends AbstractTestCase
             'secret' => $object->config['settings']['secret'],
         ]);
 
-        $this->assertTrue($object->configure('application'));
+        self::assertTrue($object->configure('application'));
 
         $this->assertAllQueriesConsumed();
         unset($_POST['2fa_code']);
 
         /* Check code */
         unset($_POST['2fa_code']);
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
         $_POST['2fa_code'] = 'invalid';
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
         $_POST['2fa_code'] = $google2fa->oathTotp(
             $object->config['settings']['secret'],
             $google2fa->getTimestamp()
         );
-        $this->assertTrue($object->check(true));
+        self::assertTrue($object->check(true));
         unset($_POST['2fa_code']);
 
         /* Test rendering */
-        $this->assertNotEquals('', $object->render());
-        $this->assertNotEquals('', $object->setup());
+        self::assertNotEquals('', $object->render());
+        self::assertNotEquals('', $object->setup());
     }
 
     public function testKey(): void
@@ -315,31 +315,31 @@ class TwoFactorTest extends AbstractTestCase
         $_SESSION['registrationRequest'] = null;
         /* Without providing code this should fail */
         unset($_POST['u2f_registration_response']);
-        $this->assertFalse($object->configure('key'));
+        self::assertFalse($object->configure('key'));
 
         /* Invalid code */
         $_POST['u2f_registration_response'] = 'invalid';
-        $this->assertFalse($object->configure('key'));
+        self::assertFalse($object->configure('key'));
 
         /* Invalid code */
         $_POST['u2f_registration_response'] = '[]';
-        $this->assertFalse($object->configure('key'));
+        self::assertFalse($object->configure('key'));
 
         /* Without providing code this should fail */
         unset($_POST['u2f_authentication_response']);
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
 
         /* Invalid code */
         $_POST['u2f_authentication_response'] = 'invalid';
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
 
         /* Invalid code */
         $_POST['u2f_authentication_response'] = '[]';
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
 
         /* Test rendering */
-        $this->assertNotEquals('', $object->render());
-        $this->assertNotEquals('', $object->setup());
+        self::assertNotEquals('', $object->render());
+        self::assertNotEquals('', $object->setup());
     }
 
     /**
@@ -349,19 +349,19 @@ class TwoFactorTest extends AbstractTestCase
     {
         $object = $this->getTwoFactorAndLoadConfig('user', null);
         $GLOBALS['config']->set('PmaAbsoluteUri', 'http://demo.example.com');
-        $this->assertEquals('http://demo.example.com', $object->getBackend()->getAppId(true));
-        $this->assertEquals('demo.example.com', $object->getBackend()->getAppId(false));
+        self::assertSame('http://demo.example.com', $object->getBackend()->getAppId(true));
+        self::assertSame('demo.example.com', $object->getBackend()->getAppId(false));
         $GLOBALS['config']->set('PmaAbsoluteUri', 'https://demo.example.com:123');
-        $this->assertEquals('https://demo.example.com:123', $object->getBackend()->getAppId(true));
-        $this->assertEquals('demo.example.com', $object->getBackend()->getAppId(false));
+        self::assertSame('https://demo.example.com:123', $object->getBackend()->getAppId(true));
+        self::assertSame('demo.example.com', $object->getBackend()->getAppId(false));
         $GLOBALS['config']->set('PmaAbsoluteUri', '');
         $GLOBALS['config']->set('is_https', true);
         $_SERVER['HTTP_HOST'] = 'pma.example.com';
-        $this->assertEquals('https://pma.example.com', $object->getBackend()->getAppId(true));
-        $this->assertEquals('pma.example.com', $object->getBackend()->getAppId(false));
+        self::assertSame('https://pma.example.com', $object->getBackend()->getAppId(true));
+        self::assertSame('pma.example.com', $object->getBackend()->getAppId(false));
         $GLOBALS['config']->set('is_https', false);
-        $this->assertEquals('http://pma.example.com', $object->getBackend()->getAppId(true));
-        $this->assertEquals('pma.example.com', $object->getBackend()->getAppId(false));
+        self::assertSame('http://pma.example.com', $object->getBackend()->getAppId(true));
+        self::assertSame('pma.example.com', $object->getBackend()->getAppId(false));
     }
 
     /**
@@ -380,10 +380,10 @@ class TwoFactorTest extends AbstractTestCase
             'http://demo.example.com'
         );
         unset($_POST['u2f_registration_response']);
-        $this->assertFalse($object->configure('key'));
+        self::assertFalse($object->configure('key'));
 
         $_POST['u2f_registration_response'] = '';
-        $this->assertFalse($object->configure('key'));
+        self::assertFalse($object->configure('key'));
 
         $_POST['u2f_registration_response'] = '{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5F'
             . 'B9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBk'
@@ -432,13 +432,13 @@ class TwoFactorTest extends AbstractTestCase
             ],
         ]);
 
-        $this->assertTrue($object->configure('key'));
+        self::assertTrue($object->configure('key'));
 
         unset($_POST['u2f_authentication_response']);
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
 
         $_POST['u2f_authentication_response'] = '';
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
 
         $_SESSION['authenticationRequest'] = [
             new SignRequest([
@@ -447,7 +447,7 @@ class TwoFactorTest extends AbstractTestCase
                 'appId' => 'http://demo.example.com',
             ]),
         ];
-        $this->assertFalse($object->check(true));
+        self::assertFalse($object->check(true));
         $_POST['u2f_authentication_response'] = '{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0'
             . 'jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", '
             . '"clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVd'
@@ -480,7 +480,7 @@ class TwoFactorTest extends AbstractTestCase
                 ],
             ],
         ]);
-        $this->assertTrue($object->check(true));
+        self::assertTrue($object->check(true));
         $this->assertAllQueriesConsumed();
     }
 
@@ -492,10 +492,7 @@ class TwoFactorTest extends AbstractTestCase
         $GLOBALS['cfg']['DBG']['simple2fa'] = true;
         $object = $this->getTwoFactorAndLoadConfig('user', null);
         $backends = $object->getAllBackends();
-        $this->assertCount(
-            count($object->getAvailable()) + 1,
-            $backends
-        );
+        self::assertCount(count($object->getAvailable()) + 1, $backends);
         $GLOBALS['cfg']['DBG']['simple2fa'] = false;
     }
 }
diff --git a/test/classes/TypesByDatabaseVersionTest.php b/test/classes/TypesByDatabaseVersionTest.php
index 940b7c0c4b..fb1291a3d3 100644
--- a/test/classes/TypesByDatabaseVersionTest.php
+++ b/test/classes/TypesByDatabaseVersionTest.php
@@ -66,7 +66,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
 
         if ($includes) {
             foreach ($includes as $value) {
-                $this->assertContains($value, $result);
+                self::assertContains($value, $result);
             }
         }
 
@@ -75,7 +75,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
         }
 
         foreach ($excludes as $value) {
-            $this->assertNotContains($value, $result);
+            self::assertNotContains($value, $result);
         }
     }
 
@@ -286,7 +286,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
 
         if ($includes) {
             foreach ($includes as $value) {
-                $this->assertContains($value, $result);
+                self::assertContains($value, $result);
             }
         }
 
@@ -295,7 +295,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
         }
 
         foreach ($excludes as $value) {
-            $this->assertNotContains($value, $result);
+            self::assertNotContains($value, $result);
         }
     }
 
@@ -362,7 +362,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
 
         if ($includes) {
             foreach ($includes as $value) {
-                $this->assertContains($value, $result);
+                self::assertContains($value, $result);
             }
         }
 
@@ -371,7 +371,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
         }
 
         foreach ($excludes as $value) {
-            $this->assertNotContains($value, $result);
+            self::assertNotContains($value, $result);
         }
     }
 
@@ -618,7 +618,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
     {
         $this->createObject($database, $dbVersion);
 
-        $this->assertEquals($expected, $this->object->getColumns());
+        self::assertSame($expected, $this->object->getColumns());
     }
 
     /**
diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php
index 6148586614..bcde2bde42 100644
--- a/test/classes/TypesTest.php
+++ b/test/classes/TypesTest.php
@@ -29,8 +29,8 @@ class TypesTest extends AbstractTestCase
      */
     public function testUnary(): void
     {
-        $this->assertTrue($this->object->isUnaryOperator('IS NULL'));
-        $this->assertFalse($this->object->isUnaryOperator('='));
+        self::assertTrue($this->object->isUnaryOperator('IS NULL'));
+        self::assertFalse($this->object->isUnaryOperator('='));
     }
 
     /**
@@ -38,15 +38,12 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetUnaryOperators(): void
     {
-        $this->assertEquals(
-            [
-                'IS NULL',
-                'IS NOT NULL',
-                "= ''",
-                "!= ''",
-            ],
-            $this->object->getUnaryOperators()
-        );
+        self::assertSame([
+            'IS NULL',
+            'IS NOT NULL',
+            "= ''",
+            "!= ''",
+        ], $this->object->getUnaryOperators());
     }
 
     /**
@@ -54,13 +51,10 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetNullOperators(): void
     {
-        $this->assertEquals(
-            [
-                'IS NULL',
-                'IS NOT NULL',
-            ],
-            $this->object->getNullOperators()
-        );
+        self::assertSame([
+            'IS NULL',
+            'IS NOT NULL',
+        ], $this->object->getNullOperators());
     }
 
     /**
@@ -68,13 +62,10 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetEnumOperators(): void
     {
-        $this->assertEquals(
-            [
-                '=',
-                '!=',
-            ],
-            $this->object->getEnumOperators()
-        );
+        self::assertSame([
+            '=',
+            '!=',
+        ], $this->object->getEnumOperators());
     }
 
     /**
@@ -82,26 +73,23 @@ class TypesTest extends AbstractTestCase
      */
     public function testgetTextOperators(): void
     {
-        $this->assertEquals(
-            [
-                'LIKE',
-                'LIKE %...%',
-                'NOT LIKE',
-                'NOT LIKE %...%',
-                '=',
-                '!=',
-                'REGEXP',
-                'REGEXP ^...$',
-                'NOT REGEXP',
-                "= ''",
-                "!= ''",
-                'IN (...)',
-                'NOT IN (...)',
-                'BETWEEN',
-                'NOT BETWEEN',
-            ],
-            $this->object->getTextOperators()
-        );
+        self::assertSame([
+            'LIKE',
+            'LIKE %...%',
+            'NOT LIKE',
+            'NOT LIKE %...%',
+            '=',
+            '!=',
+            'REGEXP',
+            'REGEXP ^...$',
+            'NOT REGEXP',
+            "= ''",
+            "!= ''",
+            'IN (...)',
+            'NOT IN (...)',
+            'BETWEEN',
+            'NOT BETWEEN',
+        ], $this->object->getTextOperators());
     }
 
     /**
@@ -109,25 +97,22 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetNumberOperators(): void
     {
-        $this->assertEquals(
-            [
-                '=',
-                '>',
-                '>=',
-                '<',
-                '<=',
-                '!=',
-                'LIKE',
-                'LIKE %...%',
-                'NOT LIKE',
-                'NOT LIKE %...%',
-                'IN (...)',
-                'NOT IN (...)',
-                'BETWEEN',
-                'NOT BETWEEN',
-            ],
-            $this->object->getNumberOperators()
-        );
+        self::assertSame([
+            '=',
+            '>',
+            '>=',
+            '<',
+            '<=',
+            '!=',
+            'LIKE',
+            'LIKE %...%',
+            'NOT LIKE',
+            'NOT LIKE %...%',
+            'IN (...)',
+            'NOT IN (...)',
+            'BETWEEN',
+            'NOT BETWEEN',
+        ], $this->object->getNumberOperators());
     }
 
     /**
@@ -135,19 +120,16 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetUUIDOperators(): void
     {
-        $this->assertEquals(
-            [
-                '=',
-                '!=',
-                'LIKE',
-                'LIKE %...%',
-                'NOT LIKE',
-                'NOT LIKE %...%',
-                'IN (...)',
-                'NOT IN (...)',
-            ],
-            $this->object->getUUIDOperators()
-        );
+        self::assertSame([
+            '=',
+            '!=',
+            'LIKE',
+            'LIKE %...%',
+            'NOT LIKE',
+            'NOT LIKE %...%',
+            'IN (...)',
+            'NOT IN (...)',
+        ], $this->object->getUUIDOperators());
     }
 
     /**
@@ -161,10 +143,7 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetTypeOperators(string $type, bool $null, $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->object->getTypeOperators($type, $null)
-        );
+        self::assertSame($output, $this->object->getTypeOperators($type, $null));
     }
 
     /**
@@ -263,10 +242,7 @@ class TypesTest extends AbstractTestCase
         string $selectedOperator,
         string $output
     ): void {
-        $this->assertEquals(
-            $output,
-            $this->object->getTypeOperatorsHtml($type, $null, $selectedOperator)
-        );
+        self::assertSame($output, $this->object->getTypeOperatorsHtml($type, $null, $selectedOperator));
     }
 
     /**
@@ -295,10 +271,7 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetTypeDescription(string $type): void
     {
-        $this->assertNotEquals(
-            '',
-            $this->object->getTypeDescription($type)
-        );
+        self::assertNotEquals('', $this->object->getTypeDescription($type));
     }
 
     /**
@@ -306,10 +279,7 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetUnknownTypeDescription(): void
     {
-        $this->assertEquals(
-            '',
-            $this->object->getTypeDescription('UNKNOWN')
-        );
+        self::assertSame('', $this->object->getTypeDescription('UNKNOWN'));
     }
 
     /**
@@ -373,10 +343,7 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetFunctionsClass(string $class, array $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->object->getFunctionsClass($class)
-        );
+        self::assertSame($output, $this->object->getFunctionsClass($class));
     }
 
     /**
@@ -536,45 +503,42 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetFunctions(): void
     {
-        $this->assertEquals(
-            [
-                'AES_DECRYPT',
-                'AES_ENCRYPT',
-                'BIN',
-                'CHAR',
-                'COMPRESS',
-                'CURRENT_USER',
-                'DATABASE',
-                'DAYNAME',
-                'DES_DECRYPT',
-                'DES_ENCRYPT',
-                'ENCRYPT',
-                'HEX',
-                'INET6_NTOA',
-                'INET_NTOA',
-                'LOAD_FILE',
-                'LOWER',
-                'LTRIM',
-                'MD5',
-                'MONTHNAME',
-                'OLD_PASSWORD',
-                'PASSWORD',
-                'QUOTE',
-                'REVERSE',
-                'RTRIM',
-                'SHA1',
-                'SOUNDEX',
-                'SPACE',
-                'TRIM',
-                'UNCOMPRESS',
-                'UNHEX',
-                'UPPER',
-                'USER',
-                'UUID',
-                'VERSION',
-            ],
-            $this->object->getFunctions('enum')
-        );
+        self::assertSame([
+            'AES_DECRYPT',
+            'AES_ENCRYPT',
+            'BIN',
+            'CHAR',
+            'COMPRESS',
+            'CURRENT_USER',
+            'DATABASE',
+            'DAYNAME',
+            'DES_DECRYPT',
+            'DES_ENCRYPT',
+            'ENCRYPT',
+            'HEX',
+            'INET6_NTOA',
+            'INET_NTOA',
+            'LOAD_FILE',
+            'LOWER',
+            'LTRIM',
+            'MD5',
+            'MONTHNAME',
+            'OLD_PASSWORD',
+            'PASSWORD',
+            'QUOTE',
+            'REVERSE',
+            'RTRIM',
+            'SHA1',
+            'SOUNDEX',
+            'SPACE',
+            'TRIM',
+            'UNCOMPRESS',
+            'UNHEX',
+            'UPPER',
+            'USER',
+            'UUID',
+            'VERSION',
+        ], $this->object->getFunctions('enum'));
     }
 
     /**
@@ -582,128 +546,125 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetAllFunctions(): void
     {
-        $this->assertEquals(
-            [
-                'ABS',
-                'ACOS',
-                'AES_DECRYPT',
-                'AES_ENCRYPT',
-                'ASCII',
-                'ASIN',
-                'ATAN',
-                'BIN',
-                'BIT_COUNT',
-                'BIT_LENGTH',
-                'CEILING',
-                'CHAR',
-                'CHAR_LENGTH',
-                'COMPRESS',
-                'CONNECTION_ID',
-                'COS',
-                'COT',
-                'CRC32',
-                'CURRENT_DATE',
-                'CURRENT_TIME',
-                'CURRENT_USER',
-                'DATABASE',
-                'DATE',
-                'DAYNAME',
-                'DAYOFMONTH',
-                'DAYOFWEEK',
-                'DAYOFYEAR',
-                'DEGREES',
-                'DES_DECRYPT',
-                'DES_ENCRYPT',
-                'ENCRYPT',
-                'EXP',
-                'FLOOR',
-                'FROM_DAYS',
-                'FROM_UNIXTIME',
-                'HEX',
-                'HOUR',
-                'INET6_ATON',
-                'INET6_NTOA',
-                'INET_ATON',
-                'INET_NTOA',
-                'LAST_DAY',
-                'LENGTH',
-                'LN',
-                'LOAD_FILE',
-                'LOG',
-                'LOG10',
-                'LOG2',
-                'LOWER',
-                'LTRIM',
-                'MD5',
-                'MICROSECOND',
-                'MINUTE',
-                'MONTH',
-                'MONTHNAME',
-                'NOW',
-                'OCT',
-                'OLD_PASSWORD',
-                'ORD',
-                'PASSWORD',
-                'PI',
-                'QUARTER',
-                'QUOTE',
-                'RADIANS',
-                'RAND',
-                'REVERSE',
-                'ROUND',
-                'RTRIM',
-                'SECOND',
-                'SEC_TO_TIME',
-                'SHA1',
-                'SIGN',
-                'SIN',
-                'SOUNDEX',
-                'SPACE',
-                'SQRT',
-                'ST_GeomCollFromText',
-                'ST_GeomCollFromWKB',
-                'ST_GeomFromText',
-                'ST_GeomFromWKB',
-                'ST_LineFromText',
-                'ST_LineFromWKB',
-                'ST_MLineFromText',
-                'ST_MLineFromWKB',
-                'ST_MPointFromText',
-                'ST_MPointFromWKB',
-                'ST_MPolyFromText',
-                'ST_MPolyFromWKB',
-                'ST_PointFromText',
-                'ST_PointFromWKB',
-                'ST_PolyFromText',
-                'ST_PolyFromWKB',
-                'SYSDATE',
-                'TAN',
-                'TIME',
-                'TIMESTAMP',
-                'TIME_TO_SEC',
-                'TO_DAYS',
-                'TO_SECONDS',
-                'TRIM',
-                'UNCOMPRESS',
-                'UNCOMPRESSED_LENGTH',
-                'UNHEX',
-                'UNIX_TIMESTAMP',
-                'UPPER',
-                'USER',
-                'UTC_DATE',
-                'UTC_TIME',
-                'UTC_TIMESTAMP',
-                'UUID',
-                'UUID_SHORT',
-                'VERSION',
-                'WEEK',
-                'WEEKDAY',
-                'WEEKOFYEAR',
-                'YEAR',
-                'YEARWEEK',
-            ],
-            $this->object->getAllFunctions()
-        );
+        self::assertSame([
+            'ABS',
+            'ACOS',
+            'AES_DECRYPT',
+            'AES_ENCRYPT',
+            'ASCII',
+            'ASIN',
+            'ATAN',
+            'BIN',
+            'BIT_COUNT',
+            'BIT_LENGTH',
+            'CEILING',
+            'CHAR',
+            'CHAR_LENGTH',
+            'COMPRESS',
+            'CONNECTION_ID',
+            'COS',
+            'COT',
+            'CRC32',
+            'CURRENT_DATE',
+            'CURRENT_TIME',
+            'CURRENT_USER',
+            'DATABASE',
+            'DATE',
+            'DAYNAME',
+            'DAYOFMONTH',
+            'DAYOFWEEK',
+            'DAYOFYEAR',
+            'DEGREES',
+            'DES_DECRYPT',
+            'DES_ENCRYPT',
+            'ENCRYPT',
+            'EXP',
+            'FLOOR',
+            'FROM_DAYS',
+            'FROM_UNIXTIME',
+            'HEX',
+            'HOUR',
+            'INET6_ATON',
+            'INET6_NTOA',
+            'INET_ATON',
+            'INET_NTOA',
+            'LAST_DAY',
+            'LENGTH',
+            'LN',
+            'LOAD_FILE',
+            'LOG',
+            'LOG10',
+            'LOG2',
+            'LOWER',
+            'LTRIM',
+            'MD5',
+            'MICROSECOND',
+            'MINUTE',
+            'MONTH',
+            'MONTHNAME',
+            'NOW',
+            'OCT',
+            'OLD_PASSWORD',
+            'ORD',
+            'PASSWORD',
+            'PI',
+            'QUARTER',
+            'QUOTE',
+            'RADIANS',
+            'RAND',
+            'REVERSE',
+            'ROUND',
+            'RTRIM',
+            'SECOND',
+            'SEC_TO_TIME',
+            'SHA1',
+            'SIGN',
+            'SIN',
+            'SOUNDEX',
+            'SPACE',
+            'SQRT',
+            'ST_GeomCollFromText',
+            'ST_GeomCollFromWKB',
+            'ST_GeomFromText',
+            'ST_GeomFromWKB',
+            'ST_LineFromText',
+            'ST_LineFromWKB',
+            'ST_MLineFromText',
+            'ST_MLineFromWKB',
+            'ST_MPointFromText',
+            'ST_MPointFromWKB',
+            'ST_MPolyFromText',
+            'ST_MPolyFromWKB',
+            'ST_PointFromText',
+            'ST_PointFromWKB',
+            'ST_PolyFromText',
+            'ST_PolyFromWKB',
+            'SYSDATE',
+            'TAN',
+            'TIME',
+            'TIMESTAMP',
+            'TIME_TO_SEC',
+            'TO_DAYS',
+            'TO_SECONDS',
+            'TRIM',
+            'UNCOMPRESS',
+            'UNCOMPRESSED_LENGTH',
+            'UNHEX',
+            'UNIX_TIMESTAMP',
+            'UPPER',
+            'USER',
+            'UTC_DATE',
+            'UTC_TIME',
+            'UTC_TIMESTAMP',
+            'UUID',
+            'UUID_SHORT',
+            'VERSION',
+            'WEEK',
+            'WEEKDAY',
+            'WEEKOFYEAR',
+            'YEAR',
+            'YEARWEEK',
+        ], $this->object->getAllFunctions());
     }
 
     /**
@@ -711,16 +672,13 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetAttributes(): void
     {
-        $this->assertEquals(
-            [
-                '',
-                'BINARY',
-                'UNSIGNED',
-                'UNSIGNED ZEROFILL',
-                'on update CURRENT_TIMESTAMP',
-            ],
-            $this->object->getAttributes()
-        );
+        self::assertSame([
+            '',
+            'BINARY',
+            'UNSIGNED',
+            'UNSIGNED ZEROFILL',
+            'on update CURRENT_TIMESTAMP',
+        ], $this->object->getAttributes());
     }
 
     /**
@@ -728,69 +686,66 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetColumns(): void
     {
-        $this->assertEquals(
-            [
-                0 => 'INT',
-                1 => 'VARCHAR',
-                2 => 'TEXT',
-                3 => 'DATE',
-                'Numeric' => [
-                    'TINYINT',
-                    'SMALLINT',
-                    'MEDIUMINT',
-                    'INT',
-                    'BIGINT',
-                    '-',
-                    'DECIMAL',
-                    'FLOAT',
-                    'DOUBLE',
-                    'REAL',
-                    '-',
-                    'BIT',
-                    'BOOLEAN',
-                    'SERIAL',
-                ],
-                'Date and time' => [
-                    'DATE',
-                    'DATETIME',
-                    'TIMESTAMP',
-                    'TIME',
-                    'YEAR',
-                ],
-                'String' => [
-                    'CHAR',
-                    'VARCHAR',
-                    '-',
-                    'TINYTEXT',
-                    'TEXT',
-                    'MEDIUMTEXT',
-                    'LONGTEXT',
-                    '-',
-                    'BINARY',
-                    'VARBINARY',
-                    '-',
-                    'TINYBLOB',
-                    'BLOB',
-                    'MEDIUMBLOB',
-                    'LONGBLOB',
-                    '-',
-                    'ENUM',
-                    'SET',
-                ],
-                'Spatial' => [
-                    'GEOMETRY',
-                    'POINT',
-                    'LINESTRING',
-                    'POLYGON',
-                    'MULTIPOINT',
-                    'MULTILINESTRING',
-                    'MULTIPOLYGON',
-                    'GEOMETRYCOLLECTION',
-                ],
-                'JSON' => ['JSON'],
+        self::assertSame([
+            0 => 'INT',
+            1 => 'VARCHAR',
+            2 => 'TEXT',
+            3 => 'DATE',
+            'Numeric' => [
+                'TINYINT',
+                'SMALLINT',
+                'MEDIUMINT',
+                'INT',
+                'BIGINT',
+                '-',
+                'DECIMAL',
+                'FLOAT',
+                'DOUBLE',
+                'REAL',
+                '-',
+                'BIT',
+                'BOOLEAN',
+                'SERIAL',
             ],
-            $this->object->getColumns()
-        );
+            'Date and time' => [
+                'DATE',
+                'DATETIME',
+                'TIMESTAMP',
+                'TIME',
+                'YEAR',
+            ],
+            'String' => [
+                'CHAR',
+                'VARCHAR',
+                '-',
+                'TINYTEXT',
+                'TEXT',
+                'MEDIUMTEXT',
+                'LONGTEXT',
+                '-',
+                'BINARY',
+                'VARBINARY',
+                '-',
+                'TINYBLOB',
+                'BLOB',
+                'MEDIUMBLOB',
+                'LONGBLOB',
+                '-',
+                'ENUM',
+                'SET',
+            ],
+            'Spatial' => [
+                'GEOMETRY',
+                'POINT',
+                'LINESTRING',
+                'POLYGON',
+                'MULTIPOINT',
+                'MULTILINESTRING',
+                'MULTIPOLYGON',
+                'GEOMETRYCOLLECTION',
+            ],
+            'JSON' => ['JSON'],
+        ], $this->object->getColumns());
     }
 
     /**
@@ -801,10 +756,7 @@ class TypesTest extends AbstractTestCase
      */
     public function testGetTypeClass(string $type, string $output): void
     {
-        $this->assertEquals(
-            $output,
-            $this->object->getTypeClass($type)
-        );
+        self::assertSame($output, $this->object->getTypeClass($type));
     }
 
     /**
diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php
index 573ee388ee..4baea9264e 100644
--- a/test/classes/UrlTest.php
+++ b/test/classes/UrlTest.php
@@ -47,7 +47,7 @@ class UrlTest extends AbstractTestCase
         $expected = '?db=db'
             . $separator . $expected;
 
-        $this->assertEquals($expected, Url::getCommon(['db' => 'db']));
+        self::assertSame($expected, Url::getCommon(['db' => 'db']));
     }
 
     /**
@@ -68,7 +68,7 @@ class UrlTest extends AbstractTestCase
             'db' => 'db',
             'table' => 'table',
         ];
-        $this->assertEquals($expected, Url::getCommon($params));
+        self::assertSame($expected, Url::getCommon($params));
     }
 
     /**
@@ -84,16 +84,13 @@ class UrlTest extends AbstractTestCase
 
         $expected = '#ABC#db=db' . $separator . 'table=table' . $separator
             . $expected;
-        $this->assertEquals(
-            $expected,
-            Url::getCommonRaw(
-                [
-                    'db' => 'db',
-                    'table' => 'table',
-                ],
-                '#ABC#'
-            )
-        );
+        self::assertSame($expected, Url::getCommonRaw(
+            [
+                'db' => 'db',
+                'table' => 'table',
+            ],
+            '#ABC#'
+        ));
     }
 
     /**
@@ -106,7 +103,7 @@ class UrlTest extends AbstractTestCase
 
         $separator = Url::getArgSeparator();
         $expected = '?server=x' . $separator . 'lang=en';
-        $this->assertEquals($expected, Url::getCommon());
+        self::assertSame($expected, Url::getCommon());
     }
 
     /**
@@ -121,7 +118,7 @@ class UrlTest extends AbstractTestCase
             'field' => '%1\$s',
             'change_column' => 1,
         ]);
-        $this->assertEquals(
+        self::assertSame(
             'index.php?route=/test&db=%253%5C%24s&table=%252%5C%24s&field=%251%5C%24s&change_column=1&lang=en',
             $generatedUrl
         );
@@ -141,15 +138,12 @@ class UrlTest extends AbstractTestCase
         ]);
         $expectedUrl = 'index.php?route=/test&db=%26test%3D_database%3D'
         . '&table=%26test%3D_database%3D&field=%26test%3D_database%3D&change_column=1&lang=en';
-        $this->assertEquals($expectedUrl, $generatedUrl);
+        self::assertSame($expectedUrl, $generatedUrl);
 
-        $this->assertEquals(
-            'index.php?route=/test&db=&test=_database=&table=&'
-            . 'test=_database=&field=&test=_database=&change_column=1&lang=en',
-            urldecode(
-                $expectedUrl
-            )
-        );
+        self::assertSame('index.php?route=/test&db=&test=_database=&table=&'
+        . 'test=_database=&field=&test=_database=&change_column=1&lang=en', urldecode(
+            $expectedUrl
+        ));
     }
 
     /**
@@ -166,22 +160,19 @@ class UrlTest extends AbstractTestCase
             'book' => false,
             'worm' => false,
         ]);
-        $this->assertEquals(
-            'index.php?route=/test&db=%3Cscript+src%3D%22https%3A%2F%2Fdomain.tld%2Fsvn'
-            . '%2Ftrunk%2Fhtml5.js%22%3E%3C%2Fscript%3E&table=%3Cscript+src%3D%22'
-            . 'https%3A%2F%2Fdomain.tld%2Fmaybeweshouldusegit%2Ftrunk%2Fhtml5.js%22%3E%3C%2F'
-            . 'script%3E&field=1&trees=1&book=0&worm=0&lang=en',
-            $generatedUrl
-        );
+        self::assertSame('index.php?route=/test&db=%3Cscript+src%3D%22https%3A%2F%2Fdomain.tld%2Fsvn'
+        . '%2Ftrunk%2Fhtml5.js%22%3E%3C%2Fscript%3E&table=%3Cscript+src%3D%22'
+        . 'https%3A%2F%2Fdomain.tld%2Fmaybeweshouldusegit%2Ftrunk%2Fhtml5.js%22%3E%3C%2F'
+        . 'script%3E&field=1&trees=1&book=0&worm=0&lang=en', $generatedUrl);
     }
 
     public function testGetHiddenFields(): void
     {
         $_SESSION = [];
-        $this->assertSame('', Url::getHiddenFields([]));
+        self::assertSame('', Url::getHiddenFields([]));
 
         $_SESSION = [' PMA_token ' => '<b>token</b>'];
-        $this->assertSame(
+        self::assertSame(
             '<input type="hidden" name="token" value="&lt;b&gt;token&lt;/b&gt;">',
             Url::getHiddenFields([])
         );
@@ -196,7 +187,7 @@ class UrlTest extends AbstractTestCase
 
         $config->set('URLQueryEncryption', false);
         $params = ['db' => 'test_db', 'table' => 'test_table', 'pos' => 0];
-        $this->assertEquals('db=test_db&table=test_table&pos=0', Url::buildHttpQuery($params));
+        self::assertSame('db=test_db&table=test_table&pos=0', Url::buildHttpQuery($params));
     }
 
     /**
@@ -212,18 +203,18 @@ class UrlTest extends AbstractTestCase
 
         $params = ['db' => 'test_db', 'table' => 'test_table', 'pos' => 0];
         $query = Url::buildHttpQuery($params);
-        $this->assertStringStartsWith('pos=0&eq=', $query);
+        self::assertStringStartsWith('pos=0&eq=', $query);
         parse_str($query, $queryParams);
-        $this->assertCount(2, $queryParams);
-        $this->assertSame('0', $queryParams['pos']);
-        $this->assertTrue(is_string($queryParams['eq']));
-        $this->assertNotSame('', $queryParams['eq']);
-        $this->assertMatchesRegularExpressionCompat('/^[a-zA-Z0-9-_=]+$/', $queryParams['eq']);
+        self::assertCount(2, $queryParams);
+        self::assertSame('0', $queryParams['pos']);
+        self::assertTrue(is_string($queryParams['eq']));
+        self::assertNotSame('', $queryParams['eq']);
+        self::assertMatchesRegularExpressionCompat('/^[a-zA-Z0-9-_=]+$/', $queryParams['eq']);
 
         $decrypted = Url::decryptQuery($queryParams['eq']);
-        $this->assertNotNull($decrypted);
-        $this->assertJson($decrypted);
-        $this->assertSame('{"db":"test_db","table":"test_table"}', $decrypted);
+        self::assertNotNull($decrypted);
+        self::assertJson($decrypted);
+        self::assertSame('{"db":"test_db","table":"test_table"}', $decrypted);
     }
 
     /**
@@ -239,12 +230,12 @@ class UrlTest extends AbstractTestCase
 
         $query = '{"db":"test_db","table":"test_table"}';
         $encrypted = Url::encryptQuery($query);
-        $this->assertNotSame($query, $encrypted);
-        $this->assertNotSame('', $encrypted);
-        $this->assertMatchesRegularExpressionCompat('/^[a-zA-Z0-9-_=]+$/', $encrypted);
+        self::assertNotSame($query, $encrypted);
+        self::assertNotSame('', $encrypted);
+        self::assertMatchesRegularExpressionCompat('/^[a-zA-Z0-9-_=]+$/', $encrypted);
 
         $decrypted = Url::decryptQuery($encrypted);
-        $this->assertSame($query, $decrypted);
+        self::assertSame($query, $decrypted);
     }
 
     /**
diff --git a/test/classes/UserPasswordTest.php b/test/classes/UserPasswordTest.php
index 0bf2a7bead..5543ac8c12 100644
--- a/test/classes/UserPasswordTest.php
+++ b/test/classes/UserPasswordTest.php
@@ -50,7 +50,7 @@ class UserPasswordTest extends AbstractTestCase
         $_POST['nopass'] = $noPassword;
         $_POST['pma_pw'] = $password;
         $_POST['pma_pw2'] = $passwordConfirmation;
-        $this->assertEquals(['error' => $error, 'msg' => $message], $this->object->setChangePasswordMsg());
+        self::assertEquals(['error' => $error, 'msg' => $message], $this->object->setChangePasswordMsg());
     }
 
     /**
diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php
index b60810d631..949faf4c36 100644
--- a/test/classes/UserPreferencesTest.php
+++ b/test/classes/UserPreferencesTest.php
@@ -49,14 +49,11 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $this->userPreferences->pageInit(new ConfigFile());
 
-        $this->assertEquals(
-            [
-                'Servers' => [
-                    1 => ['hide_db' => 'testval123'],
-                ],
+        self::assertSame([
+            'Servers' => [
+                1 => ['hide_db' => 'testval123'],
             ],
-            $_SESSION['ConfigFile' . $GLOBALS['server']]
-        );
+        ], $_SESSION['ConfigFile' . $GLOBALS['server']]);
     }
 
     /**
@@ -71,21 +68,13 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $result = $this->userPreferences->load();
 
-        $this->assertCount(3, $result);
+        self::assertCount(3, $result);
 
-        $this->assertEquals(
-            [],
-            $result['config_data']
-        );
+        self::assertSame([], $result['config_data']);
 
-        $this->assertEqualsWithDelta(
-            time(),
-            $result['mtime'],
-            2,
-            ''
-        );
+        self::assertEqualsWithDelta(time(), $result['mtime'], 2, '');
 
-        $this->assertEquals('session', $result['type']);
+        self::assertSame('session', $result['type']);
 
         // case 2
         $_SESSION['relation'] = [];
@@ -122,17 +111,14 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $result = $this->userPreferences->load();
 
-        $this->assertEquals(
-            [
-                'config_data' => [
-                    1,
-                    2,
-                ],
-                'mtime' => 123,
-                'type' => 'db',
+        self::assertSame([
+            'config_data' => [
+                1,
+                2,
             ],
-            $result
-        );
+            'mtime' => 123,
+            'type' => 'db',
+        ], $result);
     }
 
     /**
@@ -149,22 +135,14 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $result = $this->userPreferences->save([1]);
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
-        $this->assertCount(2, $_SESSION['userconfig']);
+        self::assertCount(2, $_SESSION['userconfig']);
 
-        $this->assertEquals(
-            [1],
-            $_SESSION['userconfig']['db']
-        );
+        self::assertSame([1], $_SESSION['userconfig']['db']);
 
         /* TODO: This breaks sometimes as there might be time difference! */
-        $this->assertEqualsWithDelta(
-            time(),
-            $_SESSION['userconfig']['ts'],
-            2,
-            ''
-        );
+        self::assertEqualsWithDelta(time(), $_SESSION['userconfig']['ts'], 2, '');
 
         $assert = true;
 
@@ -172,7 +150,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
             $assert = false;
         }
 
-        $this->assertTrue($assert);
+        self::assertTrue($assert);
 
         // case 2
         $_SESSION['relation'] = [];
@@ -210,7 +188,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $result = $this->userPreferences->save([1]);
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         // case 3
 
@@ -245,12 +223,9 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $result = $this->userPreferences->save([1]);
 
-        $this->assertInstanceOf(Message::class, $result);
-        $this->assertEquals(
-            'Could not save configuration<br><br>err1'
-            . '<br><br>The phpMyAdmin configuration storage database could not be accessed.',
-            $result->getMessage()
-        );
+        self::assertInstanceOf(Message::class, $result);
+        self::assertSame('Could not save configuration<br><br>err1'
+        . '<br><br>The phpMyAdmin configuration storage database could not be accessed.', $result->getMessage());
     }
 
     /**
@@ -273,12 +248,9 @@ class UserPreferencesTest extends AbstractNetworkTestCase
             ]
         );
 
-        $this->assertEquals(
-            [
-                'Server' => ['hide_db' => 1],
-            ],
-            $result
-        );
+        self::assertEquals([
+            'Server' => ['hide_db' => 1],
+        ], $result);
     }
 
     /**
@@ -291,12 +263,9 @@ class UserPreferencesTest extends AbstractNetworkTestCase
             ['DBG/sql' => true]
         );
 
-        $this->assertEquals(
-            [
-                'DBG' => ['sql' => true],
-            ],
-            $result
-        );
+        self::assertSame([
+            'DBG' => ['sql' => true],
+        ], $result);
     }
 
     /**
@@ -317,17 +286,11 @@ class UserPreferencesTest extends AbstractNetworkTestCase
         $GLOBALS['server'] = 2;
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([])->toArray();
 
-        $this->assertTrue(
-            $this->userPreferences->persistOption('Server/hide_db', 'val', 'val')
-        );
+        self::assertTrue($this->userPreferences->persistOption('Server/hide_db', 'val', 'val'));
 
-        $this->assertTrue(
-            $this->userPreferences->persistOption('Server/hide_db', 'val2', 'val')
-        );
+        self::assertTrue($this->userPreferences->persistOption('Server/hide_db', 'val2', 'val'));
 
-        $this->assertTrue(
-            $this->userPreferences->persistOption('Server/hide_db2', 'val', 'val')
-        );
+        self::assertTrue($this->userPreferences->persistOption('Server/hide_db2', 'val', 'val'));
     }
 
     /**
@@ -359,29 +322,26 @@ class UserPreferencesTest extends AbstractNetworkTestCase
         $_SESSION['userprefs_autoload'] = false;
         $_REQUEST['prefs_autoload'] = 'hide';
 
-        $this->assertEquals(
-            '',
-            $this->userPreferences->autoloadGetHeader()
-        );
+        self::assertSame('', $this->userPreferences->autoloadGetHeader());
 
-        $this->assertTrue($_SESSION['userprefs_autoload']);
+        self::assertTrue($_SESSION['userprefs_autoload']);
 
         $_REQUEST['prefs_autoload'] = 'nohide';
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $result = $this->userPreferences->autoloadGetHeader();
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<form action="' . Url::getFromRoute('/preferences/manage') . '" method="post" class="disableAjax">',
             $result
         );
 
-        $this->assertStringContainsString('<input type="hidden" name="token" value="token"', $result);
+        self::assertStringContainsString('<input type="hidden" name="token" value="token"', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="json" value="">', $result);
+        self::assertStringContainsString('<input type="hidden" name="json" value="">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="submit_import" value="1">', $result);
+        self::assertStringContainsString('<input type="hidden" name="submit_import" value="1">', $result);
 
-        $this->assertStringContainsString('<input type="hidden" name="return_url" value="index.php?">', $result);
+        self::assertStringContainsString('<input type="hidden" name="return_url" value="index.php?">', $result);
     }
 }
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index b15530a554..32edea7ae5 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -69,15 +69,12 @@ class UtilTest extends AbstractTestCase
      */
     public function testListPHPExtensions(): void
     {
-        $this->assertSame(
-            [
-                'mysqli',
-                'curl',
-                'mbstring',
-                'sodium',
-            ],
-            Util::listPHPExtensions()
-        );
+        self::assertSame([
+            'mysqli',
+            'curl',
+            'mbstring',
+            'sodium',
+        ], Util::listPHPExtensions());
     }
 
     public function testGetUniqueCondition(): void
@@ -86,10 +83,10 @@ class UtilTest extends AbstractTestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
         $actual = Util::getUniqueCondition(0, [], []);
-        $this->assertEquals(['', false, []], $actual);
+        self::assertSame(['', false, []], $actual);
 
         $actual = Util::getUniqueCondition(0, [], [], true);
-        $this->assertEquals(['', true, []], $actual);
+        self::assertSame(['', true, []], $actual);
     }
 
     public function testGetUniqueConditionWithMultipleFields(): void
@@ -183,30 +180,27 @@ class UtilTest extends AbstractTestCase
             'value',
             0x1,
         ], false, 'table');
-        $this->assertEquals(
+        self::assertSame([
+            '`table`.`field1` IS NULL AND `table`.`field2` = \'value\\\'s\' AND `table`.`field3` = 123456'
+            . ' AND `table`.`field4` = 123.456 AND `table`.`field5` = CAST(0x76616c7565 AS BINARY)'
+            . ' AND `table`.`field7` = \'value\' AND `table`.`field8` = \'value\''
+            . ' AND `table`.`field9` = CAST(0x76616c7565 AS BINARY)'
+            . ' AND `table`.`field10` = CAST(0x76616c7565 AS BINARY)'
+            . ' AND `table`.`field12` = b\'0001\'',
+            false,
             [
-                '`table`.`field1` IS NULL AND `table`.`field2` = \'value\\\'s\' AND `table`.`field3` = 123456'
-                . ' AND `table`.`field4` = 123.456 AND `table`.`field5` = CAST(0x76616c7565 AS BINARY)'
-                . ' AND `table`.`field7` = \'value\' AND `table`.`field8` = \'value\''
-                . ' AND `table`.`field9` = CAST(0x76616c7565 AS BINARY)'
-                . ' AND `table`.`field10` = CAST(0x76616c7565 AS BINARY)'
-                . ' AND `table`.`field12` = b\'0001\'',
-                false,
-                [
-                    '`table`.`field1`' => 'IS NULL',
-                    '`table`.`field2`' => '= \'value\\\'s\'',
-                    '`table`.`field3`' => '= 123456',
-                    '`table`.`field4`' => '= 123.456',
-                    '`table`.`field5`' => '= CAST(0x76616c7565 AS BINARY)',
-                    '`table`.`field7`' => '= \'value\'',
-                    '`table`.`field8`' => '= \'value\'',
-                    '`table`.`field9`' => '= CAST(0x76616c7565 AS BINARY)',
-                    '`table`.`field10`' => '',
-                    '`table`.`field12`' => '= b\'0001\'',
-                ],
+                '`table`.`field1`' => 'IS NULL',
+                '`table`.`field2`' => '= \'value\\\'s\'',
+                '`table`.`field3`' => '= 123456',
+                '`table`.`field4`' => '= 123.456',
+                '`table`.`field5`' => '= CAST(0x76616c7565 AS BINARY)',
+                '`table`.`field7`' => '= \'value\'',
+                '`table`.`field8`' => '= \'value\'',
+                '`table`.`field9`' => '= CAST(0x76616c7565 AS BINARY)',
+                '`table`.`field10`' => '',
+                '`table`.`field12`' => '= b\'0001\'',
             ],
-            $actual
-        );
+        ], $actual);
     }
 
     public function testGetUniqueConditionWithSingleBigBinaryField(): void
@@ -221,10 +215,7 @@ class UtilTest extends AbstractTestCase
         ];
 
         $actual = Util::getUniqueCondition(1, $meta, [str_repeat('*', 1001)]);
-        $this->assertEquals(
-            ['CHAR_LENGTH(`table`.`field`)  = 1001', false, ['`table`.`field`' => ' = 1001']],
-            $actual
-        );
+        self::assertSame(['CHAR_LENGTH(`table`.`field`)  = 1001', false, ['`table`.`field`' => ' = 1001']], $actual);
     }
 
     public function testGetUniqueConditionWithPrimaryKey(): void
@@ -243,7 +234,7 @@ class UtilTest extends AbstractTestCase
         ];
 
         $actual = Util::getUniqueCondition(count($meta), $meta, [1, 'value']);
-        $this->assertEquals(['`table`.`id` = 1', true, ['`table`.`id`' => '= 1']], $actual);
+        self::assertSame(['`table`.`id` = 1', true, ['`table`.`id`' => '= 1']], $actual);
     }
 
     public function testGetUniqueConditionWithUniqueKey(): void
@@ -262,7 +253,7 @@ class UtilTest extends AbstractTestCase
         ];
 
         $actual = Util::getUniqueCondition(count($meta), $meta, ['unique', 'value']);
-        $this->assertEquals(['`table`.`id` = \'unique\'', true, ['`table`.`id`' => '= \'unique\'']], $actual);
+        self::assertSame(['`table`.`id` = \'unique\'', true, ['`table`.`id`' => '= \'unique\'']], $actual);
     }
 
     /**
@@ -282,7 +273,7 @@ class UtilTest extends AbstractTestCase
         $fieldsCount = count($meta);
         $actual = Util::getUniqueCondition($fieldsCount, $meta, $row);
 
-        $this->assertEquals($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -399,13 +390,13 @@ class UtilTest extends AbstractTestCase
      */
     public function testPageSelector(): void
     {
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<select class="pageselector ajax" name="pma" >',
             Util::pageselector('pma', 3)
         );
 
         // If pageNow > nbTotalPage, show the pageNow number to avoid confusion
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             '<option selected="selected" style="font-weight: bold" value="297">100</option>',
             Util::pageselector('pma', 3, 100, 50)
         );
@@ -421,10 +412,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testGenerateCharsetQueryPart(string $collation, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            Util::getCharsetQueryPart($collation)
-        );
+        self::assertSame($expected, Util::getCharsetQueryPart($collation));
     }
 
     /**
@@ -455,28 +443,22 @@ class UtilTest extends AbstractTestCase
      */
     public function testGenerateRandom(): void
     {
-        $this->assertEquals(32, strlen(Util::generateRandom(32)));
-        $this->assertEquals(16, strlen(Util::generateRandom(16)));
+        self::assertSame(32, strlen(Util::generateRandom(32)));
+        self::assertSame(16, strlen(Util::generateRandom(16)));
     }
 
     public function testClearUserCache(): void
     {
         $GLOBALS['server'] = 'server';
         SessionCache::set('is_superuser', 'yes');
-        $this->assertEquals('yes', $_SESSION['cache']['server_server']['is_superuser']);
+        self::assertSame('yes', $_SESSION['cache']['server_server']['is_superuser']);
 
         SessionCache::set('mysql_cur_user', 'mysql');
-        $this->assertEquals(
-            'mysql',
-            $_SESSION['cache']['server_server']['mysql_cur_user']
-        );
+        self::assertSame('mysql', $_SESSION['cache']['server_server']['mysql_cur_user']);
 
         Util::clearUserCache();
-        $this->assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_server']);
-        $this->assertArrayNotHasKey(
-            'mysql_cur_user',
-            $_SESSION['cache']['server_server']
-        );
+        self::assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_server']);
+        self::assertArrayNotHasKey('mysql_cur_user', $_SESSION['cache']['server_server']);
     }
 
     public function testCheckParameterMissing(): void
@@ -535,10 +517,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testConvertBitDefaultValue(?string $bit, string $val): void
     {
-        $this->assertEquals(
-            $val,
-            Util::convertBitDefaultValue($bit)
-        );
+        self::assertSame($val, Util::convertBitDefaultValue($bit));
     }
 
     /**
@@ -637,10 +616,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testEscapeMysqlWildcards(string $a, string $b): void
     {
-        $this->assertEquals(
-            $a,
-            Util::escapeMysqlWildcards($b)
-        );
+        self::assertSame($a, Util::escapeMysqlWildcards($b));
     }
 
     /**
@@ -653,10 +629,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testUnescapeMysqlWildcards(string $a, string $b): void
     {
-        $this->assertEquals(
-            $b,
-            Util::unescapeMysqlWildcards($a)
-        );
+        self::assertSame($b, Util::unescapeMysqlWildcards($a));
     }
 
     /**
@@ -679,18 +652,12 @@ class UtilTest extends AbstractTestCase
         $GLOBALS['db'] = 'database';
         $GLOBALS['table'] = 'table';
 
-        $this->assertEquals(
-            $out,
-            Util::expandUserString($in)
-        );
+        self::assertSame($out, Util::expandUserString($in));
 
-        $this->assertEquals(
-            htmlspecialchars($out),
-            Util::expandUserString(
-                $in,
-                'htmlspecialchars'
-            )
-        );
+        self::assertSame(htmlspecialchars($out), Util::expandUserString(
+            $in,
+            'htmlspecialchars'
+        ));
     }
 
     /**
@@ -740,10 +707,7 @@ class UtilTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['LimitChars'] = 1000;
 
-        $this->assertEquals(
-            $out,
-            Util::extractColumnSpec($in)
-        );
+        self::assertEquals($out, Util::extractColumnSpec($in));
     }
 
     /**
@@ -899,10 +863,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testParseEnumSetValues(string $in, bool $escapeHTML, array $out): void
     {
-        $this->assertEquals(
-            $out,
-            Util::parseEnumSetValues($in, $escapeHTML)
-        );
+        self::assertSame($out, Util::parseEnumSetValues($in, $escapeHTML));
     }
 
     /**
@@ -1020,10 +981,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testExtractValueFromFormattedSize($size, $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            Util::extractValueFromFormattedSize($size)
-        );
+        self::assertSame($expected, Util::extractValueFromFormattedSize($size));
     }
 
     /**
@@ -1066,9 +1024,9 @@ class UtilTest extends AbstractTestCase
     public function testFormatByteDown($a, int $b, int $c, array $e): void
     {
         $result = Util::formatByteDown($a, $b, $c);
-        $this->assertIsArray($result);
+        self::assertIsArray($result);
         $result[0] = trim($result[0]);
-        $this->assertSame($e, $result);
+        self::assertSame($e, $result);
     }
 
     /**
@@ -1254,15 +1212,12 @@ class UtilTest extends AbstractTestCase
      */
     private function assertFormatNumber($a, int $b, int $c, string $d): void
     {
-        $this->assertEquals(
-            $d,
-            (string) Util::formatNumber(
-                $a,
-                $b,
-                $c,
-                false
-            )
-        );
+        self::assertSame($d, (string) Util::formatNumber(
+            $a,
+            $b,
+            $c,
+            false
+        ));
     }
 
     /**
@@ -1448,10 +1403,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testGetFormattedMaximumUploadSize($size, string $unit, string $res): void
     {
-        $this->assertEquals(
-            '(' . __('Max: ') . $res . $unit . ')',
-            Util::getFormattedMaximumUploadSize($size)
-        );
+        self::assertSame('(' . __('Max: ') . $res . $unit . ')', Util::getFormattedMaximumUploadSize($size));
     }
 
     /**
@@ -1527,10 +1479,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testGetTitleForTarget(string $target, string $result): void
     {
-        $this->assertEquals(
-            $result,
-            Util::getTitleForTarget($target)
-        );
+        self::assertSame($result, Util::getTitleForTarget($target));
     }
 
     /**
@@ -1587,10 +1536,7 @@ class UtilTest extends AbstractTestCase
         $tmpTimezone = date_default_timezone_get();
         date_default_timezone_set($tz);
 
-        $this->assertEquals(
-            $e,
-            Util::localisedDate($a, $b)
-        );
+        self::assertSame($e, Util::localisedDate($a, $b));
 
         date_default_timezone_set($tmpTimezone);
         _setlocale(LC_ALL, 'en');
@@ -1721,10 +1667,7 @@ class UtilTest extends AbstractTestCase
         $tmpTimezone = date_default_timezone_get();
         date_default_timezone_set('Europe/London');
 
-        $this->assertEquals(
-            $e,
-            Util::timespanFormat($a)
-        );
+        self::assertSame($e, Util::timespanFormat($a));
 
         date_default_timezone_set($tmpTimezone);
     }
@@ -1759,10 +1702,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testPrintableBitValue(int $a, int $b, string $e): void
     {
-        $this->assertEquals(
-            $e,
-            Util::printableBitValue($a, $b)
-        );
+        self::assertSame($e, Util::printableBitValue($a, $b));
     }
 
     /**
@@ -1796,10 +1736,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testUnQuote(string $param, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            Util::unQuote($param)
-        );
+        self::assertSame($expected, Util::unQuote($param));
     }
 
     /**
@@ -1839,10 +1776,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testUnQuoteSelectedChar(string $param, string $expected): void
     {
-        $this->assertEquals(
-            $expected,
-            Util::unQuote($param, '"')
-        );
+        self::assertSame($expected, Util::unQuote($param, '"'));
     }
 
     /**
@@ -1877,11 +1811,11 @@ class UtilTest extends AbstractTestCase
      */
     public function testBackquote(?string $entry, string $expectedNoneOutput, string $expectedMssqlOutput): void
     {
-        $this->assertSame($expectedNoneOutput, Util::backquote($entry));
-        $this->assertEquals($entry, Util::backquoteCompat($entry, 'NONE', false));
-        $this->assertEquals($entry, Util::backquoteCompat($entry, 'MSSQL', false));
-        $this->assertSame($expectedNoneOutput, Util::backquoteCompat($entry, 'NONE'));
-        $this->assertSame($expectedMssqlOutput, Util::backquoteCompat($entry, 'MSSQL'));
+        self::assertSame($expectedNoneOutput, Util::backquote($entry));
+        self::assertEquals($entry, Util::backquoteCompat($entry, 'NONE', false));
+        self::assertEquals($entry, Util::backquoteCompat($entry, 'MSSQL', false));
+        self::assertSame($expectedNoneOutput, Util::backquoteCompat($entry, 'NONE'));
+        self::assertSame($expectedMssqlOutput, Util::backquoteCompat($entry, 'MSSQL'));
     }
 
     /**
@@ -1935,15 +1869,9 @@ class UtilTest extends AbstractTestCase
     {
         foreach (Context::$KEYWORDS as $keyword => $type) {
             if ($type & Token::FLAG_KEYWORD_RESERVED) {
-                $this->assertEquals(
-                    '`' . $keyword . '`',
-                    Util::backquoteCompat($keyword, 'NONE', false)
-                );
+                self::assertSame('`' . $keyword . '`', Util::backquoteCompat($keyword, 'NONE', false));
             } else {
-                $this->assertEquals(
-                    $keyword,
-                    Util::backquoteCompat($keyword, 'NONE', false)
-                );
+                self::assertSame($keyword, Util::backquoteCompat($keyword, 'NONE', false));
             }
         }
     }
@@ -1960,7 +1888,7 @@ class UtilTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['Server']['user'] = 'root';
 
-        $this->assertEquals($e, Util::userDir($a));
+        self::assertSame($e, Util::userDir($a));
     }
 
     /**
@@ -1992,10 +1920,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testDuplicateFirstNewline(string $a, string $e): void
     {
-        $this->assertEquals(
-            $e,
-            Util::duplicateFirstNewline($a)
-        );
+        self::assertSame($e, Util::duplicateFirstNewline($a));
     }
 
     /**
@@ -2028,18 +1953,15 @@ class UtilTest extends AbstractTestCase
     public function testUnsupportedDatatypes(): void
     {
         $no_support_types = [];
-        $this->assertEquals(
-            $no_support_types,
-            Util::unsupportedDatatypes()
-        );
+        self::assertSame($no_support_types, Util::unsupportedDatatypes());
     }
 
     public function testGetPageFromPosition(): void
     {
-        $this->assertEquals(Util::getPageFromPosition(0, 1), 1);
-        $this->assertEquals(Util::getPageFromPosition(1, 1), 2);
-        $this->assertEquals(Util::getPageFromPosition(1, 2), 1);
-        $this->assertEquals(Util::getPageFromPosition(1, 6), 1);
+        self::assertSame(Util::getPageFromPosition(0, 1), 1);
+        self::assertSame(Util::getPageFromPosition(1, 1), 2);
+        self::assertSame(Util::getPageFromPosition(1, 2), 1);
+        self::assertSame(Util::getPageFromPosition(1, 6), 1);
     }
 
     /**
@@ -2053,7 +1975,7 @@ class UtilTest extends AbstractTestCase
     public function testIsInteger(bool $expected, $input): void
     {
         $isInteger = Util::isInteger($input);
-        $this->assertEquals($expected, $isInteger);
+        self::assertSame($expected, $isInteger);
     }
 
     /**
@@ -2098,7 +2020,7 @@ class UtilTest extends AbstractTestCase
     public function testGetProtoFromForwardedHeader(string $header, string $proto): void
     {
         $protocolDetected = Util::getProtoFromForwardedHeader($header);
-        $this->assertEquals($proto, $protocolDetected);
+        self::assertSame($proto, $protocolDetected);
     }
 
     /**
@@ -2214,7 +2136,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Util::currentUserHasPrivilege('EVENT'));
+        self::assertTrue(Util::currentUserHasPrivilege('EVENT'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2236,7 +2158,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Util::currentUserHasPrivilege('EVENT'));
+        self::assertTrue(Util::currentUserHasPrivilege('EVENT'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2258,7 +2180,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertFalse(Util::currentUserHasPrivilege('EVENT'));
+        self::assertFalse(Util::currentUserHasPrivilege('EVENT'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2292,7 +2214,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Util::currentUserHasPrivilege('EVENT', 'my_data_base'));
+        self::assertTrue(Util::currentUserHasPrivilege('EVENT', 'my_data_base'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2326,7 +2248,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertFalse(Util::currentUserHasPrivilege('EVENT', 'my_data_base'));
+        self::assertFalse(Util::currentUserHasPrivilege('EVENT', 'my_data_base'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2365,7 +2287,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(Util::currentUserHasPrivilege('EVENT', 'my_data_base', 'my_data_table'));
+        self::assertTrue(Util::currentUserHasPrivilege('EVENT', 'my_data_base', 'my_data_table'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2404,7 +2326,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertFalse(Util::currentUserHasPrivilege('EVENT', 'my_data_base', 'my_data_table'));
+        self::assertFalse(Util::currentUserHasPrivilege('EVENT', 'my_data_base', 'my_data_table'));
         $GLOBALS['dbi'] = $oldDbi;
     }
 
@@ -2575,10 +2497,7 @@ class UtilTest extends AbstractTestCase
      */
     public function testGetScriptNameForOption(string $target, string $location, string $finalLink): void
     {
-        $this->assertSame(
-            $finalLink,
-            Util::getScriptNameForOption($target, $location)
-        );
+        self::assertSame($finalLink, Util::getScriptNameForOption($target, $location));
     }
 
     /**
@@ -2606,7 +2525,7 @@ class UtilTest extends AbstractTestCase
 
         $oldDbi = $GLOBALS['dbi'];
         $GLOBALS['dbi'] = $dbi;
-        $this->assertEquals(Util::isUUIDSupported(), $expected);
+        self::assertSame(Util::isUUIDSupported(), $expected);
         $GLOBALS['dbi'] = $oldDbi;
     }
 
diff --git a/test/classes/Utils/ForeignKeyTest.php b/test/classes/Utils/ForeignKeyTest.php
index a78246d6fa..dd50fffa7a 100644
--- a/test/classes/Utils/ForeignKeyTest.php
+++ b/test/classes/Utils/ForeignKeyTest.php
@@ -25,10 +25,7 @@ class ForeignKeyTest extends AbstractTestCase
     {
         $GLOBALS['server'] = 1;
 
-        $this->assertEquals(
-            $e,
-            ForeignKey::isSupported($a)
-        );
+        self::assertSame($e, ForeignKey::isSupported($a));
     }
 
     /**
@@ -51,19 +48,13 @@ class ForeignKeyTest extends AbstractTestCase
         $GLOBALS['server'] = 1;
 
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'enable';
-        $this->assertTrue(
-            ForeignKey::isCheckEnabled()
-        );
+        self::assertTrue(ForeignKey::isCheckEnabled());
 
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'disable';
-        $this->assertFalse(
-            ForeignKey::isCheckEnabled()
-        );
+        self::assertFalse(ForeignKey::isCheckEnabled());
 
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default';
-        $this->assertTrue(
-            ForeignKey::isCheckEnabled()
-        );
+        self::assertTrue(ForeignKey::isCheckEnabled());
     }
 
     /**
@@ -99,7 +90,7 @@ class ForeignKeyTest extends AbstractTestCase
             ->with('FOREIGN_KEY_CHECKS', $setVariableParam)
             ->will($this->returnValue(true));
 
-        $this->assertTrue(ForeignKey::handleDisableCheckInit());
+        self::assertTrue(ForeignKey::handleDisableCheckInit());
     }
 
     /**
@@ -123,7 +114,7 @@ class ForeignKeyTest extends AbstractTestCase
             ->with('FOREIGN_KEY_CHECKS', $setVariableParam)
             ->will($this->returnValue(true));
 
-        $this->assertFalse(ForeignKey::handleDisableCheckInit());
+        self::assertFalse(ForeignKey::handleDisableCheckInit());
     }
 
     /**
diff --git a/test/classes/Utils/FormatConverterTest.php b/test/classes/Utils/FormatConverterTest.php
index 2f4712fab0..01fdb662b5 100644
--- a/test/classes/Utils/FormatConverterTest.php
+++ b/test/classes/Utils/FormatConverterTest.php
@@ -26,7 +26,7 @@ class FormatConverterTest extends AbstractTestCase
     public function testBinaryToIp(string $expected, string $input, bool $isBinary): void
     {
         $result = FormatConverter::binaryToIp($input, $isBinary);
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
     }
 
     /**
@@ -94,7 +94,7 @@ class FormatConverterTest extends AbstractTestCase
     public function testIpToBinary(string $expected, string $input): void
     {
         $result = FormatConverter::ipToBinary($input);
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
     }
 
     /**
@@ -127,7 +127,7 @@ class FormatConverterTest extends AbstractTestCase
     public function testIpToLong(string $expected, string $input): void
     {
         $result = FormatConverter::ipToLong($input);
-        $this->assertEquals($expected, $result);
+        self::assertEquals($expected, $result);
     }
 
     /**
@@ -160,7 +160,7 @@ class FormatConverterTest extends AbstractTestCase
     public function testLongToIp(string $expected, string $input): void
     {
         $result = FormatConverter::longToIp($input);
-        $this->assertEquals($expected, $result);
+        self::assertSame($expected, $result);
     }
 
     /**
diff --git a/test/classes/Utils/GisTest.php b/test/classes/Utils/GisTest.php
index 2321054ffa..af98fffa02 100644
--- a/test/classes/Utils/GisTest.php
+++ b/test/classes/Utils/GisTest.php
@@ -54,12 +54,12 @@ class GisTest extends AbstractTestCase
 
         if (! $SRIDOption) {
             // Also test default signature
-            $this->assertSame($expectedResult, Gis::convertToWellKnownText(
+            self::assertSame($expectedResult, Gis::convertToWellKnownText(
                 (string) hex2bin('000000000101000000000000000000F03F000000000000F03F')
             ));
         }
 
-        $this->assertSame($expectedResult, Gis::convertToWellKnownText(
+        self::assertSame($expectedResult, Gis::convertToWellKnownText(
             (string) hex2bin('000000000101000000000000000000F03F000000000000F03F'),
             $SRIDOption
         ));
@@ -133,21 +133,21 @@ class GisTest extends AbstractTestCase
 
     public function testCreateDataOldMysql(): void
     {
-        $this->assertEquals('abc', Gis::createData('abc', 50500));
-        $this->assertEquals('GeomFromText(\'POINT()\',10)', Gis::createData('\'POINT()\',10', 50500));
+        self::assertSame('abc', Gis::createData('abc', 50500));
+        self::assertSame('GeomFromText(\'POINT()\',10)', Gis::createData('\'POINT()\',10', 50500));
     }
 
     public function testCreateDataNewMysql(): void
     {
-        $this->assertEquals('abc', Gis::createData('abc', 50600));
-        $this->assertEquals('ST_GeomFromText(\'POINT()\',10)', Gis::createData('\'POINT()\',10', 50600));
+        self::assertSame('abc', Gis::createData('abc', 50600));
+        self::assertSame('ST_GeomFromText(\'POINT()\',10)', Gis::createData('\'POINT()\',10', 50600));
     }
 
     public function testGetFunctions(): void
     {
         $funcs = Gis::getFunctions();
-        $this->assertArrayHasKey('Dimension', $funcs);
-        $this->assertArrayHasKey('GeometryType', $funcs);
-        $this->assertArrayHasKey('MBRDisjoint', $funcs);
+        self::assertArrayHasKey('Dimension', $funcs);
+        self::assertArrayHasKey('GeometryType', $funcs);
+        self::assertArrayHasKey('MBRDisjoint', $funcs);
     }
 }
diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php
index d9194fda21..602870c2bd 100644
--- a/test/classes/Utils/HttpRequestTest.php
+++ b/test/classes/Utils/HttpRequestTest.php
@@ -187,14 +187,14 @@ class HttpRequestTest extends AbstractTestCase
     private function validateHttp($result, $expected): void
     {
         if ($expected === true) {
-            $this->assertTrue($result);
+            self::assertTrue($result);
         } elseif ($expected === false) {
-            $this->assertFalse($result);
+            self::assertFalse($result);
         } elseif ($expected === null) {
-            $this->assertNull($result);
+            self::assertNull($result);
         } else {
-            $this->assertNotNull($result, 'The request maybe has failed');
-            $this->assertStringContainsString($expected, $result);
+            self::assertNotNull($result, 'The request maybe has failed');
+            self::assertStringContainsString($expected, $result);
         }
     }
 
diff --git a/test/classes/Utils/SessionCacheTest.php b/test/classes/Utils/SessionCacheTest.php
index 488bf06874..2a9d7a897b 100644
--- a/test/classes/Utils/SessionCacheTest.php
+++ b/test/classes/Utils/SessionCacheTest.php
@@ -23,9 +23,9 @@ class SessionCacheTest extends TestCase
         SessionCache::set('test_data', 5);
         SessionCache::set('test_data_2', 5);
 
-        $this->assertNotNull(SessionCache::get('test_data'));
-        $this->assertNotNull(SessionCache::get('test_data_2'));
-        $this->assertNull(SessionCache::get('fake_data_2'));
+        self::assertNotNull(SessionCache::get('test_data'));
+        self::assertNotNull(SessionCache::get('test_data_2'));
+        self::assertNull(SessionCache::get('fake_data_2'));
     }
 
     public function testRemove(): void
@@ -40,9 +40,9 @@ class SessionCacheTest extends TestCase
         SessionCache::set('test_data_2', 25);
 
         SessionCache::remove('test_data');
-        $this->assertArrayNotHasKey('test_data', $_SESSION['cache']['server_server']);
+        self::assertArrayNotHasKey('test_data', $_SESSION['cache']['server_server']);
         SessionCache::remove('test_data_2');
-        $this->assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_server']);
+        self::assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_server']);
     }
 
     public function testSet(): void
@@ -55,9 +55,9 @@ class SessionCacheTest extends TestCase
 
         SessionCache::set('test_data', 25);
         SessionCache::set('test_data', 5);
-        $this->assertEquals(5, $_SESSION['cache']['server_server']['test_data']);
+        self::assertSame(5, $_SESSION['cache']['server_server']['test_data']);
         SessionCache::set('test_data_3', 3);
-        $this->assertEquals(3, $_SESSION['cache']['server_server']['test_data_3']);
+        self::assertSame(3, $_SESSION['cache']['server_server']['test_data_3']);
     }
 
     public function testHas(): void
@@ -73,11 +73,11 @@ class SessionCacheTest extends TestCase
         SessionCache::set('test_data_3', false);
         SessionCache::set('test_data_4', true);
 
-        $this->assertTrue(SessionCache::has('test_data'));
-        $this->assertTrue(SessionCache::has('test_data_2'));
-        $this->assertTrue(SessionCache::has('test_data_3'));
-        $this->assertTrue(SessionCache::has('test_data_4'));
-        $this->assertFalse(SessionCache::has('fake_data_2'));
+        self::assertTrue(SessionCache::has('test_data'));
+        self::assertTrue(SessionCache::has('test_data_2'));
+        self::assertTrue(SessionCache::has('test_data_3'));
+        self::assertTrue(SessionCache::has('test_data_4'));
+        self::assertFalse(SessionCache::has('fake_data_2'));
     }
 
     public function testKeyWithoutUser(): void
@@ -89,12 +89,12 @@ class SessionCacheTest extends TestCase
         $server = 123;
 
         SessionCache::set('test_data', 5);
-        $this->assertArrayHasKey('cache', $_SESSION);
-        $this->assertIsArray($_SESSION['cache']);
-        $this->assertArrayHasKey('server_123', $_SESSION['cache']);
-        $this->assertIsArray($_SESSION['cache']['server_123']);
-        $this->assertArrayHasKey('test_data', $_SESSION['cache']['server_123']);
-        $this->assertSame(5, $_SESSION['cache']['server_123']['test_data']);
+        self::assertArrayHasKey('cache', $_SESSION);
+        self::assertIsArray($_SESSION['cache']);
+        self::assertArrayHasKey('server_123', $_SESSION['cache']);
+        self::assertIsArray($_SESSION['cache']['server_123']);
+        self::assertArrayHasKey('test_data', $_SESSION['cache']['server_123']);
+        self::assertSame(5, $_SESSION['cache']['server_123']['test_data']);
     }
 
     public function testKeyWithUser(): void
@@ -106,11 +106,11 @@ class SessionCacheTest extends TestCase
         $server = 123;
 
         SessionCache::set('test_data', 5);
-        $this->assertArrayHasKey('cache', $_SESSION);
-        $this->assertIsArray($_SESSION['cache']);
-        $this->assertArrayHasKey('server_123_test_user', $_SESSION['cache']);
-        $this->assertIsArray($_SESSION['cache']['server_123_test_user']);
-        $this->assertArrayHasKey('test_data', $_SESSION['cache']['server_123_test_user']);
-        $this->assertSame(5, $_SESSION['cache']['server_123_test_user']['test_data']);
+        self::assertArrayHasKey('cache', $_SESSION);
+        self::assertIsArray($_SESSION['cache']);
+        self::assertArrayHasKey('server_123_test_user', $_SESSION['cache']);
+        self::assertIsArray($_SESSION['cache']['server_123_test_user']);
+        self::assertArrayHasKey('test_data', $_SESSION['cache']['server_123_test_user']);
+        self::assertSame(5, $_SESSION['cache']['server_123_test_user']['test_data']);
     }
 }
diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
index d5a100e187..1f4ce4af88 100644
--- a/test/classes/VersionInformationTest.php
+++ b/test/classes/VersionInformationTest.php
@@ -64,9 +64,9 @@ class VersionInformationTest extends AbstractTestCase
         unset($_SESSION['cache']['version_check']);
         $versionInformation = new VersionInformation();
         $version = $versionInformation->getLatestVersion();
-        $this->assertIsObject($version);
-        $this->assertNotEmpty($version->version);
-        $this->assertNotEmpty($version->date);
+        self::assertIsObject($version);
+        self::assertNotEmpty($version->version);
+        self::assertNotEmpty($version->date);
     }
 
     /**
@@ -80,10 +80,7 @@ class VersionInformationTest extends AbstractTestCase
     public function testVersionToInt(string $version, int $numeric): void
     {
         $versionInformation = new VersionInformation();
-        $this->assertEquals(
-            $numeric,
-            $versionInformation->versionToInt($version)
-        );
+        self::assertSame($numeric, $versionInformation->versionToInt($version));
     }
 
     /**
@@ -202,8 +199,8 @@ class VersionInformationTest extends AbstractTestCase
             ->willReturnOnConsecutiveCalls(true, true, true, true, true, true, true, true, true);
 
         $compatible = $mockVersionInfo->getLatestCompatibleVersion($this->releases);
-        $this->assertIsArray($compatible);
-        $this->assertEquals('4.4.14.1', $compatible['version']);
+        self::assertIsArray($compatible);
+        self::assertSame('4.4.14.1', $compatible['version']);
     }
 
     /**
@@ -231,8 +228,8 @@ class VersionInformationTest extends AbstractTestCase
             ->willReturnOnConsecutiveCalls(true, true);
 
         $compatible = $mockVersionInfo->getLatestCompatibleVersion($this->releases);
-        $this->assertIsArray($compatible);
-        $this->assertEquals('4.4.14.1', $compatible['version']);
+        self::assertIsArray($compatible);
+        self::assertSame('4.4.14.1', $compatible['version']);
     }
 
     /**
@@ -262,8 +259,8 @@ class VersionInformationTest extends AbstractTestCase
             ->willReturnOnConsecutiveCalls(false, false, true, true);
 
         $compatible = $mockVersionInfo->getLatestCompatibleVersion($this->releases);
-        $this->assertIsArray($compatible);
-        $this->assertEquals('4.0.10.10', $compatible['version']);
+        self::assertIsArray($compatible);
+        self::assertSame('4.0.10.10', $compatible['version']);
     }
 
     /**
@@ -304,7 +301,7 @@ class VersionInformationTest extends AbstractTestCase
             ->willReturnOnConsecutiveCalls(...$returnValues);
 
         $compatible = $mockVersionInfo->getLatestCompatibleVersion($versions);
-        $this->assertEquals($matchedLastVersion, $compatible['version'] ?? null);
+        self::assertSame($matchedLastVersion, $compatible['version'] ?? null);
     }
 
     /**
@@ -561,16 +558,16 @@ class VersionInformationTest extends AbstractTestCase
             ->method('getPHPVersion')
             ->will($this->returnValue('5.2.4'));
 
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.3'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<5.3'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '>=5.2'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '>5.2'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '!=5.3'));
+        self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.3'));
+        self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<5.3'));
+        self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '>=5.2'));
+        self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '>5.2'));
+        self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '!=5.3'));
 
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.2'));
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '<5.2'));
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '>=7.0'));
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '>7.0'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '!=5.2'));
+        self::assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.2'));
+        self::assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '<5.2'));
+        self::assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '>=7.0'));
+        self::assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '>7.0'));
+        self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '!=5.2'));
     }
 }
diff --git a/test/classes/VersionTest.php b/test/classes/VersionTest.php
index 85e904af41..a000acf457 100644
--- a/test/classes/VersionTest.php
+++ b/test/classes/VersionTest.php
@@ -18,22 +18,22 @@ class VersionTest extends AbstractTestCase
      */
     public function testValidateVersion(): void
     {
-        $this->assertIsString(Version::VERSION);
-        $this->assertNotEmpty(Version::VERSION);
-        $this->assertStringContainsString(Version::SERIES, Version::VERSION, 'x.y must be found in x.y.z');
-        $this->assertIsInt(Version::MAJOR);
-        $this->assertIsInt(Version::MINOR);
-        $this->assertIsInt(Version::PATCH);
-        $this->assertTrue(Version::MAJOR >= 5);// @phpstan-ignore-line Just checking
-        $this->assertTrue(Version::MINOR >= 0);// @phpstan-ignore-line Just checking
-        $this->assertTrue(Version::PATCH >= 0);// @phpstan-ignore-line Just checking
-        $this->assertTrue(Version::ID >= 50000);// @phpstan-ignore-line Just checking
+        self::assertIsString(Version::VERSION);
+        self::assertNotEmpty(Version::VERSION);
+        self::assertStringContainsString(Version::SERIES, Version::VERSION, 'x.y must be found in x.y.z');
+        self::assertIsInt(Version::MAJOR);
+        self::assertIsInt(Version::MINOR);
+        self::assertIsInt(Version::PATCH);
+        self::assertTrue(Version::MAJOR >= 5);// @phpstan-ignore-line Just checking
+        self::assertTrue(Version::MINOR >= 0);// @phpstan-ignore-line Just checking
+        self::assertTrue(Version::PATCH >= 0);// @phpstan-ignore-line Just checking
+        self::assertTrue(Version::ID >= 50000);// @phpstan-ignore-line Just checking
         if (defined('VERSION_SUFFIX')) {
-            $this->assertIsString(VERSION_SUFFIX);
+            self::assertIsString(VERSION_SUFFIX);
         }
 
-        $this->assertIsInt(Version::ID);
-        $this->assertIsString(Version::PRE_RELEASE_NAME);
-        $this->assertIsBool(Version::IS_DEV);
+        self::assertIsInt(Version::ID);
+        self::assertIsString(Version::PRE_RELEASE_NAME);
+        self::assertIsBool(Version::IS_DEV);
     }
 }
diff --git a/test/classes/WebAuthn/CBORDecoderTest.php b/test/classes/WebAuthn/CBORDecoderTest.php
index c426da2809..6f9c5ac5da 100644
--- a/test/classes/WebAuthn/CBORDecoderTest.php
+++ b/test/classes/WebAuthn/CBORDecoderTest.php
@@ -29,8 +29,8 @@ class CBORDecoderTest extends TestCase
     {
         $decoder = new CBORDecoder();
         $data = hex2bin($encoded);
-        $this->assertNotFalse($data);
-        $this->assertSame($expected, $decoder->decode(new DataStream($data)));
+        self::assertNotFalse($data);
+        self::assertSame($expected, $decoder->decode(new DataStream($data)));
     }
 
     /**
@@ -158,8 +158,8 @@ class CBORDecoderTest extends TestCase
         $nanValues = ['f97e00', 'fa7fc00000', 'fb7ff8000000000000'];
         foreach ($nanValues as $value) {
             $data = hex2bin($value);
-            $this->assertNotFalse($data);
-            $this->assertNan($decoder->decode(new DataStream($data)));
+            self::assertNotFalse($data);
+            self::assertNan($decoder->decode(new DataStream($data)));
         }
     }
 
@@ -170,7 +170,7 @@ class CBORDecoderTest extends TestCase
     {
         $decoder = new CBORDecoder();
         $data = hex2bin($encoded);
-        $this->assertNotFalse($data);
+        self::assertNotFalse($data);
         $this->expectException(WebAuthnException::class);
         $decoder->decode(new DataStream($data));
     }
diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php
index 939f8ad3f0..5b92e6c2b4 100644
--- a/test/classes/ZipExtensionTest.php
+++ b/test/classes/ZipExtensionTest.php
@@ -37,10 +37,7 @@ class ZipExtensionTest extends AbstractTestCase
      */
     public function testGetContents(string $file, ?string $specific_entry, $output): void
     {
-        $this->assertEquals(
-            $this->zipExtension->getContents($file, $specific_entry),
-            $output
-        );
+        self::assertSame($this->zipExtension->getContents($file, $specific_entry), $output);
     }
 
     /**
@@ -89,10 +86,7 @@ class ZipExtensionTest extends AbstractTestCase
      */
     public function testFindFile(string $file, string $file_regexp, $output): void
     {
-        $this->assertEquals(
-            $this->zipExtension->findFile($file, $file_regexp),
-            $output
-        );
+        self::assertSame($this->zipExtension->findFile($file, $file_regexp), $output);
     }
 
     /**
@@ -116,10 +110,7 @@ class ZipExtensionTest extends AbstractTestCase
      */
     public function testGetNumberOfFiles(): void
     {
-        $this->assertEquals(
-            $this->zipExtension->getNumberOfFiles('./test/test_data/test.zip'),
-            1
-        );
+        self::assertSame($this->zipExtension->getNumberOfFiles('./test/test_data/test.zip'), 1);
     }
 
     /**
@@ -127,19 +118,14 @@ class ZipExtensionTest extends AbstractTestCase
      */
     public function testExtract(): void
     {
-        $this->assertFalse(
-            $this->zipExtension->extract(
-                './test/test_data/test.zip',
-                'wrongName'
-            )
-        );
-        $this->assertEquals(
-            "TEST FILE\n",
-            $this->zipExtension->extract(
-                './test/test_data/test.zip',
-                'test.file'
-            )
-        );
+        self::assertFalse($this->zipExtension->extract(
+            './test/test_data/test.zip',
+            'wrongName'
+        ));
+        self::assertSame("TEST FILE\n", $this->zipExtension->extract(
+            './test/test_data/test.zip',
+            'test.file'
+        ));
     }
 
     /**
@@ -148,19 +134,17 @@ class ZipExtensionTest extends AbstractTestCase
     public function testCreateSingleFile(): void
     {
         $file = $this->zipExtension->createFile('Test content', 'test.txt');
-        $this->assertNotEmpty($file);
-        $this->assertIsString($file);
+        self::assertNotEmpty($file);
+        self::assertIsString($file);
 
         $tmp = tempnam('./', 'zip-test');
-        $this->assertNotFalse($tmp);
-        $this->assertNotFalse(file_put_contents($tmp, $file));
+        self::assertNotFalse($tmp);
+        self::assertNotFalse(file_put_contents($tmp, $file));
 
         $zip = new ZipArchive();
-        $this->assertTrue(
-            $zip->open($tmp)
-        );
+        self::assertTrue($zip->open($tmp));
 
-        $this->assertEquals(0, $zip->locateName('test.txt'));
+        self::assertSame(0, $zip->locateName('test.txt'));
 
         $zip->close();
         unlink($tmp);
@@ -171,15 +155,13 @@ class ZipExtensionTest extends AbstractTestCase
      */
     public function testCreateFailure(): void
     {
-        $this->assertFalse(
-            $this->zipExtension->createFile(
-                'Content',
-                [
-                    'name1.txt',
-                    'name2.txt',
-                ]
-            )
-        );
+        self::assertFalse($this->zipExtension->createFile(
+            'Content',
+            [
+                'name1.txt',
+                'name2.txt',
+            ]
+        ));
     }
 
     /**
@@ -197,20 +179,18 @@ class ZipExtensionTest extends AbstractTestCase
                 'name2.txt',
             ]
         );
-        $this->assertNotEmpty($file);
-        $this->assertIsString($file);
+        self::assertNotEmpty($file);
+        self::assertIsString($file);
 
         $tmp = tempnam('./', 'zip-test');
-        $this->assertNotFalse($tmp);
-        $this->assertNotFalse(file_put_contents($tmp, $file));
+        self::assertNotFalse($tmp);
+        self::assertNotFalse(file_put_contents($tmp, $file));
 
         $zip = new ZipArchive();
-        $this->assertTrue(
-            $zip->open($tmp)
-        );
+        self::assertTrue($zip->open($tmp));
 
-        $this->assertEquals(0, $zip->locateName('name1.txt'));
-        $this->assertEquals(1, $zip->locateName('name2.txt'));
+        self::assertSame(0, $zip->locateName('name1.txt'));
+        self::assertSame(1, $zip->locateName('name2.txt'));
 
         $zip->close();
         unlink($tmp);
diff --git a/test/selenium/ChangePasswordTest.php b/test/selenium/ChangePasswordTest.php
index dbb6125b81..a1e063ee35 100644
--- a/test/selenium/ChangePasswordTest.php
+++ b/test/selenium/ChangePasswordTest.php
@@ -45,29 +45,29 @@ class ChangePasswordTest extends TestBase
         $this->waitForElement('xpath', "//span[contains(., 'Change password')]");
         try {
             $ele = $this->waitForElement('name', 'pma_pw');
-            $this->assertEquals('', $ele->getAttribute('value'));
+            self::assertEquals('', $ele->getAttribute('value'));
         } catch (AssertionFailedError $e) {
             array_push($this->verificationErrors, $e->getMessage());
         }
 
         try {
             $ele = $this->waitForElement('name', 'pma_pw2');
-            $this->assertEquals('', $ele->getAttribute('value'));
+            self::assertEquals('', $ele->getAttribute('value'));
         } catch (AssertionFailedError $e) {
             array_push($this->verificationErrors, $e->getMessage());
         }
 
         try {
             $ele = $this->waitForElement('name', 'generated_pw');
-            $this->assertEquals('', $ele->getAttribute('value'));
+            self::assertEquals('', $ele->getAttribute('value'));
         } catch (AssertionFailedError $e) {
             array_push($this->verificationErrors, $e->getMessage());
         }
 
         $this->byId('button_generate_password')->click();
-        $this->assertNotEquals('', $this->byName('pma_pw')->getAttribute('value'));
-        $this->assertNotEquals('', $this->byName('pma_pw2')->getAttribute('value'));
-        $this->assertNotEquals('', $this->byName('generated_pw')->getAttribute('value'));
+        self::assertNotEquals('', $this->byName('pma_pw')->getAttribute('value'));
+        self::assertNotEquals('', $this->byName('pma_pw2')->getAttribute('value'));
+        self::assertNotEquals('', $this->byName('generated_pw')->getAttribute('value'));
 
         if ($this->getTestSuiteUserPassword() !== '') {
             $this->byName('pma_pw')->clear();
@@ -82,9 +82,6 @@ class ChangePasswordTest extends TestBase
 
         $this->byCssSelector('#change_password_dialog + div button')->click();
         $ele = $this->waitForElement('cssSelector', '.alert-success');
-        $this->assertEquals(
-            'The profile has been updated.',
-            trim($ele->getText())
-        );
+        self::assertEquals('The profile has been updated.', trim($ele->getText()));
     }
 }
diff --git a/test/selenium/CreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php
index febc47ad10..decfb476bf 100644
--- a/test/selenium/CreateDropDatabaseTest.php
+++ b/test/selenium/CreateDropDatabaseTest.php
@@ -43,8 +43,8 @@ class CreateDropDatabaseTest extends TestBase
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $this->databaseName . '\';',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals($this->databaseName, $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals($this->databaseName, $this->getCellByTableClass('table_results', 1, 1));
             }
         );
 
@@ -82,8 +82,8 @@ class CreateDropDatabaseTest extends TestBase
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $this->databaseName . '\';',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
     }
diff --git a/test/selenium/CreateRemoveUserTest.php b/test/selenium/CreateRemoveUserTest.php
index ec442666c8..3c25762175 100644
--- a/test/selenium/CreateRemoveUserTest.php
+++ b/test/selenium/CreateRemoveUserTest.php
@@ -70,9 +70,9 @@ class CreateRemoveUserTest extends TestBase
         $genButton = $this->waitForElement('id', 'button_generate_password');
         $genButton->click();
 
-        $this->assertNotEquals('', $this->byId('text_pma_pw')->getAttribute('value'));
-        $this->assertNotEquals('', $this->byId('text_pma_pw2')->getAttribute('value'));
-        $this->assertNotEquals('', $this->byId('generated_pw')->getAttribute('value'));
+        self::assertNotEquals('', $this->byId('text_pma_pw')->getAttribute('value'));
+        self::assertNotEquals('', $this->byId('text_pma_pw2')->getAttribute('value'));
+        self::assertNotEquals('', $this->byId('generated_pw')->getAttribute('value'));
 
         $this->byId('text_pma_pw')->sendKeys($this->txtPassword);
         $this->byId('text_pma_pw2')->sendKeys($this->txtPassword);
@@ -89,7 +89,7 @@ class CreateRemoveUserTest extends TestBase
         $this->waitForElement('id', 'adduser_submit')->click();
 
         $success = $this->waitForElement('cssSelector', '.alert-success');
-        $this->assertStringContainsString('You have added a new user', $success->getText());
+        self::assertStringContainsString('You have added a new user', $success->getText());
 
         // Removing the newly added user
         $this->waitForElement('partialLinkText', 'User accounts')->click();
@@ -106,9 +106,6 @@ class CreateRemoveUserTest extends TestBase
         $this->acceptAlert();
 
         $success = $this->waitForElement('cssSelector', '.alert-success');
-        $this->assertStringContainsString(
-            'The selected users have been deleted',
-            $success->getText()
-        );
+        self::assertStringContainsString('The selected users have been deleted', $success->getText());
     }
 }
diff --git a/test/selenium/Database/EventsTest.php b/test/selenium/Database/EventsTest.php
index 0335c74637..b97555448b 100644
--- a/test/selenium/Database/EventsTest.php
+++ b/test/selenium/Database/EventsTest.php
@@ -125,21 +125,19 @@ class EventsTest extends TestBase
         // Refresh the page
         $this->webDriver->navigate()->refresh();
 
-        $this->assertTrue(
-            $this->isElementPresent(
-                'xpath',
-                "//td[contains(., 'test_event')]"
-            )
-        );
+        self::assertTrue($this->isElementPresent(
+            'xpath',
+            "//td[contains(., 'test_event')]"
+        ));
 
         $this->dbQuery(
             'USE `' . $this->databaseName . '`;'
             . 'SHOW EVENTS WHERE Db=\'' . $this->databaseName . '\' AND Name=\'test_event\';',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals($this->databaseName, $this->getCellByTableClass('table_results', 1, 1));
-                $this->assertEquals('test_event', $this->getCellByTableClass('table_results', 1, 2));
-                $this->assertEquals('RECURRING', $this->getCellByTableClass('table_results', 1, 5));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals($this->databaseName, $this->getCellByTableClass('table_results', 1, 1));
+                self::assertEquals('test_event', $this->getCellByTableClass('table_results', 1, 2));
+                self::assertEquals('RECURRING', $this->getCellByTableClass('table_results', 1, 5));
             }
         );
 
@@ -149,7 +147,7 @@ class EventsTest extends TestBase
             function (): void {
                 $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
                 // [ ] | Edit | Copy | Delete | 1 | <number>
-                $this->assertGreaterThan(2, (int) $this->getCellByTableClass('table_results', 1, 6));
+                self::assertGreaterThan(2, (int) $this->getCellByTableClass('table_results', 1, 6));
             }
         );
     }
@@ -187,7 +185,7 @@ class EventsTest extends TestBase
             function (): void {
                 $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
                 // [ ] | Edit | Copy | Delete | 4
-                $this->assertGreaterThan(3, (int) $this->getCellByTableClass('table_results', 1, 6));
+                self::assertGreaterThan(3, (int) $this->getCellByTableClass('table_results', 1, 6));
             }
         );
     }
@@ -215,8 +213,8 @@ class EventsTest extends TestBase
             'USE `' . $this->databaseName . '`;'
             . 'SHOW EVENTS WHERE Db=\'' . $this->databaseName . '\' AND Name=\'test_event\';',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
     }
diff --git a/test/selenium/Database/OperationsTest.php b/test/selenium/Database/OperationsTest.php
index bf1f95e578..816cd17d94 100644
--- a/test/selenium/Database/OperationsTest.php
+++ b/test/selenium/Database/OperationsTest.php
@@ -43,12 +43,10 @@ class OperationsTest extends TestBase
         $this->byName('comment')->sendKeys('comment_foobar');
         $this->byCssSelector("form#formDatabaseComment input[type='submit']")->click();
 
-        $this->assertNotNull(
-            $this->waitForElement(
-                'xpath',
-                "//span[@class='breadcrumb-comment' and contains(., 'comment_foobar')]"
-            )
-        );
+        self::assertNotNull($this->waitForElement(
+            'xpath',
+            "//span[@class='breadcrumb-comment' and contains(., 'comment_foobar')]"
+        ));
     }
 
     /**
@@ -79,16 +77,16 @@ class OperationsTest extends TestBase
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $new_db_name . '\'',
             function () use ($new_db_name): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals($new_db_name, $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals($new_db_name, $this->getCellByTableClass('table_results', 1, 1));
             }
         );
 
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $this->databaseName . '\'',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
 
@@ -124,8 +122,8 @@ class OperationsTest extends TestBase
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $new_db_name . '\'',
             function () use ($new_db_name): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals($new_db_name, $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals($new_db_name, $this->getCellByTableClass('table_results', 1, 1));
             }
         );
 
diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php
index dd006ad53f..537ed2460a 100644
--- a/test/selenium/Database/ProceduresTest.php
+++ b/test/selenium/Database/ProceduresTest.php
@@ -63,7 +63,7 @@ class ProceduresTest extends TestBase
             function () use (&$sqlMode): void {
                 $optionsSelector = '//button[contains(., "Extra options")]';
                 $fullTextSelector = '//label[contains(., "Full texts")]';
-                $this->assertTrue($this->isElementPresent('xpath', $optionsSelector));
+                self::assertTrue($this->isElementPresent('xpath', $optionsSelector));
                 $this->byXPath($optionsSelector)->click();
                 $this->waitForElement('xpath', $fullTextSelector);
                 sleep(2);// Wait for the animation to display the box
@@ -71,9 +71,9 @@ class ProceduresTest extends TestBase
                 $this->byCssSelector('.collapse .tblFooters input[type=submit]')->click();
                 $this->waitAjax();
                 sleep(2);// Waitfor the new results
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
                 $sqlMode = $this->getCellByTableClass('table_results', 1, 1);
-                $this->assertNotEmpty($sqlMode);
+                self::assertNotEmpty($sqlMode);
             }
         );
 
@@ -87,10 +87,7 @@ class ProceduresTest extends TestBase
     {
         if ($this->originalSqlMode !== '') {
             $this->dbQuery("SET GLOBAL sql_mode = '" . $this->originalSqlMode . "';");
-            $this->assertEquals(
-                $this->originalSqlMode,
-                $this->getSqlMode()
-            );
+            self::assertEquals($this->originalSqlMode, $this->getSqlMode());
         }
 
         parent::tearDown();
@@ -168,8 +165,8 @@ class ProceduresTest extends TestBase
         $this->dbQuery(
             "SHOW PROCEDURE STATUS WHERE Db='" . $this->databaseName . "'",
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals($this->databaseName, $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals($this->databaseName, $this->getCellByTableClass('table_results', 1, 1));
             }
         );
 
@@ -225,8 +222,8 @@ class ProceduresTest extends TestBase
         $this->dbQuery(
             "SHOW PROCEDURE STATUS WHERE Db='" . $this->databaseName . "'",
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
     }
@@ -249,6 +246,6 @@ class ProceduresTest extends TestBase
         $this->waitUntilElementIsVisible('cssSelector', 'span#PMA_slidingMessage', 30);
         sleep(2);// Give more chances to the JS effect to finish
         $head = $this->byCssSelector('span#PMA_slidingMessage table tbody')->getText();
-        $this->assertEquals("outp\n" . $length, $head);
+        self::assertEquals("outp\n" . $length, $head);
     }
 }
diff --git a/test/selenium/Database/QueryByExampleTest.php b/test/selenium/Database/QueryByExampleTest.php
index 8c4fc1d9e1..247f47e733 100644
--- a/test/selenium/Database/QueryByExampleTest.php
+++ b/test/selenium/Database/QueryByExampleTest.php
@@ -111,7 +111,7 @@ class QueryByExampleTest extends TestBase
         $actual = trim((string) $this->waitForElement('id', 'textSqlquery')->getAttribute('value'));
 
         /* Compare generated query */
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
 
         /* Submit the query */
         $submitButton = $this->waitForElement('cssSelector', '#tblQbeFooters > input[type=submit]');
@@ -122,53 +122,23 @@ class QueryByExampleTest extends TestBase
         $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
 
         /* Assert Row 1 */
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 1, 1)
-        );
-        $this->assertEquals(
-            3,
-            $this->getCellByTableClass('table_results', 1, 2)
-        );
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 1, 1));
+        self::assertEquals(3, $this->getCellByTableClass('table_results', 1, 2));
 
         /* Assert Row 2 */
-        $this->assertEquals(
-            6,
-            $this->getCellByTableClass('table_results', 2, 1)
-        );
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 2, 2)
-        );
+        self::assertEquals(6, $this->getCellByTableClass('table_results', 2, 1));
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 2, 2));
 
         /* Assert Row 3 */
-        $this->assertEquals(
-            5,
-            $this->getCellByTableClass('table_results', 3, 1)
-        );
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 3, 2)
-        );
+        self::assertEquals(5, $this->getCellByTableClass('table_results', 3, 1));
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 3, 2));
 
         /* Assert Row 4 */
-        $this->assertEquals(
-            7,
-            $this->getCellByTableClass('table_results', 4, 1)
-        );
-        $this->assertEquals(
-            5,
-            $this->getCellByTableClass('table_results', 4, 2)
-        );
+        self::assertEquals(7, $this->getCellByTableClass('table_results', 4, 1));
+        self::assertEquals(5, $this->getCellByTableClass('table_results', 4, 2));
 
         /* Assert Row 5 */
-        $this->assertEquals(
-            3,
-            $this->getCellByTableClass('table_results', 5, 1)
-        );
-        $this->assertEquals(
-            5,
-            $this->getCellByTableClass('table_results', 5, 2)
-        );
+        self::assertEquals(3, $this->getCellByTableClass('table_results', 5, 1));
+        self::assertEquals(5, $this->getCellByTableClass('table_results', 5, 2));
     }
 }
diff --git a/test/selenium/Database/StructureTest.php b/test/selenium/Database/StructureTest.php
index 6785051e5a..69fd376a35 100644
--- a/test/selenium/Database/StructureTest.php
+++ b/test/selenium/Database/StructureTest.php
@@ -51,19 +51,17 @@ class StructureTest extends TestBase
 
         $this->waitForElement('cssSelector', 'button.submitOK')->click();
 
-        $this->assertNotNull(
-            $this->waitForElement(
-                'xpath',
-                '//div[@class=\'alert alert-success\' and contains(., \'MySQL returned an empty result\')]'
-            )
-        );
+        self::assertNotNull($this->waitForElement(
+            'xpath',
+            '//div[@class=\'alert alert-success\' and contains(., \'MySQL returned an empty result\')]'
+        ));
 
         $this->dbQuery(
             'SELECT CONCAT("Count: ", COUNT(*)) as c FROM `' . $this->databaseName . '`.`test_table`',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
                 // [ ] | Edit | Copy | Delete | 1 | 5
-                $this->assertEquals('Count: 0', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertEquals('Count: 0', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
     }
@@ -90,8 +88,8 @@ class StructureTest extends TestBase
         $this->dbQuery(
             'SHOW TABLES FROM `' . $this->databaseName . '`;',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
     }
diff --git a/test/selenium/Database/TriggersTest.php b/test/selenium/Database/TriggersTest.php
index 479d26e352..289bf9da83 100644
--- a/test/selenium/Database/TriggersTest.php
+++ b/test/selenium/Database/TriggersTest.php
@@ -99,18 +99,16 @@ class TriggersTest extends TestBase
             '//div[@class=\'alert alert-success\' and contains(., \'Trigger `test_trigger` has been created\')]'
         );
 
-        $this->assertTrue(
-            $this->isElementPresent(
-                'xpath',
-                "//td[contains(., 'test_trigger')]"
-            )
-        );
+        self::assertTrue($this->isElementPresent(
+            'xpath',
+            "//td[contains(., 'test_trigger')]"
+        ));
 
         $this->dbQuery(
             'SHOW TRIGGERS FROM `' . $this->databaseName . '`;',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('test_trigger', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('test_trigger', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
 
@@ -121,7 +119,7 @@ class TriggersTest extends TestBase
             function (): void {
                 $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
                 // [ ] | Edit | Copy | Delete | 1 | 3
-                $this->assertEquals('3', $this->getCellByTableClass('table_results', 1, 6));
+                self::assertEquals('3', $this->getCellByTableClass('table_results', 1, 6));
             }
         );
     }
@@ -161,7 +159,7 @@ class TriggersTest extends TestBase
             function (): void {
                 $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
                 // [ ] | Edit | Copy | Delete | 1 | 12
-                $this->assertEquals('12', $this->getCellByTableClass('table_results', 1, 6));
+                self::assertEquals('12', $this->getCellByTableClass('table_results', 1, 6));
             }
         );
     }
@@ -193,15 +191,15 @@ class TriggersTest extends TestBase
             function (): void {
                 $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
                 // [ ] | Edit | Copy | Delete | 1 | 2
-                $this->assertEquals('2', $this->getCellByTableClass('table_results', 1, 6));
+                self::assertEquals('2', $this->getCellByTableClass('table_results', 1, 6));
             }
         );
 
         $this->dbQuery(
             'SHOW TRIGGERS FROM `' . $this->databaseName . '`;',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
     }
diff --git a/test/selenium/ExportTest.php b/test/selenium/ExportTest.php
index 426fd1e3b1..320e8eeaeb 100644
--- a/test/selenium/ExportTest.php
+++ b/test/selenium/ExportTest.php
@@ -42,7 +42,7 @@ class ExportTest extends TestBase
         $text = $this->doExport('server', $plugin);
 
         foreach ($expected as $str) {
-            $this->assertStringContainsString($str, $text);
+            self::assertStringContainsString($str, $text);
         }
     }
 
@@ -62,7 +62,7 @@ class ExportTest extends TestBase
         $text = $this->doExport('db', $plugin);
 
         foreach ($expected as $str) {
-            $this->assertStringContainsString($str, $text);
+            self::assertStringContainsString($str, $text);
         }
     }
 
@@ -84,7 +84,7 @@ class ExportTest extends TestBase
         $text = $this->doExport('table', $plugin);
 
         foreach ($expected as $str) {
-            $this->assertStringContainsString($str, $text);
+            self::assertStringContainsString($str, $text);
         }
     }
 
diff --git a/test/selenium/ImportTest.php b/test/selenium/ImportTest.php
index b93ac6c2b7..c0e26fccc6 100644
--- a/test/selenium/ImportTest.php
+++ b/test/selenium/ImportTest.php
@@ -29,8 +29,8 @@ class ImportTest extends TestBase
         $this->dbQuery(
             'SHOW DATABASES LIKE \'test_import%\'',
             function (): void {
-                $this->assertEquals('test_import1', $this->getCellByTableClass('table_results', 1, 1));
-                $this->assertEquals('test_import2', $this->getCellByTableClass('table_results', 2, 1));
+                self::assertEquals('test_import1', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertEquals('test_import2', $this->getCellByTableClass('table_results', 2, 1));
             }
         );
 
@@ -54,8 +54,8 @@ class ImportTest extends TestBase
             'USE `' . $this->databaseName . '`;'
             . 'SHOW TABLES FROM `' . $this->databaseName . '`',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('test_table', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('test_table', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
     }
@@ -81,9 +81,9 @@ class ImportTest extends TestBase
         $this->dbQuery(
             'SELECT * FROM `' . $this->databaseName . '`.test_table',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('8', $this->getCellByTableClass('table_results', 1, 1));
-                $this->assertEquals('9', $this->getCellByTableClass('table_results', 2, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('8', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertEquals('9', $this->getCellByTableClass('table_results', 2, 1));
             }
         );
     }
diff --git a/test/selenium/LoginTest.php b/test/selenium/LoginTest.php
index 0910c4fd80..7e5344237a 100644
--- a/test/selenium/LoginTest.php
+++ b/test/selenium/LoginTest.php
@@ -31,7 +31,7 @@ class LoginTest extends TestBase
     {
         $this->login();
         $this->waitForElement('xpath', '//*[@id="server-breadcrumb"]');
-        $this->assertTrue($this->isSuccessLogin());
+        self::assertTrue($this->isSuccessLogin());
         $this->logOutIfLoggedIn();
     }
 
@@ -44,6 +44,6 @@ class LoginTest extends TestBase
     {
         $this->login('Admin', 'Admin');
         $this->waitForElement('xpath', '//*[@class="alert alert-danger" and contains(.,\'Access denied for\')]');
-        $this->assertTrue($this->isUnsuccessLogin());
+        self::assertTrue($this->isUnsuccessLogin());
     }
 }
diff --git a/test/selenium/NormalizationTest.php b/test/selenium/NormalizationTest.php
index df8d6c4eb8..f0a13b91f9 100644
--- a/test/selenium/NormalizationTest.php
+++ b/test/selenium/NormalizationTest.php
@@ -43,19 +43,15 @@ class NormalizationTest extends TestBase
      */
     public function testNormalizationTo1NF(): void
     {
-        $this->assertTrue(
-            $this->isElementPresent('cssSelector', 'fieldset')
-        );
-        $this->assertEquals(
+        self::assertTrue($this->isElementPresent('cssSelector', 'fieldset'));
+        self::assertEquals(
             'First step of normalization (1NF)',
             $this->byCssSelector('label[for=normalizeToRadio1]')->getText()
         );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                'input[id=normalizeToRadio1][type=radio]:checked'
-            )
-        );
+        self::assertTrue($this->isElementPresent(
+            'cssSelector',
+            'input[id=normalizeToRadio1][type=radio]:checked'
+        ));
         $this->byCssSelector('input[name=submit_normalize]')->click();
         $this->waitForElement('id', 'mainContent');
         $this->assert1NFSteps();
@@ -66,46 +62,16 @@ class NormalizationTest extends TestBase
      */
     private function assert1NFSteps(): void
     {
-        $this->assertEquals(
+        self::assertEquals(
             'First step of normalization (1NF)',
             $this->byCssSelector('#page_content h3')->getText()
         );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#mainContent h4'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#mainContent #newCols'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '.tblFooters'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#selectNonAtomicCol option[value=val2]'
-            )
-        );
-        $this->assertFalse(
-            $this->isElementPresent(
-                'cssSelector',
-                '#selectNonAtomicCol option[value=val]'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#selectNonAtomicCol option[value=no_such_col]'
-            )
-        );
+        self::assertTrue($this->isElementPresent('cssSelector', '#mainContent h4'));
+        self::assertTrue($this->isElementPresent('cssSelector', '#mainContent #newCols'));
+        self::assertTrue($this->isElementPresent('cssSelector', '.tblFooters'));
+        self::assertTrue($this->isElementPresent('cssSelector', '#selectNonAtomicCol option[value=val2]'));
+        self::assertFalse($this->isElementPresent('cssSelector', '#selectNonAtomicCol option[value=val]'));
+        self::assertTrue($this->isElementPresent('cssSelector', '#selectNonAtomicCol option[value=no_such_col]'));
 
         $this->selectByValue(
             $this->byId('selectNonAtomicCol'),
@@ -114,32 +80,17 @@ class NormalizationTest extends TestBase
 
         $this->waitForElement('xpath', "//legend[contains(., 'Step 1.2 Have a primary key')]");
         $text = $this->byCssSelector('#mainContent h4')->getText();
-        $this->assertStringContainsString('Primary key already exists.', $text);
+        self::assertStringContainsString('Primary key already exists.', $text);
         $this->waitForElement('xpath', "//legend[contains(., 'Step 1.3 Move repeating groups')]");
         $this->byCssSelector('input[value="No repeating group"]')->click();
         $this->waitForElement('xpath', "//legend[contains(., 'Step 1.4 Remove redundant columns')]");
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#mainContent #extra'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#extra input[value=val2][type=checkbox]'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'cssSelector',
-                '#extra input[value=id][type=checkbox]'
-            )
-        );
+        self::assertTrue($this->isElementPresent('cssSelector', '#mainContent #extra'));
+        self::assertTrue($this->isElementPresent('cssSelector', '#extra input[value=val2][type=checkbox]'));
+        self::assertTrue($this->isElementPresent('cssSelector', '#extra input[value=id][type=checkbox]'));
         $this->byCssSelector('#extra input[value=val][type=checkbox]')->click();
         $this->byCssSelector('#removeRedundant')->click();
         $this->waitForElement('xpath', "//legend[contains(., 'End of step')]");
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             "The first step of normalization is complete for table 'test_table'.",
             $this->byCssSelector('#mainContent h4')->getText()
         );
diff --git a/test/selenium/ServerSettingsTest.php b/test/selenium/ServerSettingsTest.php
index 068e6faeea..a797189808 100644
--- a/test/selenium/ServerSettingsTest.php
+++ b/test/selenium/ServerSettingsTest.php
@@ -71,17 +71,13 @@ class ServerSettingsTest extends TestBase
         $ele->sendKeys($this->databaseName);
 
         $this->saveConfig();
-        $this->assertFalse(
-            $this->isElementPresent('partialLinkText', $this->databaseName)
-        );
+        self::assertFalse($this->isElementPresent('partialLinkText', $this->databaseName));
 
         $this->waitForElement('xpath', "//a[contains(@href, '#Databases')]")->click();
 
         $this->waitForElement('name', 'Servers-1-hide_db')->clear();
         $this->saveConfig();
-        $this->assertTrue(
-            $this->isElementPresent('partialLinkText', $this->databaseName)
-        );
+        self::assertTrue($this->isElementPresent('partialLinkText', $this->databaseName));
     }
 
     /**
@@ -97,20 +93,12 @@ class ServerSettingsTest extends TestBase
         $this->waitForElement('className', 'nav-tabs');
 
         $this->byPartialLinkText('SQL Query box')->click();
-        $this->assertTrue(
-            $this->byId('Sql_box')->isDisplayed()
-        );
-        $this->assertFalse(
-            $this->byId('Sql_queries')->isDisplayed()
-        );
+        self::assertTrue($this->byId('Sql_box')->isDisplayed());
+        self::assertFalse($this->byId('Sql_queries')->isDisplayed());
 
         $this->byCssSelector("a[href='#Sql_queries']")->click();
-        $this->assertFalse(
-            $this->byId('Sql_box')->isDisplayed()
-        );
-        $this->assertTrue(
-            $this->byId('Sql_queries')->isDisplayed()
-        );
+        self::assertFalse($this->byId('Sql_box')->isDisplayed());
+        self::assertTrue($this->byId('Sql_queries')->isDisplayed());
     }
 
     /**
@@ -127,15 +115,11 @@ class ServerSettingsTest extends TestBase
             ->click();
         $this->saveConfig();
         sleep(1);
-        $this->assertFalse(
-            $this->isElementPresent('id', 'imgpmalogo')
-        );
+        self::assertFalse($this->isElementPresent('id', 'imgpmalogo'));
 
         $this->byCssSelector("a[href='#NavigationDisplayLogo']")->click();
         $this->saveConfig();
         sleep(1);
-        $this->assertTrue(
-            $this->isElementPresent('id', 'imgpmalogo')
-        );
+        self::assertTrue($this->isElementPresent('id', 'imgpmalogo'));
     }
 }
diff --git a/test/selenium/SqlQueryTest.php b/test/selenium/SqlQueryTest.php
index a76ac9e124..819a729670 100644
--- a/test/selenium/SqlQueryTest.php
+++ b/test/selenium/SqlQueryTest.php
@@ -41,26 +41,11 @@ class SqlQueryTest extends TestBase
         $this->waitAjax();
 
         $this->waitForElement('cssSelector', 'table.table_results');
-        $this->assertEquals(
-            1,
-            $this->getCellByTableClass('table_results', 1, 1)
-        );
-        $this->assertEquals(
-            1,
-            $this->getCellByTableClass('table_results', 1, 2)
-        );
-        $this->assertEquals(
-            2,
-            $this->getCellByTableClass('table_results', 1, 3)
-        );
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 1, 4)
-        );
-        $this->assertEquals(
-            7,
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals(1, $this->getCellByTableClass('table_results', 1, 1));
+        self::assertEquals(1, $this->getCellByTableClass('table_results', 1, 2));
+        self::assertEquals(2, $this->getCellByTableClass('table_results', 1, 3));
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 1, 4));
+        self::assertEquals(7, $this->getCellByTableClass('table_results', 1, 5));
 
         // test inline edit button
         $this->assertInlineEdit();
@@ -81,18 +66,9 @@ class SqlQueryTest extends TestBase
         $this->waitAjax();
 
         $this->waitForElement('cssSelector', 'table.table_results');
-        $this->assertEquals(
-            'test_table',
-            $this->getCellByTableClass('table_results', 1, 1)
-        );
-        $this->assertEquals(
-            'InnoDB',
-            $this->getCellByTableClass('table_results', 1, 2)
-        );
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('test_table', $this->getCellByTableClass('table_results', 1, 1));
+        self::assertEquals('InnoDB', $this->getCellByTableClass('table_results', 1, 2));
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 1, 5));
 
         // test inline edit button
         $this->assertInlineEdit();
@@ -114,22 +90,10 @@ class SqlQueryTest extends TestBase
         $this->waitAjax();
 
         $this->waitForElement('cssSelector', 'table.table_results');
-        $this->assertEquals(
-            3,
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-        $this->assertEquals(
-            4,
-            $this->getCellByTableClass('table_results', 1, 6)
-        );
-        $this->assertEquals(
-            5,
-            $this->getCellByTableClass('table_results', 2, 6)
-        );
+        self::assertEquals(3, $this->getCellByTableClass('table_results', 1, 5));
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 2, 5));
+        self::assertEquals(4, $this->getCellByTableClass('table_results', 1, 6));
+        self::assertEquals(5, $this->getCellByTableClass('table_results', 2, 6));
 
         // test inline edit button
         $this->assertInlineEdit();
@@ -149,9 +113,6 @@ class SqlQueryTest extends TestBase
         $this->waitAjax();
 
         $this->waitForElement('cssSelector', 'table.table_results');
-        $this->assertEquals(
-            1,
-            $this->getCellByTableClass('table_results', 1, 1)
-        );
+        self::assertEquals(1, $this->getCellByTableClass('table_results', 1, 1));
     }
 }
diff --git a/test/selenium/Table/BrowseTest.php b/test/selenium/Table/BrowseTest.php
index f8b98e5c68..a22b869550 100644
--- a/test/selenium/Table/BrowseTest.php
+++ b/test/selenium/Table/BrowseTest.php
@@ -49,78 +49,42 @@ class BrowseTest extends TestBase
         $this->byPartialLinkText('name')->click();
         $this->waitAjax();
 
-        $this->assertEquals(
-            '1',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('1', $this->getCellByTableClass('table_results', 1, 5));
 
-        $this->assertEquals(
-            '3',
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
+        self::assertEquals('3', $this->getCellByTableClass('table_results', 2, 5));
 
-        $this->assertEquals(
-            '2',
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
+        self::assertEquals('2', $this->getCellByTableClass('table_results', 3, 5));
 
         // case 2
         $this->byPartialLinkText('name')->click();
         $this->waitAjax();
 
-        $this->assertEquals(
-            '2',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('2', $this->getCellByTableClass('table_results', 1, 5));
 
-        $this->assertEquals(
-            '1',
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
+        self::assertEquals('1', $this->getCellByTableClass('table_results', 2, 5));
 
-        $this->assertEquals(
-            '3',
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
+        self::assertEquals('3', $this->getCellByTableClass('table_results', 3, 5));
 
         // case 2
         $this->byLinkText('datetimefield')->click();
         $this->waitAjax();
 
         $this->getCellByTableClass('table_results', 1, 5);
-        $this->assertEquals(
-            '3',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('3', $this->getCellByTableClass('table_results', 1, 5));
 
-        $this->assertEquals(
-            '1',
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
+        self::assertEquals('1', $this->getCellByTableClass('table_results', 2, 5));
 
-        $this->assertEquals(
-            '2',
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
+        self::assertEquals('2', $this->getCellByTableClass('table_results', 3, 5));
 
         // case 4
         $this->byPartialLinkText('datetimefield')->click();
         $this->waitAjax();
 
-        $this->assertEquals(
-            '2',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('2', $this->getCellByTableClass('table_results', 1, 5));
 
-        $this->assertEquals(
-            '1',
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
+        self::assertEquals('1', $this->getCellByTableClass('table_results', 2, 5));
 
-        $this->assertEquals(
-            '3',
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
+        self::assertEquals('3', $this->getCellByTableClass('table_results', 3, 5));
     }
 
     /**
@@ -139,20 +103,11 @@ class BrowseTest extends TestBase
         $this->waitAjax();
         $this->waitForElement('id', 'insertForm');
 
-        $this->assertEquals(
-            '2',
-            $this->byId('field_1_3')->getAttribute('value')
-        );
+        self::assertEquals('2', $this->byId('field_1_3')->getAttribute('value'));
 
-        $this->assertEquals(
-            'foo',
-            $this->byId('field_2_3')->getAttribute('value')
-        );
+        self::assertEquals('foo', $this->byId('field_2_3')->getAttribute('value'));
 
-        $this->assertEquals(
-            '2010-01-20 02:00:02',
-            $this->byId('field_3_3')->getAttribute('value')
-        );
+        self::assertEquals('2010-01-20 02:00:02', $this->byId('field_3_3')->getAttribute('value'));
 
         $this->byId('field_3_3')->clear();
         $this->byId('field_3_3')->sendKeys('2009-01-2');
@@ -166,17 +121,11 @@ class BrowseTest extends TestBase
 
         $this->waitAjax();
         $success = $this->waitForElement('className', 'alert-success');
-        $this->assertStringContainsString('1 row affected', $success->getText());
+        self::assertStringContainsString('1 row affected', $success->getText());
 
-        $this->assertEquals(
-            'foobar',
-            $this->getCellByTableClass('table_results', 2, 6)
-        );
+        self::assertEquals('foobar', $this->getCellByTableClass('table_results', 2, 6));
 
-        $this->assertEquals(
-            '2009-01-02 00:00:00',
-            $this->getCellByTableClass('table_results', 2, 7)
-        );
+        self::assertEquals('2009-01-02 00:00:00', $this->getCellByTableClass('table_results', 2, 7));
     }
 
     /**
@@ -191,13 +140,10 @@ class BrowseTest extends TestBase
         $this->moveto($element);
         $this->doubleclick();
 
-        $this->assertEquals(
-            $this->waitForElement(
-                'xpath',
-                "//div[not(contains(@style,'display: none;'))]//textarea[contains(@class, 'edit_box')]"
-            )->getAttribute('value'),
-            'abcd'
-        );
+        self::assertEquals($this->waitForElement(
+            'xpath',
+            "//div[not(contains(@style,'display: none;'))]//textarea[contains(@class, 'edit_box')]"
+        )->getAttribute('value'), 'abcd');
 
         $this->byCssSelector('textarea.edit_box')->clear();
         $this->byCssSelector('textarea.edit_box')->sendKeys('abcde');
@@ -206,12 +152,9 @@ class BrowseTest extends TestBase
 
         $this->waitAjax();
         $success = $this->waitForElement('cssSelector', 'span.ajax_notification .alert-success');
-        $this->assertStringContainsString('1 row affected', $success->getText());
+        self::assertStringContainsString('1 row affected', $success->getText());
 
-        $this->assertEquals(
-            'abcde',
-            $this->getCellByTableClass('table_results', 1, 6)
-        );
+        self::assertEquals('abcde', $this->getCellByTableClass('table_results', 1, 6));
     }
 
     /**
@@ -226,15 +169,9 @@ class BrowseTest extends TestBase
         $this->click();
         $this->waitForElement('id', 'insertForm');
 
-        $this->assertEquals(
-            'Abcd',
-            $this->byId('field_2_3')->getAttribute('value')
-        );
+        self::assertEquals('Abcd', $this->byId('field_2_3')->getAttribute('value'));
 
-        $this->assertEquals(
-            '2012-01-20 02:00:02',
-            $this->byId('field_3_3')->getAttribute('value')
-        );
+        self::assertEquals('2012-01-20 02:00:02', $this->byId('field_3_3')->getAttribute('value'));
 
         $this->byId('field_2_3')->clear();
         $this->byId('field_2_3')->sendKeys('ABCDEFG');
@@ -246,17 +183,11 @@ class BrowseTest extends TestBase
 
         $this->waitAjax();
         $success = $this->waitForElement('className', 'alert-success');
-        $this->assertStringContainsString('1 row inserted', $success->getText());
+        self::assertStringContainsString('1 row inserted', $success->getText());
 
-        $this->assertEquals(
-            'ABCDEFG',
-            $this->getCellByTableClass('table_results', 4, 6)
-        );
+        self::assertEquals('ABCDEFG', $this->getCellByTableClass('table_results', 4, 6));
 
-        $this->assertEquals(
-            '2012-01-02 00:00:00',
-            $this->getCellByTableClass('table_results', 4, 7)
-        );
+        self::assertEquals('2012-01-02 00:00:00', $this->getCellByTableClass('table_results', 4, 7));
     }
 
     /**
@@ -284,17 +215,11 @@ class BrowseTest extends TestBase
 
         $this->waitAjax();
         $success = $this->waitForElement('className', 'alert-success');
-        $this->assertStringContainsString('Showing rows', $success->getText());
+        self::assertStringContainsString('Showing rows', $success->getText());
 
-        $this->assertEquals(
-            '1',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('1', $this->getCellByTableClass('table_results', 1, 5));
 
-        $this->assertEquals(
-            '3',
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
+        self::assertEquals('3', $this->getCellByTableClass('table_results', 2, 5));
     }
 
     /**
@@ -314,13 +239,11 @@ class BrowseTest extends TestBase
 
         $this->waitAjax();
         $success = $this->waitForElement('className', 'alert-success');
-        $this->assertStringContainsString('Showing rows', $success->getText());
+        self::assertStringContainsString('Showing rows', $success->getText());
 
-        $this->assertFalse(
-            $this->isElementPresent(
-                'cssSelector',
-                'table.table_results tbody tr:nth-child(2)'
-            )
-        );
+        self::assertFalse($this->isElementPresent(
+            'cssSelector',
+            'table.table_results tbody tr:nth-child(2)'
+        ));
     }
 }
diff --git a/test/selenium/Table/CreateTest.php b/test/selenium/Table/CreateTest.php
index 1777f071b4..8a687cc963 100644
--- a/test/selenium/Table/CreateTest.php
+++ b/test/selenium/Table/CreateTest.php
@@ -104,39 +104,18 @@ class CreateTest extends TestBase
         $this->waitForElement('id', 'table_structure_id');
 
         // make assertions for first row
-        $this->assertStringContainsString(
-            'test_id',
-            $this->byCssSelector('label[for=checkbox_row_1]')->getText()
-        );
+        self::assertStringContainsString('test_id', $this->byCssSelector('label[for=checkbox_row_1]')->getText());
 
-        $this->assertEquals(
-            'int(14)',
-            $this->getCellByTableId('tablestructure', 1, 4)
-        );
+        self::assertEquals('int(14)', $this->getCellByTableId('tablestructure', 1, 4));
 
-        $this->assertEquals(
-            'UNSIGNED',
-            $this->getCellByTableId('tablestructure', 1, 6)
-        );
+        self::assertEquals('UNSIGNED', $this->getCellByTableId('tablestructure', 1, 6));
 
-        $this->assertEquals(
-            'No',
-            $this->getCellByTableId('tablestructure', 1, 7)
-        );
+        self::assertEquals('No', $this->getCellByTableId('tablestructure', 1, 7));
 
-        $this->assertEquals(
-            'None',
-            $this->getCellByTableId('tablestructure', 1, 8)
-        );
-        $this->assertEquals(
-            'comm1',
-            $this->getCellByTableId('tablestructure', 1, 9)
-        );
+        self::assertEquals('None', $this->getCellByTableId('tablestructure', 1, 8));
+        self::assertEquals('comm1', $this->getCellByTableId('tablestructure', 1, 9));
 
-        $this->assertEquals(
-            'AUTO_INCREMENT',
-            $this->getCellByTableId('tablestructure', 1, 10)
-        );
+        self::assertEquals('AUTO_INCREMENT', $this->getCellByTableId('tablestructure', 1, 10));
 
         self::assertFalse($this->isElementPresent(
             'cssSelector',
@@ -144,30 +123,15 @@ class CreateTest extends TestBase
         ));
 
         // make assertions for second row
-        $this->assertStringContainsString(
-            'test_column',
-            $this->byCssSelector('label[for=checkbox_row_2]')->getText()
-        );
+        self::assertStringContainsString('test_column', $this->byCssSelector('label[for=checkbox_row_2]')->getText());
 
-        $this->assertEquals(
-            'varchar(10)',
-            $this->getCellByTableId('tablestructure', 2, 4)
-        );
+        self::assertEquals('varchar(10)', $this->getCellByTableId('tablestructure', 2, 4));
 
-        $this->assertEquals(
-            'utf8mb4_general_ci',
-            $this->getCellByTableId('tablestructure', 2, 5)
-        );
+        self::assertEquals('utf8mb4_general_ci', $this->getCellByTableId('tablestructure', 2, 5));
 
-        $this->assertEquals(
-            'Yes',
-            $this->getCellByTableId('tablestructure', 2, 7)
-        );
+        self::assertEquals('Yes', $this->getCellByTableId('tablestructure', 2, 7));
 
-        $this->assertEquals(
-            'def',
-            $this->getCellByTableId('tablestructure', 2, 8)
-        );
+        self::assertEquals('def', $this->getCellByTableId('tablestructure', 2, 8));
 
         self::assertTrue($this->isElementPresent(
             'cssSelector',
diff --git a/test/selenium/Table/InsertTest.php b/test/selenium/Table/InsertTest.php
index 5a51559eef..faf13e68d3 100644
--- a/test/selenium/Table/InsertTest.php
+++ b/test/selenium/Table/InsertTest.php
@@ -74,7 +74,7 @@ class InsertTest extends TestBase
         $this->waitAjax();
 
         $ele = $this->waitForElement('className', 'alert-success');
-        $this->assertStringContainsString('2 rows inserted', $ele->getText());
+        self::assertStringContainsString('2 rows inserted', $ele->getText());
 
         // shorter date to prevent error,
         // automatically gets appended with 00:00:00
@@ -92,7 +92,7 @@ class InsertTest extends TestBase
             'xpath',
             "//div[contains(@class, 'alert-success') and not(contains(@class, 'message'))]"
         );
-        $this->assertStringContainsString('1 row inserted', $ele->getText());
+        self::assertStringContainsString('1 row inserted', $ele->getText());
 
         $this->assertDataPresent();
     }
@@ -107,49 +107,22 @@ class InsertTest extends TestBase
         $this->waitAjax();
         $this->waitForElement('cssSelector', 'table.table_results');
 
-        $this->assertEquals(
-            '1',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('1', $this->getCellByTableClass('table_results', 1, 5));
 
-        $this->assertEquals(
-            'abcd',
-            $this->getCellByTableClass('table_results', 1, 6)
-        );
+        self::assertEquals('abcd', $this->getCellByTableClass('table_results', 1, 6));
 
-        $this->assertEquals(
-            '2011-01-02 00:00:00',
-            $this->getCellByTableClass('table_results', 1, 7)
-        );
+        self::assertEquals('2011-01-02 00:00:00', $this->getCellByTableClass('table_results', 1, 7));
 
-        $this->assertEquals(
-            '2',
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
+        self::assertEquals('2', $this->getCellByTableClass('table_results', 2, 5));
 
-        $this->assertEquals(
-            'foo',
-            $this->getCellByTableClass('table_results', 2, 6)
-        );
+        self::assertEquals('foo', $this->getCellByTableClass('table_results', 2, 6));
 
-        $this->assertEquals(
-            '2012-01-02 00:00:00',
-            $this->getCellByTableClass('table_results', 2, 7)
-        );
+        self::assertEquals('2012-01-02 00:00:00', $this->getCellByTableClass('table_results', 2, 7));
 
-        $this->assertEquals(
-            '4',
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
+        self::assertEquals('4', $this->getCellByTableClass('table_results', 3, 5));
 
-        $this->assertEquals(
-            'Abcd',
-            $this->getCellByTableClass('table_results', 3, 6)
-        );
+        self::assertEquals('Abcd', $this->getCellByTableClass('table_results', 3, 6));
 
-        $this->assertEquals(
-            '2013-01-02 00:00:00',
-            $this->getCellByTableClass('table_results', 3, 7)
-        );
+        self::assertEquals('2013-01-02 00:00:00', $this->getCellByTableClass('table_results', 3, 7));
     }
 }
diff --git a/test/selenium/Table/OperationsTest.php b/test/selenium/Table/OperationsTest.php
index de1fc26863..6362abe866 100644
--- a/test/selenium/Table/OperationsTest.php
+++ b/test/selenium/Table/OperationsTest.php
@@ -74,10 +74,7 @@ class OperationsTest extends TestBase
         $this->waitAjax();
         $this->waitForElement('cssSelector', 'table.table_results');
 
-        $this->assertEquals(
-            '2',
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
+        self::assertEquals('2', $this->getCellByTableClass('table_results', 1, 5));
     }
 
     /**
@@ -105,8 +102,8 @@ class OperationsTest extends TestBase
             'USE `' . $this->databaseName . '`;'
             . 'SHOW TABLES LIKE \'test_table2\'',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('test_table2', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('test_table2', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
     }
@@ -138,8 +135,8 @@ class OperationsTest extends TestBase
             'USE `' . $this->databaseName . '`;'
             . 'SHOW TABLES LIKE \'test_table2\'',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('test_table2', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('test_table2', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
     }
@@ -169,8 +166,8 @@ class OperationsTest extends TestBase
         $this->dbQuery(
             'SELECT COUNT(*) as c FROM `' . $this->databaseName . '`.test_table2',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('2', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('2', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
     }
@@ -196,8 +193,8 @@ class OperationsTest extends TestBase
         $this->dbQuery(
             'SELECT CONCAT("Count: ", COUNT(*)) as c FROM `' . $this->databaseName . '`.test_table',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertEquals('Count: 0', $this->getCellByTableClass('table_results', 1, 1));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertEquals('Count: 0', $this->getCellByTableClass('table_results', 1, 1));
             }
         );
     }
@@ -224,8 +221,8 @@ class OperationsTest extends TestBase
             'USE `' . $this->databaseName . '`;'
             . 'SHOW TABLES',
             function (): void {
-                $this->assertTrue($this->isElementPresent('className', 'table_results'));
-                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
+                self::assertTrue($this->isElementPresent('className', 'table_results'));
+                self::assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             }
         );
     }
diff --git a/test/selenium/Table/StructureTest.php b/test/selenium/Table/StructureTest.php
index 624003a326..d8c82cfb4c 100644
--- a/test/selenium/Table/StructureTest.php
+++ b/test/selenium/Table/StructureTest.php
@@ -57,15 +57,9 @@ class StructureTest extends TestBase
         $this->waitAjax();
         $this->waitForElement('id', 'tablestructure');
 
-        $this->assertEquals(
-            'val3',
-            $this->byCssSelector('label[for=checkbox_row_4]')->getText()
-        );
+        self::assertEquals('val3', $this->byCssSelector('label[for=checkbox_row_4]')->getText());
 
-        $this->assertEquals(
-            'int(11)',
-            $this->getCellByTableId('tablestructure', 4, 4)
-        );
+        self::assertEquals('int(11)', $this->getCellByTableId('tablestructure', 4, 4));
     }
 
     /**
@@ -80,7 +74,7 @@ class StructureTest extends TestBase
 
         $this->waitUntilElementIsPresent('className', 'append_fields_form', 30);
 
-        $this->assertEquals('val', $this->byId('field_0_1')->getAttribute('value'));
+        self::assertEquals('val', $this->byId('field_0_1')->getAttribute('value'));
         $this->byId('field_0_1')->clear();
         $this->byId('field_0_1')->sendKeys('val3');
         $this->byCssSelector("input[name='do_save_data']")->click();
@@ -90,10 +84,7 @@ class StructureTest extends TestBase
 
         $this->waitForElement('id', 'tablestructure');
 
-        $this->assertEquals(
-            'val3',
-            $this->waitForElement('cssSelector', 'label[for=checkbox_row_2]')->getText()
-        );
+        self::assertEquals('val3', $this->waitForElement('cssSelector', 'label[for=checkbox_row_2]')->getText());
     }
 
     /**
@@ -115,11 +106,9 @@ class StructureTest extends TestBase
         );
         $this->waitAjax();
 
-        $this->assertFalse(
-            $this->isElementPresent(
-                'cssSelector',
-                'label[for=checkbox_row_2]'
-            )
-        );
+        self::assertFalse($this->isElementPresent(
+            'cssSelector',
+            'label[for=checkbox_row_2]'
+        ));
     }
 }
diff --git a/test/selenium/TrackingTest.php b/test/selenium/TrackingTest.php
index 49c2fb2d2e..a5b6dba27e 100644
--- a/test/selenium/TrackingTest.php
+++ b/test/selenium/TrackingTest.php
@@ -60,22 +60,19 @@ class TrackingTest extends TestBase
         $this->byPartialLinkText('Tracking report')->click();
         $this->waitForElement('xpath', "//h3[contains(., 'Tracking report')]");
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'DROP TABLE IF EXISTS `test_table`',
             $this->getCellByTableId('ddl_versions', 1, 4)
         );
 
-        $this->assertStringContainsString(
-            'CREATE TABLE `test_table` (',
-            $this->getCellByTableId('ddl_versions', 2, 4)
-        );
+        self::assertStringContainsString('CREATE TABLE `test_table` (', $this->getCellByTableId('ddl_versions', 2, 4));
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'UPDATE test_table SET val = val + 1',
             $this->getCellByTableId('dml_versions', 1, 4)
         );
 
-        $this->assertStringNotContainsString(
+        self::assertStringNotContainsString(
             'DELETE FROM test_table WHERE val = 3',
             $this->byId('dml_versions')->getText()
         );
@@ -90,19 +87,14 @@ class TrackingTest extends TestBase
 
         $this->waitAjax();
 
-        $this->assertFalse(
-            $this->isElementPresent('id', 'dml_versions')
-        );
+        self::assertFalse($this->isElementPresent('id', 'dml_versions'));
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'DROP TABLE IF EXISTS `test_table`',
             $this->getCellByTableId('ddl_versions', 1, 4)
         );
 
-        $this->assertStringContainsString(
-            'CREATE TABLE `test_table` (',
-            $this->getCellByTableId('ddl_versions', 2, 4)
-        );
+        self::assertStringContainsString('CREATE TABLE `test_table` (', $this->getCellByTableId('ddl_versions', 2, 4));
 
         // only data
         $this->selectByLabel(
@@ -114,16 +106,14 @@ class TrackingTest extends TestBase
 
         $this->waitAjax();
 
-        $this->assertFalse(
-            $this->isElementPresent('id', 'ddl_versions')
-        );
+        self::assertFalse($this->isElementPresent('id', 'ddl_versions'));
 
-        $this->assertStringContainsString(
+        self::assertStringContainsString(
             'UPDATE test_table SET val = val + 1',
             $this->getCellByTableId('dml_versions', 1, 4)
         );
 
-        $this->assertStringNotContainsString(
+        self::assertStringNotContainsString(
             'DELETE FROM test_table WHERE val = 3',
             $this->byId('dml_versions')->getText()
         );
@@ -139,9 +129,7 @@ class TrackingTest extends TestBase
         $this->byCssSelector("input[value='Deactivate now']")->click();
         $this->waitForElement('cssSelector', "input[value='Activate now']");
         $this->executeSqlAndReturnToTableTracking();
-        $this->assertFalse(
-            $this->isElementPresent('id', 'dml_versions')
-        );
+        self::assertFalse($this->isElementPresent('id', 'dml_versions'));
     }
 
     /**
@@ -173,20 +161,14 @@ class TrackingTest extends TestBase
 
         // Can not use getCellByTableId,
         // since this is under 'th' and not 'td'
-        $this->assertStringContainsString(
-            'test_table',
-            $this->waitForElement(
-                'cssSelector',
-                'table#noversions tbody tr:nth-child(1) th:nth-child(2)'
-            )->getText()
-        );
-        $this->assertStringContainsString(
-            'test_table_2',
-            $this->waitForElement(
-                'cssSelector',
-                'table#noversions tbody tr:nth-child(2) th:nth-child(2)'
-            )->getText()
-        );
+        self::assertStringContainsString('test_table', $this->waitForElement(
+            'cssSelector',
+            'table#noversions tbody tr:nth-child(1) th:nth-child(2)'
+        )->getText());
+        self::assertStringContainsString('test_table_2', $this->waitForElement(
+            'cssSelector',
+            'table#noversions tbody tr:nth-child(2) th:nth-child(2)'
+        )->getText());
     }
 
     /**
@@ -199,25 +181,13 @@ class TrackingTest extends TestBase
         $this->byPartialLinkText('Structure snapshot')->click();
         $this->waitForElement('id', 'tablestructure');
 
-        $this->assertStringContainsString(
-            'id',
-            $this->getCellByTableId('tablestructure', 1, 2)
-        );
+        self::assertStringContainsString('id', $this->getCellByTableId('tablestructure', 1, 2));
 
-        $this->assertStringContainsString(
-            'val',
-            $this->getCellByTableId('tablestructure', 2, 2)
-        );
+        self::assertStringContainsString('val', $this->getCellByTableId('tablestructure', 2, 2));
 
-        $this->assertStringContainsString(
-            'PRIMARY',
-            $this->getCellByTableId('tablestructure_indexes', 1, 1)
-        );
+        self::assertStringContainsString('PRIMARY', $this->getCellByTableId('tablestructure_indexes', 1, 1));
 
-        $this->assertStringContainsString(
-            'id',
-            $this->getCellByTableId('tablestructure_indexes', 1, 5)
-        );
+        self::assertStringContainsString('id', $this->getCellByTableId('tablestructure_indexes', 1, 5));
     }
 
     /**
diff --git a/test/selenium/XssTest.php b/test/selenium/XssTest.php
index 7d4ea37657..4ebc2b7b36 100644
--- a/test/selenium/XssTest.php
+++ b/test/selenium/XssTest.php
@@ -38,6 +38,6 @@ class XssTest extends TestBase
 
         $this->waitForElement('id', 'querybox');
         $this->byId('button_submit_query')->click();
-        $this->assertEquals('Missing value in the form!', $this->alertText());
+        self::assertEquals('Missing value in the form!', $this->alertText());
     }
 }