Bug#883417: Debdiff for FTBFS

[Aurimas Fišeras]

Here is a debdiff from phpmyadmin 4:4.6.6-5 to our local phpmyadmin 
build that fixes FTBFS at least when building in Ubuntu Bionic chroot 
(with phpunit 6.5.5).
diff -Nru phpmyadmin-4.6.6/debian/changelog phpmyadmin-4.6.6/debian/changelog
--- phpmyadmin-4.6.6/debian/changelog	2017-07-10 13:43:06.000000000 +0300
+++ phpmyadmin-4.6.6/debian/changelog	2018-12-05 19:01:54.000000000 +0200
@@ -1,3 +1,11 @@
+phpmyadmin (4:4.6.6-6~vp1) bionic; urgency=medium
+
+  * PHP 7.2 compatibility for often used functionality (#890595).
+  * Backport 45828153b to fix build with phpunit 6,
+    add additional phpunit 6 compatibility fixes (Closes: #883417).
+
+ -- Aurimas Fišeras <auri...@members.fsf.org>  Wed, 05 Dec 2018 19:01:54 +0200
+
 phpmyadmin (4:4.6.6-5) unstable; urgency=medium
 
   * Add alternate dependency to php-mysqli. This seems to help in case people
diff -Nru phpmyadmin-4.6.6/debian/patches/debian.patch phpmyadmin-4.6.6/debian/patches/debian.patch
--- phpmyadmin-4.6.6/debian/patches/debian.patch	2017-04-07 20:21:37.000000000 +0300
+++ phpmyadmin-4.6.6/debian/patches/debian.patch	2018-12-05 14:51:20.000000000 +0200
@@ -4,9 +4,11 @@
  - config file consists of several included files, so we skip mtime check
 From: Michal Čihař <ni...@debian.org>
 Forwarded: not-needed
---- a/libraries/vendor_config.php
-+++ b/libraries/vendor_config.php
-@@ -17,13 +17,13 @@
+Index: phpmyadmin-4.6.6/libraries/vendor_config.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/vendor_config.php
++++ phpmyadmin-4.6.6/libraries/vendor_config.php
+@@ -17,13 +17,13 @@ if (! defined('PHPMYADMIN')) {
   * Path to changelog file, can be gzip compressed. Useful when you want to
   * have documentation somewhere else, eg. /usr/share/doc.
   */
@@ -22,7 +24,7 @@
  
  /**
   * Directory where SQL scripts to create/upgrade configuration storage reside.
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ define('SQL_DIR', './sql/');
   * It is not used directly in code, just a convenient
   * define used further in this file.
   */
@@ -31,7 +33,7 @@
  
  /**
   * Filename of a configuration file.
-@@ -55,23 +55,27 @@
+@@ -55,23 +55,27 @@ define('CUSTOM_FOOTER_FILE', CONFIG_DIR
  /**
   * Default value for check for version upgrades.
   */
diff -Nru phpmyadmin-4.6.6/debian/patches/fix-build-with-phpunit6.patch phpmyadmin-4.6.6/debian/patches/fix-build-with-phpunit6.patch
--- phpmyadmin-4.6.6/debian/patches/fix-build-with-phpunit6.patch	1970-01-01 03:00:00.000000000 +0300
+++ phpmyadmin-4.6.6/debian/patches/fix-build-with-phpunit6.patch	2018-12-05 19:00:53.000000000 +0200
@@ -0,0 +1,2073 @@
+Only in phpmyadmin-4.6.6-temp/debian/patches: .fix-build-with-phpunit6.patch.swp
+Index: phpmyadmin-4.6.6/test/classes/gis/GISFactoryTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/gis/GISFactoryTest.php
++++ phpmyadmin-4.6.6/test/classes/gis/GISFactoryTest.php
+@@ -12,7 +12,8 @@ use PMA\libraries\gis\GISFactory;
+  *
+  * @package PhpMyAdmin-test
+  */
+-class GISFactoryTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class GISFactoryTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/classes/gis/GISGeometrycollectionTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/gis/GISGeometrycollectionTest.php
++++ phpmyadmin-4.6.6/test/classes/gis/GISGeometrycollectionTest.php
+@@ -15,7 +15,8 @@ require_once TCPDF_INC;
+  *
+  * @package PhpMyAdmin-test
+  */
+-class GISGeometryCollectionTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class GISGeometryCollectionTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/classes/gis/GISGeometryTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/gis/GISGeometryTest.php
++++ phpmyadmin-4.6.6/test/classes/gis/GISGeometryTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class GISGeometryTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class GISGeometryTest extends TestCase
+ {
+     /**
+      * @access protected
+Index: phpmyadmin-4.6.6/test/classes/gis/GISGeomTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/gis/GISGeomTest.php
++++ phpmyadmin-4.6.6/test/classes/gis/GISGeomTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-abstract class GISGeomTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++abstract class GISGeomTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
+@@ -13,7 +13,8 @@ use PMA\libraries\properties\options\gro
+  *
+  * @package PhpMyAdmin-test
+  */
+-class OptionsPropertyMainGroupTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class OptionsPropertyMainGroupTest extends TestCase
+ {
+     protected $object;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
+@@ -13,7 +13,8 @@ use PMA\libraries\properties\options\gro
+  *
+  * @package PhpMyAdmin-test
+  */
+-class OptionsPropertyRootGroupTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class OptionsPropertyRootGroupTest extends TestCase
+ {
+     protected $object;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
+@@ -13,7 +13,8 @@ use PMA\libraries\properties\options\gro
+  *
+  * @package PhpMyAdmin-test
+  */
+-class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class OptionsPropertySubgroupTest extends TestCase
+ {
+     protected $object;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/options/items/PropertyItemsTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/items/PropertyItemsTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/items/PropertyItemsTest.php
+@@ -19,7 +19,8 @@ use PMA\libraries\properties\options\ite
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PropertyItemsTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PropertyItemsTest extends TestCase
+ {
+     /**
+      * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getText
+Index: phpmyadmin-4.6.6/test/classes/properties/options/OptionsPropertyGroupTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/OptionsPropertyGroupTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/OptionsPropertyGroupTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class OptionsPropertyGroupTest extends TestCase
+ {
+     protected $stub;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/options/OptionsPropertyItemTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/OptionsPropertyItemTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/OptionsPropertyItemTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class OptionsPropertyItemTest extends TestCase
+ {
+     protected $stub;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/options/OptionsPropertyOneItemTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/options/OptionsPropertyOneItemTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/options/OptionsPropertyOneItemTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class OptionsPropertyOneItemTest extends TestCase
+ {
+     protected $stub;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/plugins/ImportPluginPropertiesTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/plugins/ImportPluginPropertiesTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/plugins/ImportPluginPropertiesTest.php
+@@ -13,7 +13,8 @@ use PMA\libraries\properties\plugins\Imp
+  *
+  * @package PhpMyAdmin-test
+  */
+-class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class ImportPluginPropertiesTest extends TestCase
+ {
+     protected $object;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/plugins/PluginPropertyItemTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/plugins/PluginPropertyItemTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/plugins/PluginPropertyItemTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PluginPropertyItemTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PluginPropertyItemTest extends TestCase
+ {
+     protected $stub;
+ 
+Index: phpmyadmin-4.6.6/test/classes/properties/PropertyItemTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/properties/PropertyItemTest.php
++++ phpmyadmin-4.6.6/test/classes/properties/PropertyItemTest.php
+@@ -11,7 +11,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PropertyItemTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PropertyItemTest extends TestCase
+ {
+     protected $stub;
+ 
+Index: phpmyadmin-4.6.6/test/Environment_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/Environment_test.php
++++ phpmyadmin-4.6.6/test/Environment_test.php
+@@ -16,7 +16,8 @@ require_once 'config.sample.inc.php';
+  *
+  * @package PhpMyAdmin-test
+  */
+-class Environment_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class Environment_Test extends TestCase
+ {
+     /**
+      * Tests PHP version
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_browseUploadFile_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_browseUploadFile_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_browseUploadFile_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetBrowseUploadFileBlock_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_buildActionTitles_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_buildActionTitles_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_buildActionTitles_test.php
+@@ -21,7 +21,8 @@ use PMA\libraries\Theme;
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_BuildActionTitles_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_cache_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_cache_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_cache_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_Cache_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Cache_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_checkParameters_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_checkParameters_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_checkParameters_test.php
+@@ -21,7 +21,8 @@ require_once 'libraries/sanitizing.lib.p
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_CheckParameters_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_ContainsNonPrintableAsciiTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ContainsNonPrintableAsciiTest extends TestCase
+ {
+     /**
+      * data provider for testContainsNonPrintableAscii
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_convert_bit_default_value_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_convert_bit_default_value_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_convert_bit_default_value_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_ConvertBitDefaultValueTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ConvertBitDefaultValueTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_escapeMySqlWildcards_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_escapeMySqlWildcards_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_escapeMySqlWildcards_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_EscapeMySqlWildcardsTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_EscapeMySqlWildcardsTest extends TestCase
+ {
+     /**
+      * data provider for testEscape and testUnEscape
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_expandUserString_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_expandUserString_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_expandUserString_test.php
+@@ -18,7 +18,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ExpandUserString_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ExpandUserString_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_extractColumnSpec_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_extractColumnSpec_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_extractColumnSpec_test.php
+@@ -17,7 +17,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ExtractColumnSpec_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ExtractColumnSpec_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_ExtractValueFromFormattedSize_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ExtractValueFromFormattedSize_Test extends TestCase
+ {
+     /**
+      * Test for extractValueFromFormattedSize
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_foreignKeySupported_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_foreignKeySupported_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_foreignKeySupported_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_IsForeignKeySupportedTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_IsForeignKeySupportedTest extends TestCase
+ {
+     /**
+      * data provider for foreign key supported test
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_formatNumberByteDown_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_formatNumberByteDown_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_formatNumberByteDown_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_FormatNumberByteDown_Test extends TestCase
+ {
+     /**
+      * temporary variable for globals array
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_formatSql_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_formatSql_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_formatSql_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_FormatSql_Test extends TestCase
+ {
+     /**
+      * Test for formatSql
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GenerateHiddenMaxFileSize_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GenerateHiddenMaxFileSize_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getCheckbox_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getCheckbox_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getCheckbox_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetCheckboxTest extends TestCase
+ {
+     /**
+      * Test for getCheckbox
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getDbLink_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getDbLink_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getDbLink_test.php
+@@ -19,7 +19,8 @@ require_once 'libraries/url_generating.l
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetDbLink_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getDivForSliderEffect_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getDivForSliderEffect_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getDivForSliderEffect_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetDivForSliderEffectTest extends TestCase
+ {
+     /**
+      * Test for getDivForSliderEffect
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getDropdown_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getDropdown_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getDropdown_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetDropdownTest extends TestCase
+ {
+     /**
+      * Test for getDropdown
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetFormattedMaximumUploadSize_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getIcon_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getIcon_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getIcon_test.php
+@@ -21,7 +21,8 @@ use PMA\libraries\Theme;
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetIcon_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getRadioFields_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getRadioFields_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getRadioFields_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetRadioFieldsTest extends TestCase
+ {
+     /**
+      * Test for getRadioFields
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_getTitleForTarget_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_getTitleForTarget_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_getTitleForTarget_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_GetTitleForTarget_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetTitleForTarget_Test extends TestCase
+ {
+     /**
+      * Data provider for testGetTitleForTarget
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_localisedDateTimespan_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_localisedDateTimespan_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_localisedDateTimespan_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_LocalisedDateTimespan_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_LocalisedDateTimespan_Test extends TestCase
+ {
+     /**
+      * temporary variable for globals array
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_pow_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_pow_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_pow_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_Pow_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Pow_Test extends TestCase
+ {
+     /**
+      * Test forpow
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_printableBitValue_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_printableBitValue_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_printableBitValue_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_PrintableBitValueTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_PrintableBitValueTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_quoting_slashing_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_quoting_slashing_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_quoting_slashing_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_QuotingSlashing_Test extends TestCase
+ {
+     /**
+      * data provider for PMA\libraries\Util::unQuote test
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_showDocu_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_showDocu_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_showDocu_test.php
+@@ -21,7 +21,8 @@ use PMA\libraries\Theme;
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ShowDocu_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_showMessage_test_disabled.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_showMessage_test_disabled.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_showMessage_test_disabled.php
+@@ -22,7 +22,8 @@ require_once 'libraries/js_escape.lib.ph
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ShowMessage_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_showPHPDocu_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_showPHPDocu_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_showPHPDocu_test.php
+@@ -21,7 +21,8 @@ use PMA\libraries\Theme;
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ShowPHPDocu_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_stringOperations_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_stringOperations_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_stringOperations_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_StringOperations_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_StringOperations_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_unsupportedDatatypes_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_unsupportedDatatypes_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_unsupportedDatatypes_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_UnsupportedDatatypes_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_UnsupportedDatatypes_Test extends TestCase
+ {
+     /**
+      * Test for unsupportedDatatypes
+Index: phpmyadmin-4.6.6/test/libraries/common/PMA_whichCrlf_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/common/PMA_whichCrlf_test.php
++++ phpmyadmin-4.6.6/test/libraries/common/PMA_whichCrlf_test.php
+@@ -18,7 +18,8 @@
+  * @package PhpMyAdmin-test
+  * @group common.lib-tests
+  */
+-class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_WhichCrlf_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/config/PMA_messages_inc_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/config/PMA_messages_inc_test.php
++++ phpmyadmin-4.6.6/test/libraries/config/PMA_messages_inc_test.php
+@@ -15,7 +15,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_MessagesIncTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_MessagesIncTest extends TestCase
+ {
+     /**
+      * Setup for test cases
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_array_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_array_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_array_test.php
+@@ -15,7 +15,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Array_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Array_Test extends TestCase
+ {
+     /**
+      * Test for PMA_arrayRead
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_checkPageValidity_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_checkPageValidity_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_checkPageValidity_test.php
+@@ -13,7 +13,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_CheckPageValidity_Test extends TestCase
+ {
+     protected $goto_whitelist = array(
+         'db_datadict.php',
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_cleanupPathInfo_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_cleanupPathInfo_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_cleanupPathInfo_test.php
+@@ -20,7 +20,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_CleanupPathInfo_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_CleanupPathInfo_Test extends TestCase
+ {
+     /**
+      * Test for PMA_cleanupPathInfo
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_fatalError_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_fatalError_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_fatalError_test.php
+@@ -30,7 +30,8 @@ require_once 'libraries/url_generating.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_FatalError_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_getLinks_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_getLinks_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_getLinks_test.php
+@@ -14,7 +14,8 @@ require_once 'libraries/url_generating.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetLinks_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_get_real_size_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_get_real_size_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_get_real_size_test.php
+@@ -13,7 +13,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_GetRealSize_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetRealSize_Test extends TestCase
+ {
+     /**
+      * Test for
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_getTableCount_test_dis.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_getTableCount_test_dis.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_getTableCount_test_dis.php
+@@ -30,7 +30,8 @@ require_once 'config.sample.inc.php';
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GetTableCount_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_headerLocation_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_headerLocation_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_headerLocation_test.php
+@@ -40,7 +40,8 @@ require_once 'libraries/url_generating.l
+  * @package PhpMyAdmin-test
+  */
+ 
+-class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_HeaderLocation_Test extends TestCase
+ {
+ 
+     protected $oldIISvalue;
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_ifSetOr_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_ifSetOr_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_ifSetOr_test.php
+@@ -13,7 +13,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_IfSetOr_Test extends TestCase
+ {
+     /**
+      * Test for PMA_ifSetOr
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_isAllowedDomain_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_isAllowedDomain_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_isAllowedDomain_test.php
+@@ -11,7 +11,8 @@
+  */
+ require_once 'libraries/core.lib.php';
+ 
+-class PMA_isAllowedDomain_test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_isAllowedDomain_test extends TestCase
+ {
+     /**
+      * Test for unserializing
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_isValid_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_isValid_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_isValid_test.php
+@@ -13,7 +13,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_IsValid_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_IsValid_Test extends TestCase
+ {
+     /**
+      * Data provider for testNoVarType
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_safeUnserialize_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_safeUnserialize_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_safeUnserialize_test.php
+@@ -11,7 +11,8 @@
+  */
+ require_once 'libraries/core.lib.php';
+ 
+-class PMA_safeUnserialize_test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_safeUnserialize_test extends TestCase
+ {
+     /**
+      * Test for unserializing
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_sanitizeMySQLHost_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_sanitizeMySQLHost_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_sanitizeMySQLHost_test.php
+@@ -11,7 +11,8 @@
+  */
+ require_once 'libraries/core.lib.php';
+ 
+-class PMA_sanitizeMySQLHost_test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_sanitizeMySQLHost_test extends TestCase
+ {
+     /**
+      * Test for MySQL host sanitizing
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_securePath_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_securePath_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_securePath_test.php
+@@ -12,7 +12,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_SecurePath extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_SecurePath extends TestCase
+ {
+     /**
+      * Test for replacing dots.
+Index: phpmyadmin-4.6.6/test/libraries/core/PMA_warnMissingExtension_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/core/PMA_warnMissingExtension_test.php
++++ phpmyadmin-4.6.6/test/libraries/core/PMA_warnMissingExtension_test.php
+@@ -20,7 +20,8 @@ require_once 'libraries/sanitizing.lib.p
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_WarnMissingExtension_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/database_interface_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/database_interface_test.php
++++ phpmyadmin-4.6.6/test/libraries/database_interface_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/charset_conversi
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_DBI_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_DBI_Test extends TestCase
+ {
+     /**
+      * Configures test parameters.
+Index: phpmyadmin-4.6.6/test/libraries/Files_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/Files_test.php
++++ phpmyadmin-4.6.6/test/libraries/Files_test.php
+@@ -16,7 +16,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class FilesTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class FilesTest extends TestCase
+ {
+     /**
+      * Sets up the fixture, for example, opens a network connection.
+Index: phpmyadmin-4.6.6/test/libraries/php-gettext/Locales_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/php-gettext/Locales_test.php
++++ phpmyadmin-4.6.6/test/libraries/php-gettext/Locales_test.php
+@@ -6,7 +6,8 @@
+  * @package PhpMyAdmin-test
+  */
+ 
+-class LocaleTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class LocaleTest extends TestCase
+ {
+ 
+     public function test_setlocale_system()
+Index: phpmyadmin-4.6.6/test/libraries/php-gettext/Parsing_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/php-gettext/Parsing_test.php
++++ phpmyadmin-4.6.6/test/libraries/php-gettext/Parsing_test.php
+@@ -6,7 +6,8 @@
+  * @package PhpMyAdmin-test
+  */
+ 
+-class ParsingTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class ParsingTest extends TestCase
+ {
+     /**
+      * Test for extract_plural_forms_header_from_po_header
+Index: phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_FileReader_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/php-gettext/PMA_FileReader_test.php
++++ phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_FileReader_test.php
+@@ -5,7 +5,8 @@
+  * @package PhpMyAdmin-test
+  */
+ 
+-class PMA_FileReader_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_FileReader_Test extends TestCase
+ {
+     /**
+      * @access protected
+Index: phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_gettext_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/php-gettext/PMA_gettext_test.php
++++ phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_gettext_test.php
+@@ -5,7 +5,8 @@
+  * @package PhpMyAdmin-test
+  */
+ 
+-class PMA_Gettext_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Gettext_Test extends TestCase
+ {
+     /**
+      * @access protected
+Index: phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_StreamReader_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/php-gettext/PMA_StreamReader_test.php
++++ phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_StreamReader_test.php
+@@ -5,7 +5,8 @@
+  * @package PhpMyAdmin-test
+  */
+ 
+-class PMA_StreamReader_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_StreamReader_Test extends TestCase
+ {
+     /**
+      * @access protected
+Index: phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_StringReader_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/php-gettext/PMA_StringReader_test.php
++++ phpmyadmin-4.6.6/test/libraries/php-gettext/PMA_StringReader_test.php
+@@ -5,7 +5,8 @@
+  * @package PhpMyAdmin-test
+  */
+ 
+-class PMA_StringReader_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_StringReader_Test extends TestCase
+ {
+     /**
+      * @access protected
+Index: phpmyadmin-4.6.6/test/libraries/PMA_bookmark_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_bookmark_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_bookmark_test.php
+@@ -19,7 +19,8 @@ require_once 'libraries/relation.lib.php
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Bookmark_Test extends TestCase
+ {
+     /**
+      * Sets up the fixture, for example, opens a network connection.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_browse_foreigners_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_browse_foreigners_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_browse_foreigners_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/url_generating.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_BrowseForeignersTest extends TestCase
+ {
+     /**
+      * Setup for test cases
+Index: phpmyadmin-4.6.6/test/libraries/PMA_central_columns_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_central_columns_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_central_columns_test.php
+@@ -29,7 +29,8 @@ require_once 'libraries/central_columns.
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Central_Columns_Test extends TestCase
+ {
+     private $_columnData = array(
+         array(
+Index: phpmyadmin-4.6.6/test/libraries/PMA_charset_conversion_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_charset_conversion_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_charset_conversion_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/iconv_wrapper.li
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Charset_Conversion_Test extends TestCase
+ {
+     /**
+      * Test for PMA_convertString
+Index: phpmyadmin-4.6.6/test/libraries/PMA_check_user_privileges_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_check_user_privileges_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_check_user_privileges_test.php
+@@ -22,7 +22,8 @@ require_once 'libraries/check_user_privi
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_CheckUserPrivileges_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_CheckUserPrivileges_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_config_functions_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_config_functions_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_config_functions_test.php
+@@ -17,7 +17,8 @@ require_once 'libraries/sanitizing.lib.p
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Config_Functions_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Config_Functions_Test extends TestCase
+ {
+     /**
+      * Test for PMA_lang
+Index: phpmyadmin-4.6.6/test/libraries/PMA_designer_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_designer_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_designer_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/plugin_interface
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_DesignerTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_DesignerTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_display_change_password_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_display_change_password_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_display_change_password_test.php
+@@ -28,7 +28,8 @@ require_once 'libraries/config.default.p
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_DisplayChangePassword_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_display_create_table_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_display_create_table_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_display_create_table_test.php
+@@ -30,7 +30,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_DisplayCreateTable_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_DisplayCreateTable_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_display_export_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_display_export_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_display_export_test.php
+@@ -31,7 +31,8 @@ require_once 'libraries/relation.lib.php
+  * @package PhpMyAdmin-test
+  * @group large
+  */
+-class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_DisplayExport_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_escapeJsString_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_escapeJsString_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_escapeJsString_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_EscapeJsString_Test extends TestCase
+ {
+     /**
+      * PMA_escapeJsString tests
+Index: phpmyadmin-4.6.6/test/libraries/PMA_export_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_export_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_export_test.php
+@@ -21,7 +21,8 @@ require_once 'libraries/export.lib.php';
+  * @package PhpMyAdmin-test
+  * @group large
+  */
+-class PMA_Export_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Export_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_FormDisplay_tpl_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_FormDisplay_tpl_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_FormDisplay_tpl_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_FormDisplay_Tpl_Test extends TestCase
+ {
+     /**
+      * Test for PMA_displayFormTop()
+Index: phpmyadmin-4.6.6/test/libraries/PMA_Form_Processing_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_Form_Processing_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_Form_Processing_test.php
+@@ -17,7 +17,8 @@ require_once 'setup/lib/form_processing.
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Form_Processing_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_generateCommonUrl_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_generateCommonUrl_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_generateCommonUrl_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/url_generating.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GenerateCommonURL_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_GIS_modifyQuery_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_GIS_modifyQuery_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_GIS_modifyQuery_test.php
+@@ -17,7 +17,8 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_GIS_ModifyQueryTest extends TestCase
+ {
+      //@todo: Move this test to GIS_Visualization's
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_iconv_wrapper_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_iconv_wrapper_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_iconv_wrapper_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/iconv_wrapper.li
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Iconv_Wrapper_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Iconv_Wrapper_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_import_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_import_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_import_test.php
+@@ -31,7 +31,8 @@ require_once 'libraries/url_generating.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Import_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Import_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_insert_edit_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_insert_edit_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_insert_edit_test.php
+@@ -29,7 +29,8 @@ require_once 'libraries/sanitizing.lib.p
+  * @package PhpMyAdmin-test
+  * @group medium
+  */
+-class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_InsertEditTest extends TestCase
+ {
+     /**
+      * Setup for test cases
+Index: phpmyadmin-4.6.6/test/libraries/PMA_ip_allow_deny_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_ip_allow_deny_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_ip_allow_deny_test.php
+@@ -21,7 +21,8 @@ require_once 'libraries/ip_allow_deny.li
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Ip_Allow_Deny_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_js_escape_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_js_escape_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_js_escape_test.php
+@@ -17,7 +17,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_JS_Escape_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_JS_Escape_Test extends TestCase
+ {
+     /**
+      * Test for PMA_getJsValue
+Index: phpmyadmin-4.6.6/test/libraries/PMA_kanji-encoding_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_kanji-encoding_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_kanji-encoding_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/kanji-encoding.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Kanji_Encoding_Test extends TestCase
+ {
+     /**
+      * Test for PMA_Kanji_checkEncoding
+Index: phpmyadmin-4.6.6/test/libraries/PMA_mime_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_mime_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_mime_test.php
+@@ -17,7 +17,8 @@ require_once 'libraries/mime.lib.php';
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_MIME_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_MIME_Test extends TestCase
+ {
+     /**
+      * Test for PMA_detectMIME
+Index: phpmyadmin-4.6.6/test/libraries/PMA_mysql_charsets_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_mysql_charsets_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_mysql_charsets_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/mysql_charsets.i
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_MySQL_Charsets_Test extends TestCase
+ {
+     /**
+      * Test for PMA_generateCharsetQueryPart
+Index: phpmyadmin-4.6.6/test/libraries/PMA_mult_submits_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_mult_submits_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_mult_submits_test.php
+@@ -32,7 +32,8 @@ require_once 'libraries/sql.lib.php';
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_MultSubmits_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_normalization_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_normalization_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_normalization_test.php
+@@ -30,7 +30,8 @@ require_once 'libraries/normalization.li
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Normalization_Test extends TestCase
+ {
+     /**
+      * prepares environment for tests
+Index: phpmyadmin-4.6.6/test/libraries/PMA_operations_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_operations_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_operations_test.php
+@@ -27,7 +27,8 @@ require_once 'libraries/mysql_charsets.i
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Operations_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Operations_Test extends TestCase
+ {
+     /**
+      * Set up global environment.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_PMD_common_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_PMD_common_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_PMD_common_test.php
+@@ -13,7 +13,8 @@ require_once 'libraries/database_interfa
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_PMD_CommonTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_relation_cleanup_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_relation_cleanup_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_relation_cleanup_test.php
+@@ -25,7 +25,8 @@ use PMA\libraries\DatabaseInterface;
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Relation_Cleanup_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_relation_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_relation_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_relation_test.php
+@@ -23,7 +23,8 @@ require_once 'libraries/relation.lib.php
+  * @package PhpMyAdmin-test
+  * @group medium
+  */
+-class PMA_Relation_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Relation_Test extends TestCase
+ {
+     /**
+      * Sets up the fixture, for example, opens a network connection.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_resultSetHasJustOneTable_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_resultSetHasJustOneTable_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_resultSetHasJustOneTable_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/sql.lib.php';
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ResultSetHasJustOneTableTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ResultSetHasJustOneTableTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_sanitize_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_sanitize_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_sanitize_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/url_generating.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Sanitize_Test extends TestCase
+ {
+     /**
+      * Setup various pre conditions
+Index: phpmyadmin-4.6.6/test/libraries/PMA_select_server_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_select_server_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_select_server_test.php
+@@ -27,7 +27,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_SelectServer_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_SelectServer_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_common_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_common_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_common_test.php
+@@ -23,7 +23,8 @@ require_once 'libraries/server_common.li
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerCommon_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerCommon_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_privileges_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_privileges_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_privileges_test.php
+@@ -31,7 +31,8 @@ require_once 'libraries/server_privilege
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerPrivileges_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_replication_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_replication_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_replication_test.php
+@@ -29,7 +29,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerReplication_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_status_advisor_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_status_advisor_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_status_advisor_test.php
+@@ -30,7 +30,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerStatusAdvisor_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_status_monitor_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_status_monitor_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_status_monitor_test.php
+@@ -29,7 +29,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerStatusMonitor_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_status_processes_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_status_processes_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_status_processes_test.php
+@@ -27,7 +27,8 @@ require_once 'libraries/sanitizing.lib.p
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerStatusProcesses_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_status_queries_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_status_queries_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_status_queries_test.php
+@@ -30,7 +30,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerStatusQueries_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_status_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_status_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_status_test.php
+@@ -26,7 +26,8 @@ require_once 'libraries/database_interfa
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerStatus_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_status_variables_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_status_variables_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_status_variables_test.php
+@@ -29,7 +29,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerStatusVariables_Test extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_user_groups_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_user_groups_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_user_groups_test.php
+@@ -23,7 +23,8 @@ require_once 'libraries/server_user_grou
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerUserGroupsTest extends TestCase
+ {
+     /**
+      * Prepares environment for the test.
+Index: phpmyadmin-4.6.6/test/libraries/PMA_server_users_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_server_users_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_server_users_test.php
+@@ -20,7 +20,8 @@ require_once 'libraries/server_users.lib
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ServerUsers_Test extends TestCase
+ {
+     /**
+      * Test for PMA_getHtmlForSubMenusOnUsersPage
+Index: phpmyadmin-4.6.6/test/libraries/PMA_SetupIndex_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_SetupIndex_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_SetupIndex_test.php
+@@ -22,7 +22,8 @@ require_once 'libraries/sanitizing.lib.p
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_SetupIndex_Test extends TestCase
+ {
+     /**
+      * SetUp for test cases
+Index: phpmyadmin-4.6.6/test/libraries/PMA_sql_query_form_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_sql_query_form_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_sql_query_form_test.php
+@@ -33,7 +33,8 @@ require_once 'libraries/mysql_charsets.i
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_SqlQueryForm_Test extends TestCase
+ {
+     /**
+      * Test for setUp
+Index: phpmyadmin-4.6.6/test/libraries/PMA_sql_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_sql_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_sql_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/sql.lib.php';
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_SqlTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_SqlTest extends TestCase
+ {
+     /**
+      * Test PMA_getSqlWithLimitClause
+Index: phpmyadmin-4.6.6/test/libraries/PMA_tbl_tracking_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_tbl_tracking_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_tbl_tracking_test.php
+@@ -25,7 +25,8 @@ require_once 'libraries/js_escape.lib.ph
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_TblTrackingTest extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_transformation_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_transformation_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_transformation_test.php
+@@ -20,7 +20,8 @@ require_once 'libraries/relation.lib.php
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_Transformation_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_user_preferences_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_user_preferences_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_user_preferences_test.php
+@@ -22,7 +22,8 @@ require_once 'libraries/sanitizing.lib.p
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_User_Preferences_Test extends TestCase
+ {
+ 
+     /**
+Index: phpmyadmin-4.6.6/test/libraries/PMA_zip_extension_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/PMA_zip_extension_test.php
++++ phpmyadmin-4.6.6/test/libraries/PMA_zip_extension_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/zip_extension.li
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_ZipExtension_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_ZipExtension_Test extends TestCase
+ {
+     /**
+      * Test zip file content
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/rte/rte_events.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_EVN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_EVN_GetDataFromRequest_Test extends TestCase
+ {
+     /**
+      * Test for PMA_EVN_getDataFromRequest
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_EVN_getEditorForm_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+@@ -18,7 +18,8 @@ require_once 'libraries/rte/rte_events.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_EVN_GetEditorForm_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
+@@ -25,7 +25,8 @@ require_once 'libraries/rte/rte_events.l
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_EVN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_EVN_GetQueryFromRequest_Test extends TestCase
+ {
+     /**
+      * Test for PMA_EVN_getQueryFromRequest
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+@@ -20,7 +20,8 @@ require_once 'libraries/rte/rte_routines
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_RTN_GetDataFromRequest_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_RTN_getEditorForm_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+@@ -27,7 +27,8 @@ require_once 'libraries/rte/rte_routines
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_RTN_GetEditorForm_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+@@ -24,7 +24,8 @@ require_once 'libraries/rte/rte_routines
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_RTN_GetExecuteForm_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+@@ -24,7 +24,8 @@ require_once 'libraries/rte/rte_routines
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_RTN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_RTN_GetQueryFromRequest_Test extends TestCase
+ {
+     /**
+      * Test for PMA_RTN_getQueryFromRequest
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
+@@ -16,7 +16,8 @@ require_once 'libraries/rte/rte_triggers
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_TRI_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_TRI_GetDataFromRequest_Test extends TestCase
+ {
+     /**
+      * Test for PMA_TRI_getDataFromRequest
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_TRI_getEditorForm_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+@@ -20,7 +20,8 @@ require_once 'libraries/rte/rte_triggers
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_TRI_GetEditorForm_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
++++ phpmyadmin-4.6.6/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
+@@ -27,7 +27,8 @@ require_once 'libraries/database_interfa
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_TRI_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_TRI_GetQueryFromRequest_Test extends TestCase
+ {
+     /**
+      * Set up
+Index: phpmyadmin-4.6.6/test/libraries/sysinfo_test.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/libraries/sysinfo_test.php
++++ phpmyadmin-4.6.6/test/libraries/sysinfo_test.php
+@@ -13,7 +13,8 @@ require_once 'libraries/sysinfo.lib.php'
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMA_SysInfoTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMA_SysInfoTest extends TestCase
+ {
+     /**
+      * Test for OS detection
+Index: phpmyadmin-4.6.6/test/PMATestCase.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/PMATestCase.php
++++ phpmyadmin-4.6.6/test/PMATestCase.php
+@@ -11,11 +11,12 @@
+  *
+  * @package PhpMyAdmin-test
+  */
+-class PMATestCase extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++class PMATestCase extends TestCase
+ {
+     public static function setUpBeforeClass()
+     {
+         require 'libraries/config.default.php';
+         $GLOBALS['cfg'] = $cfg;
+     }
+-}
+\ No newline at end of file
++}
+Index: phpmyadmin-4.6.6/test/classes/ConfigTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/ConfigTest.php
++++ phpmyadmin-4.6.6/test/classes/ConfigTest.php
+@@ -11,6 +11,7 @@
+  * Include to test.
+  */
+ use PMA\libraries\Theme;
++use PHPUnit\Framework\Assert;
+ 
+ require_once 'libraries/relation.lib.php';
+ require_once 'libraries/url_generating.lib.php';
+@@ -838,8 +839,8 @@ class ConfigTest extends PMATestCase
+         $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
+ 
+         $partial_sum = (
+-            PHPUnit_Framework_Assert::readAttribute($this->object, 'source_mtime') +
+-            PHPUnit_Framework_Assert::readAttribute(
++            Assert::readAttribute($this->object, 'source_mtime') +
++            Assert::readAttribute(
+                 $this->object,
+                 'default_source_mtime'
+             ) +
+Index: phpmyadmin-4.6.6/test/classes/TrackerTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/TrackerTest.php
++++ phpmyadmin-4.6.6/test/classes/TrackerTest.php
+@@ -10,6 +10,7 @@
+  * Include to test.
+  */
+ use PMA\libraries\Tracker;
++use PHPUnit\Framework\Assert;
+ 
+ require_once 'libraries/database_interface.inc.php';
+ require_once 'libraries/relation.lib.php';
+@@ -66,7 +67,7 @@ class TrackerTest extends PMATestCase
+     {
+         Tracker::enable();
+         $this->assertTrue(
+-            PHPUnit_Framework_Assert::readAttribute('PMA\libraries\Tracker', 'enabled')
++            Assert::readAttribute('PMA\libraries\Tracker', 'enabled')
+         );
+     }
+ 
+Index: phpmyadmin-4.6.6/test/classes/navigation/NodeFactoryTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/navigation/NodeFactoryTest.php
++++ phpmyadmin-4.6.6/test/classes/navigation/NodeFactoryTest.php
+@@ -9,6 +9,7 @@
+ use PMA\libraries\navigation\NodeFactory;
+ use PMA\libraries\navigation\nodes\Node;
+ use PMA\libraries\Theme;
++use PHPUnit\Framework\Exception;
+ 
+ require_once 'libraries/navigation/NodeFactory.php';
+ require_once 'test/PMATestCase.php';
+@@ -86,7 +87,7 @@ class NodeFactoryTest extends PMATestCas
+      */
+     public function testFileError()
+     {
+-        $this->setExpectedException('PHPUnit_Framework_Error');
++        $this->expectException(Exception::class);
+         NodeFactory::getInstance('NodeDoesNotExist');
+     }
+ 
+@@ -97,7 +98,7 @@ class NodeFactoryTest extends PMATestCas
+      */
+     public function testClassNameError()
+     {
+-        $this->setExpectedException('PHPUnit_Framework_Error');
++        $this->expectException(Exception::class);
+         NodeFactory::getInstance('Invalid');
+     }
+ }
+Index: phpmyadmin-4.6.6/test/classes/ErrorTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/ErrorTest.php
++++ phpmyadmin-4.6.6/test/classes/ErrorTest.php
+@@ -127,7 +127,7 @@ class ErrorTest extends PMATestCase
+     public function testGetBacktraceDisplay()
+     {
+         $this->assertContains(
+-            'PHPUnit_Framework_TestResult->run(<Class:ErrorTest>)<br />',
++            'PHPUnit\Framework\TestResult->run(<Class:ErrorTest>)<br />',
+             $this->object->getBacktraceDisplay()
+         );
+     }
+Index: phpmyadmin-4.6.6/test/classes/AdvisorTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/AdvisorTest.php
++++ phpmyadmin-4.6.6/test/classes/AdvisorTest.php
+@@ -251,7 +251,8 @@ class AdvisorTest extends PMATestCase
+                 array(),
+                 'Failed formatting string for rule \'Failure\'. PHP threw ' .
+                 'following error: Use of undefined constant fsafdsa - ' .
+-                'assumed \'fsafdsa\'<br />Executed code: $value = array(fsafdsa);',
++		'assumed \'fsafdsa\' (this will throw an Error in a ' .
++		'future version of PHP)<br />Executed code: $value = array(fsafdsa);',
+             ),
+             array(
+                 array(
+Index: phpmyadmin-4.6.6/libraries/plugins/auth/AuthenticationSignon.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/plugins/auth/AuthenticationSignon.php
++++ phpmyadmin-4.6.6/libraries/plugins/auth/AuthenticationSignon.php
+@@ -92,15 +92,13 @@ class AuthenticationSignon extends Authe
+         } elseif (isset($_COOKIE[$session_name])) { /* Does session exist? */
+             /* End current session */
+             $old_session = session_name();
+-            $old_id = session_id();
+-            if (!defined('TESTSUITE')) {
+-                session_write_close();
+-            }
++	    $old_id = session_id();
+ 
+             /* Load single signon session */
+-            session_name($session_name);
+-            session_id($_COOKIE[$session_name]);
+-            if (!defined('TESTSUITE')) {
++	    if (!defined('TESTSUITE')) {
++                session_write_close();
++		session_name($session_name);
++		session_id($_COOKIE[$session_name]);
+                 session_start();
+             }
+ 
+@@ -211,15 +209,13 @@ class AuthenticationSignon extends Authe
+ 
+         /* Does session exist? */
+         if (isset($_COOKIE[$session_name])) {
+-            /* End current session */
+             if (!defined('TESTSUITE')) {
++		/* End current session */
+                 session_write_close();
+-            }
+ 
+-            /* Load single signon session */
+-            session_name($session_name);
+-            session_id($_COOKIE[$session_name]);
+-            if (!defined('TESTSUITE')) {
++		/* Load single signon session */
++	        session_name($session_name);
++	        session_id($_COOKIE[$session_name]);
+                 session_start();
+             }
+ 
+Index: phpmyadmin-4.6.6/test/classes/ThemeTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/ThemeTest.php
++++ phpmyadmin-4.6.6/test/classes/ThemeTest.php
+@@ -169,7 +169,7 @@ class ThemeTest extends PMATestCase
+      * Test fir Theme::checkImgPath
+      *
+      * @return void
+-     * @expectedException PHPUnit_Framework_Error
++     * @expectedException PHPUnit\Framework\Exception
+      */
+     public function testCheckImgPathBad()
+     {
+@@ -206,7 +206,7 @@ class ThemeTest extends PMATestCase
+      * Test for Theme::checkImgPath
+      *
+      * @return void
+-     * @expectedException PHPUnit_Framework_Error
++     * @expectedException PHPUnit\Framework\Exception
+      */
+     public function testCheckImgPathGlobalsWrongPath()
+     {
+Index: phpmyadmin-4.6.6/test/classes/TableTest.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/test/classes/TableTest.php
++++ phpmyadmin-4.6.6/test/classes/TableTest.php
+@@ -874,7 +874,7 @@ class TableTest extends PMATestCase
+         $dbi->expects($this->once())
+             ->method('getFieldsMeta')
+             ->with("v1")
+-            ->will($this->returnValue('movecols'));
++            ->will($this->returnValue(array('movecols')));
+ 
+         $GLOBALS['dbi'] = $dbi;
+ 
+@@ -882,7 +882,7 @@ class TableTest extends PMATestCase
+ 
+         $this->assertEquals(
+             $tableObj->getColumnsMeta(),
+-            'movecols'
++            array('movecols')
+         );
+     }
+ 
diff -Nru phpmyadmin-4.6.6/debian/patches/php7.2-compatibility.patch phpmyadmin-4.6.6/debian/patches/php7.2-compatibility.patch
--- phpmyadmin-4.6.6/debian/patches/php7.2-compatibility.patch	1970-01-01 03:00:00.000000000 +0300
+++ phpmyadmin-4.6.6/debian/patches/php7.2-compatibility.patch	2018-12-05 19:01:54.000000000 +0200
@@ -0,0 +1,163 @@
+Index: phpmyadmin-4.6.6/libraries/plugin_interface.lib.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/plugin_interface.lib.php
++++ phpmyadmin-4.6.6/libraries/plugin_interface.lib.php
+@@ -548,7 +548,7 @@ function PMA_pluginGetOptions($section,
+         $ret .= '<h3>' . PMA_getString($text) . '</h3>';
+ 
+         $no_options = true;
+-        if ($options != null && count($options) > 0) {
++        if ($options != null) {
+             foreach ($options->getProperties()
+                 as $propertyMainGroup
+             ) {
+Index: phpmyadmin-4.6.6/libraries/sql.lib.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/sql.lib.php
++++ phpmyadmin-4.6.6/libraries/sql.lib.php
+@@ -610,7 +610,7 @@ function PMA_isRememberSortingOrder($ana
+             || $analyzed_sql_results['is_analyse'])
+         && $analyzed_sql_results['select_from']
+         && ((empty($analyzed_sql_results['select_expr']))
+-            || (count($analyzed_sql_results['select_expr'] == 1)
++            || (count($analyzed_sql_results['select_expr']) == 1
+                 && ($analyzed_sql_results['select_expr'][0] == '*')))
+         && count($analyzed_sql_results['select_tables']) == 1;
+ }
+Index: phpmyadmin-4.6.6/libraries/import.lib.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/import.lib.php
++++ phpmyadmin-4.6.6/libraries/import.lib.php
+@@ -1203,7 +1203,7 @@ function PMA_buildSQL($db_name, &$tables
+ 
+     $inTables = false;
+ 
+-    $additional_sql_len = count($additional_sql);
++    $additional_sql_len = (is_null($additional_sql) ? 0 : count($additional_sql));
+     for ($i = 0; $i < $additional_sql_len; ++$i) {
+         preg_match($view_pattern, $additional_sql[$i], $regs);
+ 
+Index: phpmyadmin-4.6.6/libraries/Table.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/Table.php
++++ phpmyadmin-4.6.6/libraries/Table.php
+@@ -1459,7 +1459,7 @@ class Table
+ 
+         $return = array();
+         foreach ($uniques as $index) {
+-            if (count($index) > 1) {
++            if (is_array($index) && count($index) > 1) {
+                 continue;
+             }
+             if ($fullName) {
+Index: phpmyadmin-4.6.6/libraries/pmd_common.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/pmd_common.php
++++ phpmyadmin-4.6.6/libraries/pmd_common.php
+@@ -402,7 +402,7 @@ function PMA_getLoadingPage($db)
+             $GLOBALS['controllink'],
+             PMA\libraries\DatabaseInterface::QUERY_STORE
+         );
+-        if (count($min_page_no[0])) {
++        if (is_array($min_page_no) && isset($min_page_no[0])) {
+             $page_no = $min_page_no[0];
+         }
+     }
+Index: phpmyadmin-4.6.6/libraries/DatabaseInterface.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/DatabaseInterface.php
++++ phpmyadmin-4.6.6/libraries/DatabaseInterface.php
+@@ -1763,7 +1763,7 @@ class DatabaseInterface
+      *
+      * @return array supported SQL compatibility modes
+      */
+-    public function getCompatibilities()
++    public function getCompatibilities() : array
+     {
+         $compats = array('NONE');
+         $compats[] = 'ANSI';
+@@ -2611,7 +2611,7 @@ class DatabaseInterface
+      *
+      * @return array meta info for fields in $result
+      */
+-    public function getFieldsMeta($result)
++    public function getFieldsMeta($result) : array
+     {
+         $result = $this->_extension->getFieldsMeta($result);
+ 
+Index: phpmyadmin-4.6.6/libraries/plugins/auth/AuthenticationSignon.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/plugins/auth/AuthenticationSignon.php
++++ phpmyadmin-4.6.6/libraries/plugins/auth/AuthenticationSignon.php
+@@ -135,14 +135,12 @@ class AuthenticationSignon extends Authe
+             /* End single signon session */
+             if (!defined('TESTSUITE')) {
+                 session_write_close();
+-            }
+ 
+-            /* Restart phpMyAdmin session */
+-            session_name($old_session);
+-            if (!empty($old_id)) {
+-                session_id($old_id);
+-            }
+-            if (!defined('TESTSUITE')) {
++		/* Restart phpMyAdmin session */
++		session_name($old_session);
++		if (!empty($old_id)) {
++			session_id($old_id);
++		}
+                 session_start();
+             }
+ 
+Index: phpmyadmin-4.6.6/libraries/dbi/DBIDummy.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/dbi/DBIDummy.php
++++ phpmyadmin-4.6.6/libraries/dbi/DBIDummy.php
+@@ -1197,7 +1197,7 @@ class DBIDummy implements DBIExtension
+      *
+      * @return array meta info for fields in $result
+      */
+-    public function getFieldsMeta($result)
++    public function getFieldsMeta($result) : array
+     {
+         return array();
+     }
+Index: phpmyadmin-4.6.6/libraries/dbi/DBIExtension.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/dbi/DBIExtension.php
++++ phpmyadmin-4.6.6/libraries/dbi/DBIExtension.php
+@@ -195,7 +195,7 @@ interface DBIExtension
+      *
+      * @return array meta info for fields in $result
+      */
+-    public function getFieldsMeta($result);
++    public function getFieldsMeta($result) : array;
+ 
+     /**
+      * return number of fields in given $result
+Index: phpmyadmin-4.6.6/libraries/dbi/DBIMysql.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/dbi/DBIMysql.php
++++ phpmyadmin-4.6.6/libraries/dbi/DBIMysql.php
+@@ -395,7 +395,7 @@ class DBIMysql implements DBIExtension
+      *
+      * @todo add missing keys like in mysqli_query (decimals)
+      */
+-    public function getFieldsMeta($result)
++    public function getFieldsMeta($result) : array
+     {
+         $fields       = array();
+         $num_fields   = mysql_num_fields($result);
+Index: phpmyadmin-4.6.6/libraries/dbi/DBIMysqli.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/dbi/DBIMysqli.php
++++ phpmyadmin-4.6.6/libraries/dbi/DBIMysqli.php
+@@ -473,7 +473,7 @@ class DBIMysqli implements DBIExtension
+      *
+      * @return array meta info for fields in $result
+      */
+-    public function getFieldsMeta($result)
++    public function getFieldsMeta($result) : array
+     {
+         // Build an associative array for a type look up
+         $typeAr = array();
diff -Nru phpmyadmin-4.6.6/debian/patches/series phpmyadmin-4.6.6/debian/patches/series
--- phpmyadmin-4.6.6/debian/patches/series	2017-04-07 20:21:37.000000000 +0300
+++ phpmyadmin-4.6.6/debian/patches/series	2018-12-05 11:20:04.000000000 +0200
@@ -1,2 +1,4 @@
 Truncate-only-long-passwords.patch
 debian.patch
+php7.2-compatibility.patch
+fix-build-with-phpunit6.patch
diff -Nru phpmyadmin-4.6.6/debian/patches/Truncate-only-long-passwords.patch phpmyadmin-4.6.6/debian/patches/Truncate-only-long-passwords.patch
--- phpmyadmin-4.6.6/debian/patches/Truncate-only-long-passwords.patch	2017-04-07 20:21:37.000000000 +0300
+++ phpmyadmin-4.6.6/debian/patches/Truncate-only-long-passwords.patch	2018-12-05 14:51:20.000000000 +0200
@@ -14,9 +14,11 @@
  libraries/common.inc.php | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/libraries/common.inc.php
-+++ b/libraries/common.inc.php
-@@ -739,7 +739,7 @@
+Index: phpmyadmin-4.6.6/libraries/common.inc.php
+===================================================================
+--- phpmyadmin-4.6.6.orig/libraries/common.inc.php
++++ phpmyadmin-4.6.6/libraries/common.inc.php
+@@ -739,7 +739,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                  . ' ' . $cfg['Server']['auth_type']
              );
          }