Merge remote-tracking branch 'origin/master'

composer.json

@@ -28,7 +28,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "PhpMyAdmin\\Tests\\": "test/classes"
+            "PhpMyAdmin\\Tests\\": "test/classes",
+            "PhpMyAdmin\\Tests\\Selenium\\": "test/selenium/"
         }
     },
     "repositories": [

test/selenium/ChangePasswordTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumPrivilegesTest class
+ * PrivilegesTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumChangePasswordTest extends PMA_SeleniumBase
+class ChangePasswordTest extends TestBase
 {
     /**
      * Tests the changing of the password

test/selenium/CreateDropDatabaseTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumCreateDropDatabaseTest class
+ * CreateDropDatabaseTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumCreateDropDatabaseTest extends PMA_SeleniumBase
+class CreateDropDatabaseTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/CreateRemoveUserTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumCreateRemoveUserTest class
+ * CreateRemoveUserTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumCreateRemoveUserTest extends PMA_SeleniumBase
+class CreateRemoveUserTest extends TestBase
 {
     /**
      * Username for the user

test/selenium/DbEventsTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbEventsTest class
+ * DbEventsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumDbEventsTest extends PMA_SeleniumBase
+class DbEventsTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/DbOperationsTest.php

@@ -7,17 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
-
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbOperationsTest class
+ * DbOperationsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumDbOperationsTest extends PMA_SeleniumBase
+class DbOperationsTest extends TestBase
 {
     /**
      * setUp function that can use the selenium session (called before each test)

test/selenium/DbProceduresTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbProceduresTest class
+ * DbProceduresTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumDbProceduresTest extends PMA_SeleniumBase
+class DbProceduresTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/DbStructureTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbStructureTest class
+ * DbStructureTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumDbStructureTest extends PMA_SeleniumBase
+class DbStructureTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/DbTriggersTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbTriggersTest class
+ * DbTriggersTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumDbTriggersTest extends PMA_SeleniumBase
+class DbTriggersTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/ExportTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumExportTest class
+ * ExportTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumExportTest extends PMA_SeleniumBase
+class ExportTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/ImportTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumImportTest class
+ * ImportTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumImportTest extends PMA_SeleniumBase
+class ImportTest extends TestBase
 {
     /**
      * setUp function that can use the selenium session (called before each test)

test/selenium/LoginTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumLoginTest class
+ * LoginTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumLoginTest extends PMA_SeleniumBase
+class LoginTest extends TestBase
 {
     public function setUpPage()
     {

test/selenium/NormalizationTest.php

@@ -7,7 +7,7 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
  * PMA_SeleniumNormalizationTest class
@@ -16,7 +16,7 @@ require_once 'TestBase.php';
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumNormalizationTest extends PMA_SeleniumBase
+class NormalizationTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/QueryByExampleTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumQueryByExampleTest class
+ * QueryByExampleTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumQueryByExampleTest extends PMA_SeleniumBase
+class QueryByExampleTest extends TestBase
 {
 
     /**

test/selenium/ServerSettingsTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumServerSettingsTest class
+ * ServerSettingsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumSettingsTest extends PMA_SeleniumBase
+class SettingsTest extends TestBase
 {
     /**
      * setUp function that can use the selenium session (called before each test)

test/selenium/SqlQueryTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumSqlQueryTest class
+ * SqlQueryTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumSqlQueryTest extends PMA_SeleniumBase
+class SqlQueryTest extends TestBase
 {
 
     /**

test/selenium/TableBrowseTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableBrowseTest class
+ * TableBrowseTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
+class TableBrowseTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/TableCreateTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableCreateTest class
+ * TableCreateTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumTableCreateTest extends PMA_SeleniumBase
+class TableCreateTest extends TestBase
 {
 
     public function setUpPage()

test/selenium/TableInsertTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableInsertTest class
+ * TableInsertTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumTableInsertTest extends PMA_SeleniumBase
+class TableInsertTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium t

test/selenium/TableOperationsTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableOperationsTest class
+ * TableOperationsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumTableOperationsTest extends PMA_SeleniumBase
+class TableOperationsTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/TableStructureTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableStructureTest class
+ * TableStructureTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumTableStructureTest extends PMA_SeleniumBase
+class TableStructureTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/TestBase.php

@@ -6,6 +6,7 @@
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  */
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
  * Base class for Selenium tests.
@@ -14,7 +15,7 @@
  * @subpackage Selenium
  * @group      selenium
  */
-abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
+abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
 {
     /**
      * mysqli object

test/selenium/TrackingTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTrackingTest class
+ * TrackingTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
+class TrackingTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case

test/selenium/XssTest.php

@@ -7,16 +7,16 @@
  * @subpackage Selenium
  */
 
-require_once 'TestBase.php';
+namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumXSSTest class
+ * XSSTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PMA_SeleniumXSSTest extends PMA_SeleniumBase
+class XSSTest extends TestBase
 {
     public function setUpPage()
     {