gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19317 from MauricioFauth/phpunit-static

Browse Source 
Call PHPUnit static methods using static calls
This commit is contained in:
Maurício Meneghini Fauth 2024-10-14 14:23:49 -03:00 committed by GitHub
commit 42ff608b10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
309 changed files with 8364 additions and 13081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
phpstan-baseline.neon
View File

@ -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

135
psalm-baseline.xml
View File

@ -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>

14
test/classes/AbstractTestCase.php
View File

@ -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

12
test/classes/AdvisorTest.php
View File

@ -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

20
test/classes/BookmarkTest.php
View File

@ -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();
}
}

144
test/classes/BrowseForeignersTest.php
View File

@ -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);
}
}

62
test/classes/CacheTest.php
View File

@ -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));
}
}

10
test/classes/Charsets/CharsetTest.php
View File

@ -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());
}
}

20
test/classes/Charsets/CollationTest.php
View File

@ -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());
}
/**

22
test/classes/CharsetsTest.php
View File

@ -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);
}
}
}

54
test/classes/CheckUserPrivilegesTest.php
View File

@ -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']);
}
}

5
test/classes/Command/SetVersionCommandTest.php
View File

@ -206,9 +206,6 @@ final class Version
}
PHP;
$this->assertSame(
sprintf($template, $content),
$output
);
self::assertSame(sprintf($template, $content), $output);
}
}

14
test/classes/Command/TwigLintCommandTest.php
View File

@ -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);
}
}

17
test/classes/Command/WriteGitRevisionCommandTest.php
View File

@ -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);
}
}

26
test/classes/CommonTest.php
View File

@ -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']);
}
}

267
test/classes/Config/ConfigFileTest.php
View File

@ -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());
}
}

16
test/classes/Config/DescriptionTest.php
View File

@ -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);
}

76
test/classes/Config/FormDisplayTemplateTest.php
View File

@ -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);
}
}

185
test/classes/Config/FormDisplayTest.php
View File

@ -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']);
}
}

93
test/classes/Config/FormTest.php
View File

@ -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);
}
/**

18
test/classes/Config/Forms/FormListTest.php
View File

@ -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());
}
/**

30
test/classes/Config/PageSettingsTest.php
View File

@ -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);
}
}

80
test/classes/Config/ServerConfigChecksTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/ConsoleTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/DebugTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/ExportTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/ImportTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/SchemaTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/ServerTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/SqlQueryBoxTest.php
View File

@ -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);
}
}

2
test/classes/Config/Settings/TransformationsTest.php
View File

@ -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);
}
}

42
test/classes/Config/SettingsTest.php
View File

@ -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);
}
}

119
test/classes/ConfigStorage/RelationParametersTest.php
View File

@ -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());
}
/**

204
test/classes/ConfigStorage/RelationTest.php
View File

@ -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());
}
/**

49
test/classes/ConfigStorage/UserGroupsTest.php
View File

@ -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);
}
}

209
test/classes/ConfigTest.php
View File

@ -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);
}
/**

8
test/classes/ConsoleTest.php
View File

@ -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));
}
}

6
test/classes/Controllers/CheckRelationsControllerTest.php
View File

@ -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
);

4
test/classes/Controllers/Database/EventsControllerTest.php
View File

@ -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);
}
}

19
test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
View File

@ -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());
}
}

47
test/classes/Controllers/Database/PrivilegesControllerTest.php
View File

@ -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);
}
}

4
test/classes/Controllers/Database/RoutinesControllerTest.php
View File

@ -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);
}
}

4
test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
View File

@ -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);
}
}

4
test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
View File

@ -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']);
}
}

155
test/classes/Controllers/Database/StructureControllerTest.php
View File

@ -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,
]
));
}
}

4
test/classes/Controllers/Database/TriggersControllerTest.php
View File

@ -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);
}
}

4
test/classes/Controllers/Export/ExportControllerTest.php
View File

@ -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);
}
}

4
test/classes/Controllers/Export/Template/CreateControllerTest.php
View File

@ -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());
}
}

2
test/classes/Controllers/Export/Template/DeleteControllerTest.php
View File

@ -38,6 +38,6 @@ class DeleteControllerTest extends AbstractTestCase
new Relation($this->dbi)
))($request);
$this->assertTrue($response->hasSuccessState());
self::assertTrue($response->hasSuccessState());
}
}

4
test/classes/Controllers/Export/Template/LoadControllerTest.php
View File

@ -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());
}
}

2
test/classes/Controllers/Export/Template/UpdateControllerTest.php
View File

@ -41,6 +41,6 @@ class UpdateControllerTest extends AbstractTestCase
new Relation($this->dbi)
))($request);
$this->assertTrue($response->hasSuccessState());
self::assertTrue($response->hasSuccessState());
}
}

2
test/classes/Controllers/GisDataEditorControllerTest.php
View File

@ -50,7 +50,7 @@ class GisDataEditorControllerTest extends AbstractTestCase
$value,
]
);
$this->assertEquals($expected, $gisData);
self::assertSame($expected, $gisData);
}
/**

4
test/classes/Controllers/Import/ImportControllerTest.php
View File

@ -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()

6
test/classes/Controllers/Import/SimulateDmlControllerTest.php
View File

@ -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]);
}
}

12
test/classes/Controllers/JavaScriptMessagesControllerTest.php
View File

@ -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']);
}
}

200
test/classes/Controllers/NavigationControllerTest.php
View File

@ -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();
}
}

30
test/classes/Controllers/NormalizationControllerTest.php
View File

@ -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());
}
}

38
test/classes/Controllers/Server/BinlogControllerTest.php
View File

@ -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);
}
}

22
test/classes/Controllers/Server/CollationsControllerTest.php
View File

@ -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);
}
}

13
test/classes/Controllers/Server/Databases/CreateControllerTest.php
View File

@ -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']);
}
}

6
test/classes/Controllers/Server/Databases/DestroyControllerTest.php
View File

@ -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']);
}
}

52
test/classes/Controllers/Server/DatabasesControllerTest.php
View File

@ -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);
}
}

16
test/classes/Controllers/Server/EnginesControllerTest.php
View File

@ -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);
}
}

20
test/classes/Controllers/Server/PluginsControllerTest.php
View File

@ -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);
}
}

24
test/classes/Controllers/Server/Privileges/AccountLockControllerTest.php
View File

@ -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());
}
}

24
test/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php
View File

@ -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());
}
}

29
test/classes/Controllers/Server/ShowEngineControllerTest.php
View File

@ -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
);

10
test/classes/Controllers/Server/Status/AdvisorControllerTest.php
View File

@ -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());
}
}

6
test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
View File

@ -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']);
}
}

2
test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
View File

@ -63,6 +63,6 @@ class LogVarsControllerTest extends AbstractTestCase
$this->assertAllSelectsConsumed();
$ret = $response->getJSONResult();
$this->assertEquals($value, $ret['message']);
self::assertSame($value, $ret['message']);
}
}

12
test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
View File

@ -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']);
}
}

6
test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
View File

@ -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']);
}
}

53
test/classes/Controllers/Server/Status/MonitorControllerTest.php
View File

@ -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);
}
}

37
test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
View File

@ -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);
}
}

39
test/classes/Controllers/Server/Status/ProcessesControllerTest.php
View File

@ -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);
}
}

63
test/classes/Controllers/Server/Status/QueriesControllerTest.php
View File

@ -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
);

30
test/classes/Controllers/Server/Status/StatusControllerTest.php
View File

@ -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);
}
}

42
test/classes/Controllers/Server/Status/VariablesControllerTest.php
View File

@ -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);
}
}

59
test/classes/Controllers/Server/VariablesControllerTest.php
View File

@ -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);
}
}

36
test/classes/Controllers/Sql/EnumValuesControllerTest.php
View File

@ -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());
}
}

28
test/classes/Controllers/Sql/SetValuesControllerTest.php
View File

@ -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());
}
}

4
test/classes/Controllers/Table/FindReplaceControllerTest.php
View File

@ -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);
}
}

33
test/classes/Controllers/Table/IndexesControllerTest.php
View File

@ -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);
}
}

2
test/classes/Controllers/Table/OperationsControllerTest.php
View File

@ -106,6 +106,6 @@ class OperationsControllerTest extends AbstractTestCase
$controller = $containerBuilder->get(OperationsController::class);
$controller();
$this->assertEquals($expectedOutput, $this->getResponseHtmlResult());
self::assertSame($expectedOutput, $this->getResponseHtmlResult());
}
}

55
test/classes/Controllers/Table/PrivilegesControllerTest.php
View File

@ -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);
}
}

14
test/classes/Controllers/Table/RelationControllerTest.php
View File

@ -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']);
}
}

23
test/classes/Controllers/Table/ReplaceControllerTest.php
View File

@ -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());
}
}

4
test/classes/Controllers/Table/SearchControllerTest.php
View File

@ -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']);
}
}

21
test/classes/Controllers/Table/Structure/ChangeControllerTest.php
View File

@ -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);
}
}

2
test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
View File

@ -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);
}
/**

4
test/classes/Controllers/Table/Structure/SaveControllerTest.php
View File

@ -41,8 +41,6 @@ class SaveControllerTest extends AbstractTestCase
$this->createStub(StructureController::class)
);
$this->assertFalse(
$method->invokeArgs($ctrl, [[]])
);
self::assertFalse($method->invokeArgs($ctrl, [[]]));
}
}

22
test/classes/Controllers/Transformation/OverviewControllerTest.php
View File

@ -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);
}
}

223
test/classes/CoreTest.php
View File

@ -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);
}
}

8
test/classes/CreateAddFieldTest.php
View File

@ -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);
}
}

26
test/classes/Crypto/CryptoTest.php
View File

@ -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));
}
}

199
test/classes/Database/CentralColumnsTest.php
View File

@ -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);
}
}

20
test/classes/Database/Designer/CommonTest.php
View File

@ -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);

61
test/classes/Database/DesignerTest.php
View File

@ -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);
}
}

21
test/classes/Database/EventsTest.php
View File

@ -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);
}
/**

467
test/classes/Database/QbeTest.php
View File

@ -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`']]
));
}
}

Some files were not shown because too many files have changed in this diff Show More