From 45828153b66fce862fe3074673ba502ac4ba0b42 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Mon, 6 Nov 2017 06:26:25 -0200 Subject: [PATCH] Use PSR-1 for PHPUnit TestCase Signed-off-by: Gabriel Caruso --- test/Environment_test.php | 4 +++- test/classes/BookmarkTest.php | 2 +- test/classes/BrowseForeignersTest.php | 2 +- test/classes/CentralColumnsTest.php | 2 +- test/classes/CharsetsTest.php | 2 +- test/classes/CheckUserPrivilegesTest.php | 2 +- test/classes/Config/FormDisplayTemplateTest.php | 2 +- test/classes/Database/DesignerTest.php | 2 +- test/classes/Display/ChangePasswordTest.php | 2 +- test/classes/Display/CreateTableTest.php | 2 +- test/classes/Display/ExportTest.php | 2 +- test/classes/EncodingTest.php | 2 +- test/classes/ExportTest.php | 2 +- test/classes/Gis/GisFactoryTest.php | 2 +- test/classes/Gis/GisGeomTest.php | 2 +- test/classes/Gis/GisGeometryCollectionTest.php | 2 +- test/classes/Gis/GisGeometryTest.php | 2 +- test/classes/ImportTest.php | 2 +- test/classes/InsertEditTest.php | 2 +- test/classes/IpAllowDenyTest.php | 2 +- test/classes/MimeTest.php | 2 +- test/classes/MultSubmitsTest.php | 2 +- test/classes/NormalizationTest.php | 2 +- test/classes/OperationsTest.php | 2 +- test/classes/PmaTestCase.php | 2 +- test/classes/PmdCommonTest.php | 2 +- .../Options/Groups/OptionsPropertyMainGroupTest.php | 2 +- .../Options/Groups/OptionsPropertyRootGroupTest.php | 2 +- .../Properties/Options/Groups/OptionsPropertySubgroupTest.php | 2 +- test/classes/Properties/Options/Items/PropertyItemsTest.php | 2 +- test/classes/Properties/Options/OptionsPropertyGroupTest.php | 2 +- test/classes/Properties/Options/OptionsPropertyItemTest.php | 2 +- .../classes/Properties/Options/OptionsPropertyOneItemTest.php | 2 +- .../classes/Properties/Plugins/ImportPluginPropertiesTest.php | 2 +- test/classes/Properties/Plugins/PluginPropertyItemTest.php | 2 +- test/classes/Properties/PropertyItemTest.php | 2 +- test/classes/RelationCleanupTest.php | 2 +- test/classes/RelationTest.php | 2 +- test/classes/ReplicationGuiTest.php | 2 +- test/classes/Rte/EventsTest.php | 2 +- test/classes/Rte/RoutinesTest.php | 2 +- test/classes/Rte/TriggersTest.php | 2 +- test/classes/SanitizeTest.php | 2 +- test/classes/Server/PrivilegesTest.php | 2 +- test/classes/Server/SelectTest.php | 2 +- test/classes/Server/Status/AdvisorTest.php | 2 +- test/classes/Server/Status/MonitorTest.php | 2 +- test/classes/Server/Status/ProcessesTest.php | 2 +- test/classes/Server/Status/QueriesTest.php | 2 +- test/classes/Server/Status/VariablesTest.php | 2 +- test/classes/Server/StatusTest.php | 2 +- test/classes/Server/UserGroupsTest.php | 2 +- test/classes/Server/UsersTest.php | 2 +- test/classes/Setup/IndexTest.php | 2 +- test/classes/SqlQueryFormTest.php | 2 +- test/classes/SqlTest.php | 2 +- test/classes/SysInfoTest.php | 2 +- test/classes/TrackingTest.php | 2 +- test/classes/TransformationsTest.php | 2 +- test/classes/UrlTest.php | 2 +- test/libraries/Files_test.php | 3 ++- test/libraries/common/PMA_checkbox_test.php | 3 ++- test/libraries/database_interface_test.php | 4 +++- 63 files changed, 69 insertions(+), 63 deletions(-) diff --git a/test/Environment_test.php b/test/Environment_test.php index f378286291..127455634a 100644 --- a/test/Environment_test.php +++ b/test/Environment_test.php @@ -11,12 +11,14 @@ */ require_once 'config.sample.inc.php'; +use PHPUnit\Framework\TestCase; + /** * Environment tests * * @package PhpMyAdmin-test */ -class Environment_Test extends PHPUnit_Framework_TestCase +class Environment_Test extends TestCase { /** * Tests PHP version diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index 638c1686d7..f2fe9b9ac9 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Bookmark; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for Bookmark class diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php index b56804b1e2..af6cc9ddee 100644 --- a/test/classes/BrowseForeignersTest.php +++ b/test/classes/BrowseForeignersTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\BrowseForeigners; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\BrowseForeigners diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php index b7a703bc8c..cfa11d6118 100644 --- a/test/classes/CentralColumnsTest.php +++ b/test/classes/CentralColumnsTest.php @@ -13,7 +13,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Types; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; $GLOBALS['server'] = 1; diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index 64c2378161..6a92b199ca 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Charsets; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for MySQL Charsets diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php index 00e98af5fe..ccf5421330 100644 --- a/test/classes/CheckUserPrivilegesTest.php +++ b/test/classes/CheckUserPrivilegesTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\CheckUserPrivileges; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /* * Include to test. diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php index d8428b09ec..fb8cbde9ad 100644 --- a/test/classes/Config/FormDisplayTemplateTest.php +++ b/test/classes/Config/FormDisplayTemplateTest.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; use PhpMyAdmin\Config\FormDisplayTemplate; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for FromDisplay.tpl.php diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index 97eb660e6d..375cf8ace3 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Database\Designer; use PhpMyAdmin\DatabaseInterface; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Database\Designer diff --git a/test/classes/Display/ChangePasswordTest.php b/test/classes/Display/ChangePasswordTest.php index 860bb38829..a39c3877f8 100644 --- a/test/classes/Display/ChangePasswordTest.php +++ b/test/classes/Display/ChangePasswordTest.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Display\ChangePassword; use PhpMyAdmin\Theme; use PhpMyAdmin\Url; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; require_once 'libraries/config.default.php'; diff --git a/test/classes/Display/CreateTableTest.php b/test/classes/Display/CreateTableTest.php index bd221de8fb..8a97ca9b7c 100644 --- a/test/classes/Display/CreateTableTest.php +++ b/test/classes/Display/CreateTableTest.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Display\CreateTable; use PhpMyAdmin\Theme; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Display\CreateTableTest class diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php index d94d78f71c..de82edbe0f 100644 --- a/test/classes/Display/ExportTest.php +++ b/test/classes/Display/ExportTest.php @@ -13,7 +13,7 @@ use PhpMyAdmin\Plugins; use PhpMyAdmin\Theme; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * class PhpMyAdmin\Tests\Display\ExportTest diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index fe7475543a..fd67b8223c 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Encoding; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for Charset Conversions diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php index d56e0a1693..7f0709c226 100644 --- a/test/classes/ExportTest.php +++ b/test/classes/ExportTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Export; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\ExportTest class diff --git a/test/classes/Gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php index 041cade84e..4899b32a97 100644 --- a/test/classes/Gis/GisFactoryTest.php +++ b/test/classes/Gis/GisFactoryTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisFactory; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Test class for PhpMyAdmin\Gis\GisFactory diff --git a/test/classes/Gis/GisGeomTest.php b/test/classes/Gis/GisGeomTest.php index a9a8b80225..27d97014f0 100644 --- a/test/classes/Gis/GisGeomTest.php +++ b/test/classes/Gis/GisGeomTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Gis; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Abstract parent class for all GIS test classes diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php index 4bfb09044b..f150d5f54a 100644 --- a/test/classes/Gis/GisGeometryCollectionTest.php +++ b/test/classes/Gis/GisGeometryCollectionTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisGeometryCollection; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use TCPDF; /** diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php index 51c74c0e40..969090caa3 100644 --- a/test/classes/Gis/GisGeometryTest.php +++ b/test/classes/Gis/GisGeometryTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Gis; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ReflectionClass; /** diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index 2a38ffd2e5..43d03ce1b2 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Import; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /* * we must set $GLOBALS['server'] here diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index ff84ff019b..75e4f2adf3 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\InsertEdit; use PhpMyAdmin\Response; use PhpMyAdmin\Table; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ReflectionProperty; use stdClass; diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php index 6aafbb0e49..0340fe7678 100644 --- a/test/classes/IpAllowDenyTest.php +++ b/test/classes/IpAllowDenyTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Core; use PhpMyAdmin\IpAllowDeny; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\IpAllowDenyTest class diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php index a7f9ffbdbb..f26d72657b 100644 --- a/test/classes/MimeTest.php +++ b/test/classes/MimeTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Mime; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Test for mime detection. diff --git a/test/classes/MultSubmitsTest.php b/test/classes/MultSubmitsTest.php index 403208a95c..0b9cc67a71 100644 --- a/test/classes/MultSubmitsTest.php +++ b/test/classes/MultSubmitsTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\MultSubmits; use PhpMyAdmin\Url; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\MultSubmitsTest class diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index a87b8516b3..74ddd748c5 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\Normalization; use PhpMyAdmin\Theme; use PhpMyAdmin\Types; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use stdClass; $GLOBALS['server'] = 1; diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php index bf356df017..40fd52bab9 100644 --- a/test/classes/OperationsTest.php +++ b/test/classes/OperationsTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Operations; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for operations diff --git a/test/classes/PmaTestCase.php b/test/classes/PmaTestCase.php index 8e9a8f80b6..b2e72b7a51 100644 --- a/test/classes/PmaTestCase.php +++ b/test/classes/PmaTestCase.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Response; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ReflectionProperty; /** diff --git a/test/classes/PmdCommonTest.php b/test/classes/PmdCommonTest.php index 0328307116..74b32ffc30 100644 --- a/test/classes/PmdCommonTest.php +++ b/test/classes/PmdCommonTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\PmdCommon; use PhpMyAdmin\Relation; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\PmdCommon diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php index e20d24cff8..e1f6e01433 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php index 4f2ba41c8d..804a407550 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class diff --git a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php index e55cf1ecab..7e86a63c2b 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class diff --git a/test/classes/Properties/Options/Items/PropertyItemsTest.php b/test/classes/Properties/Options/Items/PropertyItemsTest.php index 10daf6b02a..64da38d374 100644 --- a/test/classes/Properties/Options/Items/PropertyItemsTest.php +++ b/test/classes/Properties/Options/Items/PropertyItemsTest.php @@ -14,7 +14,7 @@ use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem; use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for *PhpMyAdmin\Properties\PropertyItem class diff --git a/test/classes/Properties/Options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php index 7ce68ae281..2f7adb1c68 100644 --- a/test/classes/Properties/Options/OptionsPropertyGroupTest.php +++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Properties\Options; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ReflectionProperty; /** diff --git a/test/classes/Properties/Options/OptionsPropertyItemTest.php b/test/classes/Properties/Options/OptionsPropertyItemTest.php index c0cdc3eed9..265a2308fa 100644 --- a/test/classes/Properties/Options/OptionsPropertyItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyItemTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Properties\Options; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyItem class diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php index cbc41788a1..1dc8d000e5 100644 --- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Properties\Options; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyOneItem class diff --git a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php index dd98c73681..934721880f 100644 --- a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php +++ b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Properties\Plugins; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for PhpMyAdmin\Properties\Plugins\ImportPluginProperties class diff --git a/test/classes/Properties/Plugins/PluginPropertyItemTest.php b/test/classes/Properties/Plugins/PluginPropertyItemTest.php index 4d319e9abf..8a27540024 100644 --- a/test/classes/Properties/Plugins/PluginPropertyItemTest.php +++ b/test/classes/Properties/Plugins/PluginPropertyItemTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Properties\Plugins; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Properties\Plugins\PluginPropertyItem class diff --git a/test/classes/Properties/PropertyItemTest.php b/test/classes/Properties/PropertyItemTest.php index c7a5374729..564506f41e 100644 --- a/test/classes/Properties/PropertyItemTest.php +++ b/test/classes/Properties/PropertyItemTest.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin\Tests\Properties; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Properties\PropertyItem class diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php index 91ab601b82..6c9ab2ed55 100644 --- a/test/classes/RelationCleanupTest.php +++ b/test/classes/RelationCleanupTest.php @@ -11,7 +11,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Relation; use PhpMyAdmin\RelationCleanup; use PhpMyAdmin\Tests\RelationCleanupDbiMock; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\RelationCleanupTest class diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 7bb8324685..ce091b9bb5 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Relation; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Relation diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php index 4b12e4c473..3fd5e5cac8 100644 --- a/test/classes/ReplicationGuiTest.php +++ b/test/classes/ReplicationGuiTest.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\ReplicationGui; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /* * Include to test. diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php index 601e8f476c..8967b92169 100644 --- a/test/classes/Rte/EventsTest.php +++ b/test/classes/Rte/EventsTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests\Rte; use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Events; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * This class is for testing PhpMyAdmin\Rte\Events methods diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index 4c07a1cdaa..476efc7501 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -11,7 +11,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Routines; use PhpMyAdmin\Types; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * This class is for testing PhpMyAdmin\Rte\Routines methods diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php index fdbac00937..bbd884eb6f 100644 --- a/test/classes/Rte/TriggersTest.php +++ b/test/classes/Rte/TriggersTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests\Rte; use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Triggers; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * This class is for testing PhpMyAdmin\Rte\Triggers methods diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php index ce10f5736d..bf87ef1193 100644 --- a/test/classes/SanitizeTest.php +++ b/test/classes/SanitizeTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Sanitize; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for methods in Sanitize class diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index 45b298092e..c1d156fc92 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\Server\Privileges; use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\PrivilegesTest class diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php index 71bc09a248..24f793f2b3 100644 --- a/test/classes/Server/SelectTest.php +++ b/test/classes/Server/SelectTest.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\Select; use PhpMyAdmin\Theme; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\SelectTest class diff --git a/test/classes/Server/Status/AdvisorTest.php b/test/classes/Server/Status/AdvisorTest.php index ce71d8e3db..6b27d715a9 100644 --- a/test/classes/Server/Status/AdvisorTest.php +++ b/test/classes/Server/Status/AdvisorTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Server\Status\Advisor; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\Status\AdvisorTest class diff --git a/test/classes/Server/Status/MonitorTest.php b/test/classes/Server/Status/MonitorTest.php index b9e1c9bb2f..842fe3b9d8 100644 --- a/test/classes/Server/Status/MonitorTest.php +++ b/test/classes/Server/Status/MonitorTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Server\Status\Monitor; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * this class is for testing PhpMyAdmin\Server\Status\Monitor methods diff --git a/test/classes/Server/Status/ProcessesTest.php b/test/classes/Server/Status/ProcessesTest.php index d9bf0d35ff..a0bb4f97ab 100644 --- a/test/classes/Server/Status/ProcessesTest.php +++ b/test/classes/Server/Status/ProcessesTest.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Server\Status\Processes; use PhpMyAdmin\Theme; use PhpMyAdmin\Url; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\Status\ProcessesTest class diff --git a/test/classes/Server/Status/QueriesTest.php b/test/classes/Server/Status/QueriesTest.php index b05313bee1..9ee99a4590 100644 --- a/test/classes/Server/Status/QueriesTest.php +++ b/test/classes/Server/Status/QueriesTest.php @@ -13,7 +13,7 @@ use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Queries; use PhpMyAdmin\Theme; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\Status\QueriesTest class diff --git a/test/classes/Server/Status/VariablesTest.php b/test/classes/Server/Status/VariablesTest.php index 0e8eab0599..34d80b5842 100644 --- a/test/classes/Server/Status/VariablesTest.php +++ b/test/classes/Server/Status/VariablesTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Variables; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * This class is for testing PhpMyAdmin\Server\Status\Variables methods diff --git a/test/classes/Server/StatusTest.php b/test/classes/Server/StatusTest.php index c342e11b1b..1177d3bb57 100644 --- a/test/classes/Server/StatusTest.php +++ b/test/classes/Server/StatusTest.php @@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Server\Status; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Theme; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\StatusTest class diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php index 0478c4b50c..c03bb60e16 100644 --- a/test/classes/Server/UserGroupsTest.php +++ b/test/classes/Server/UserGroupsTest.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\UserGroups; use PhpMyAdmin\Theme; use PhpMyAdmin\Url; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Server\UserGroups diff --git a/test/classes/Server/UsersTest.php b/test/classes/Server/UsersTest.php index a9577a1004..d939b2690f 100644 --- a/test/classes/Server/UsersTest.php +++ b/test/classes/Server/UsersTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\Users; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * PhpMyAdmin\Tests\Server\UsersTest class diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php index ecace803d3..bca6a1028f 100644 --- a/test/classes/Setup/IndexTest.php +++ b/test/classes/Setup/IndexTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Setup; use PhpMyAdmin\Setup\Index as SetupIndex; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for methods under PhpMyAdmin\Setup\Index diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index 09f60ba2e7..2441b015a4 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -13,7 +13,7 @@ use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Theme; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; //the following definition should be used globally $GLOBALS['server'] = 0; diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 2c5331aa49..ebdb42da32 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Sql; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use stdClass; /** diff --git a/test/classes/SysInfoTest.php b/test/classes/SysInfoTest.php index 8da6de200f..b7cc317c57 100644 --- a/test/classes/SysInfoTest.php +++ b/test/classes/SysInfoTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\SysInfo; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for sysinfo library diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index ff89b9ca18..67d4395784 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Tracking; use PhpMyAdmin\Url; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for PhpMyAdmin\Tracking diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index e37ec9b99d..554385d37c 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Theme; use PhpMyAdmin\Transformations; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * tests for transformation wrappers diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php index 6a8ec190bd..56232c1bfa 100644 --- a/test/classes/UrlTest.php +++ b/test/classes/UrlTest.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Url; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; /** * Tests for methods in URL class diff --git a/test/libraries/Files_test.php b/test/libraries/Files_test.php index 2f7c3a0adb..347e45edbb 100644 --- a/test/libraries/Files_test.php +++ b/test/libraries/Files_test.php @@ -10,13 +10,14 @@ * Include to test. */ +use PHPUnit\Framework\TestCase; /** * tests for bookmark.lib.php * * @package PhpMyAdmin-test */ -class FilesTest extends PHPUnit_Framework_TestCase +class FilesTest extends TestCase { /** * Sets up the fixture, for example, opens a network connection. diff --git a/test/libraries/common/PMA_checkbox_test.php b/test/libraries/common/PMA_checkbox_test.php index 507a1b5259..85c9c4a9aa 100644 --- a/test/libraries/common/PMA_checkbox_test.php +++ b/test/libraries/common/PMA_checkbox_test.php @@ -11,6 +11,7 @@ * Include to test. */ +use PHPUnit\Framework\TestCase; /** ** Test for checkbox.phtml @@ -18,7 +19,7 @@ * @package PhpMyAdmin-test * @group common.lib-tests */ -class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase +class PMA_GetCheckboxTest extends TestCase { /** * Test for checkbox.phtml diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php index 0983a296e8..e247bf3e6d 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/database_interface_test.php @@ -10,12 +10,14 @@ * Include to test. */ + use PHPUnit\Framework\TestCase; + /** * Tests basic functionality of dummy dbi driver * * @package PhpMyAdmin-test */ -class PMA_DBI_Test extends PHPUnit_Framework_TestCase +class PMA_DBI_Test extends TestCase { /** * Configures test parameters.