Merge remote-tracking branch 'origin/master'

db_export.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

db_import.php

@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/config/user_preferences.forms.php';

db_sql.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

libraries/classes/Config/ConfigFile.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\config;
+namespace PhpMyAdmin\Config;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;

libraries/classes/Config/Form.php

@@ -5,7 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\config;
+namespace PhpMyAdmin\Config;
+
+use PhpMyAdmin\Config\ConfigFile;
 
 /**
  * Base class for forms, loads default configuration options, checks allowed

libraries/classes/Config/FormDisplay.php

@@ -12,13 +12,12 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\config;
+namespace PhpMyAdmin\Config;
 
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\Form;
+use PhpMyAdmin\Config\Validator;
 use PhpMyAdmin\Sanitize;
-
-/**
- * Core libraries.
- */
 use PhpMyAdmin\Util;
 
 require_once './libraries/config/FormDisplay.tpl.php';

libraries/classes/Config/PageSettings.php

@@ -5,8 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\config;
+namespace PhpMyAdmin\Config;
 
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;

libraries/classes/Config/ServerConfigChecks.php

@@ -5,8 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\config;
+namespace PhpMyAdmin\Config;
 
+use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;

libraries/classes/Config/Validator.php

@@ -5,8 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries\config;
+namespace PhpMyAdmin\Config;
 
+use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Util;
@@ -127,7 +128,7 @@ class Validator
             foreach ((array)$validators[$vid] as $validator) {
                 $vdef = (array) $validator;
                 $vname = array_shift($vdef);
-                $vname = 'PMA\libraries\config\Validator::' . $vname;
+                $vname = 'PhpMyAdmin\Config\Validator::' . $vname;
                 $args = array_merge(array($vid, &$arguments), $vdef);
                 $r = call_user_func_array($vname, $args);
 

libraries/classes/Encoding.php

@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Core;
 
 /**

libraries/classes/File.php

@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Util;

libraries/controllers/database/DatabaseStructureController.php

@@ -9,7 +9,7 @@
 
 namespace PMA\libraries\controllers\database;
 
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PMA\libraries\controllers\DatabaseController;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Core;

libraries/controllers/table/TableStructureController.php

@@ -12,7 +12,7 @@ namespace PMA\libraries\controllers\table;
 use PhpMyAdmin\SqlParser;
 use PhpMyAdmin\SqlParser\Statements\CreateStatement;
 use PhpMyAdmin\SqlParser\Utils\Table as SqlTable;
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Index;

libraries/navigation/Navigation.php

@@ -8,7 +8,7 @@
  */
 namespace PMA\libraries\navigation;
 
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;

libraries/user_preferences.lib.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Url;

navigation.php

@@ -8,7 +8,7 @@
 
 // Include common functionalities
 use PhpMyAdmin\Response;
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PMA\libraries\navigation\Navigation;
 
 require_once './libraries/common.inc.php';

prefs_forms.php

@@ -5,8 +5,8 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;

prefs_manage.php

@@ -5,8 +5,8 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\File;
 use PhpMyAdmin\Message;

server_export.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

server_import.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

server_sql.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

setup/config.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Setup
  */
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\FormDisplay;
 use PMA\setup\lib\ConfigGenerator;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Url;

setup/frames/form.inc.php

@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-Setup
  */
 
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Core;
 
 if (!defined('PHPMYADMIN')) {

setup/frames/index.inc.php

@@ -6,9 +6,9 @@
  * @package PhpMyAdmin-Setup
  */
 
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
-use PMA\libraries\config\ServerConfigChecks;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\FormDisplay;
+use PhpMyAdmin\Config\ServerConfigChecks;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Url;

setup/frames/servers.inc.php

@@ -6,8 +6,8 @@
  * @package PhpMyAdmin-Setup
  */
 
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Url;
 

setup/lib/ConfigGenerator.php

@@ -7,7 +7,7 @@
  */
 namespace PMA\setup\lib;
 
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 
 /**
  * Config file generation class

setup/lib/common.inc.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Setup
  */
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 
 /**
  * Do not include full common.

setup/lib/form_processing.lib.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Setup
  */
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;

setup/validate.php

@@ -26,7 +26,7 @@ if (!($values instanceof stdClass)) {
     Core::fatalError(__('Wrong data'));
 }
 $values = (array)$values;
-$result = PMA\libraries\config\Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
+$result = PhpMyAdmin\Config\Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
 if ($result === false) {
     $result = sprintf(
         __('Wrong data or no validation for %s'),

sql.php

@@ -7,7 +7,7 @@
  *          that returns 0 rows - to prevent cyclic redirects or includes
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sql;
 use PhpMyAdmin\Url;

tbl_change.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 use PhpMyAdmin\Url;

tbl_export.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

tbl_import.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

tbl_sql.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Response;
 
 /**

test/classes/ConfigGeneratorTest.php

@@ -10,7 +10,7 @@
  * Include to test
  */
 use PhpMyAdmin\Config;
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 use PMA\setup\lib\ConfigGenerator;
 
 require_once 'test/PMATestCase.php';

test/classes/config/ConfigFileTest.php

@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 
 require_once 'test/PMATestCase.php';
 

test/classes/config/FormDisplayTest.php

@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Config;
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\FormDisplay;
 use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
@@ -73,7 +73,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testRegisterForm()
     {
-        $reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
 
         $attrForms = $reflection->getProperty('_forms');
         $attrForms->setAccessible(true);
@@ -90,7 +90,7 @@ class FormDisplayTest extends PMATestCase
         $this->object->registerForm('pma_testform', $array, 2);
         $_forms = $attrForms->getValue($this->object);
         $this->assertInstanceOf(
-            'PMA\libraries\config\Form',
+            'PhpMyAdmin\Config\Form',
             $_forms['pma_testform']
         );
 
@@ -123,12 +123,12 @@ class FormDisplayTest extends PMATestCase
             $this->object->process(true, true)
         );
 
-        $this->object = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
             ->setMethods(array('save'))
             ->getMock();
 
-        $attrForms = new \ReflectionProperty('PMA\libraries\config\FormDisplay', '_forms');
+        $attrForms = new \ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_forms');
         $attrForms->setAccessible(true);
         $attrForms->setValue($this->object, array(1, 2, 3));
 
@@ -155,7 +155,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testDisplayErrors()
     {
-        $reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
 
         $attrIsValidated = $reflection->getProperty('_isValidated');
         $attrIsValidated->setAccessible(true);
@@ -203,7 +203,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testFixErrors()
     {
-        $reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
 
         $attrIsValidated = $reflection->getProperty('_isValidated');
         $attrIsValidated->setAccessible(true);
@@ -255,7 +255,7 @@ class FormDisplayTest extends PMATestCase
     public function testValidateSelect()
     {
         $attrValidateSelect = new \ReflectionMethod(
-            'PMA\libraries\config\FormDisplay',
+            'PhpMyAdmin\Config\FormDisplay',
             '_validateSelect'
         );
         $attrValidateSelect->setAccessible(true);
@@ -308,7 +308,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testHasErrors()
     {
-        $attrErrors = new \ReflectionProperty('PMA\libraries\config\FormDisplay', '_errors');
+        $attrErrors = new \ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_errors');
         $attrErrors->setAccessible(true);
 
         $this->assertFalse(
@@ -356,7 +356,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testGetOptName()
     {
-        $method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_getOptName');
+        $method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_getOptName');
         $method->setAccessible(true);
 
         $this->assertEquals(
@@ -377,11 +377,11 @@ class FormDisplayTest extends PMATestCase
      */
     public function testLoadUserprefsInfo()
     {
-        $method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_loadUserprefsInfo');
+        $method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_loadUserprefsInfo');
         $method->setAccessible(true);
 
         $attrUserprefs = new \ReflectionProperty(
-            'PMA\libraries\config\FormDisplay',
+            'PhpMyAdmin\Config\FormDisplay',
             '_userprefsDisallow'
         );
 
@@ -404,7 +404,7 @@ class FormDisplayTest extends PMATestCase
             $this->markTestSkipped('Cannot redefine constant');
         }
 
-        $method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_setComments');
+        $method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_setComments');
         $method->setAccessible(true);
 
         // recoding

test/classes/config/FormTest.php

@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Config;
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\Form;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\Form;
 use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
@@ -80,7 +80,7 @@ class FormTest extends PMATestCase
      */
     public function testGetOptionType()
     {
-        $attrFieldsTypes = new \ReflectionProperty('PMA\libraries\config\Form', '_fieldsTypes');
+        $attrFieldsTypes = new \ReflectionProperty('PhpMyAdmin\Config\Form', '_fieldsTypes');
         $attrFieldsTypes->setAccessible(true);
         $attrFieldsTypes->setValue(
             $this->object,
@@ -136,7 +136,7 @@ class FormTest extends PMATestCase
      */
     public function testReadFormPathsCallBack()
     {
-        $reflection = new \ReflectionClass('PMA\libraries\config\Form');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
         $method = $reflection->getMethod('_readFormPathsCallback');
         $method->setAccessible(true);
 
@@ -188,7 +188,7 @@ class FormTest extends PMATestCase
      */
     public function testReadFormPaths()
     {
-        $reflection = new \ReflectionClass('PMA\libraries\config\Form');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
         $method = $reflection->getMethod('readFormPaths');
         $method->setAccessible(true);
 
@@ -243,7 +243,7 @@ class FormTest extends PMATestCase
      */
     public function testReadTypes()
     {
-        $reflection = new \ReflectionClass('PMA\libraries\config\Form');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
         $method = $reflection->getMethod('readTypes');
         $method->setAccessible(true);
 
@@ -277,7 +277,7 @@ class FormTest extends PMATestCase
      */
     public function testLoadForm()
     {
-        $this->object = $this->getMockBuilder('PMA\libraries\config\Form')
+        $this->object = $this->getMockBuilder('PhpMyAdmin\Config\Form')
             ->disableOriginalConstructor()
             ->setMethods(array('readFormPaths', 'readTypes'))
             ->getMock();

test/classes/config/PageSettingsTest.php

@@ -5,14 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\config\PageSettings;
+use PhpMyAdmin\Config\PageSettings;
 
 require_once 'test/PMATestCase.php';
 require_once 'libraries/config/user_preferences.forms.php';
 require_once 'libraries/config/page_settings.forms.php';
 
 /**
- * Tests for PMA\libraries\config\PageSettings
+ * Tests for PhpMyAdmin\Config\PageSettings
  *
  * @package PhpMyAdmin-test
  */

test/libraries/PMA_Form_Processing_test.php

@@ -46,7 +46,7 @@ class PMA_Form_Processing_Test extends PMATestCase
             );
 
         // case 1
-        $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
+        $formDisplay = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
             ->setMethods(array('process', 'getDisplay'))
             ->getMock();
@@ -63,7 +63,7 @@ class PMA_Form_Processing_Test extends PMATestCase
         PMA_Process_formset($formDisplay);
 
         // case 2
-        $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
+        $formDisplay = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
             ->setMethods(array('process', 'hasErrors', 'displayErrors'))
             ->getMock();
@@ -103,7 +103,7 @@ class PMA_Form_Processing_Test extends PMATestCase
         );
 
         // case 3
-        $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
+        $formDisplay = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
             ->setMethods(array('process', 'hasErrors'))
             ->getMock();

test/libraries/PMA_SetupIndex_test.php

@@ -9,8 +9,8 @@
 /*
  * Include to test
  */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\ServerConfigChecks;
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\ServerConfigChecks;
 
 require_once 'libraries/config/config_functions.lib.php';
 require_once 'setup/lib/index.lib.php';
@@ -174,7 +174,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
         $cf = new ConfigFile();
         $GLOBALS['ConfigFile'] = $cf;
 
-        $reflection = new \ReflectionProperty('PMA\libraries\config\ConfigFile', '_id');
+        $reflection = new \ReflectionProperty('PhpMyAdmin\Config\ConfigFile', '_id');
         $reflection->setAccessible(true);
         $sessionID = $reflection->getValue($cf);
 

test/libraries/PMA_user_preferences_test.php

@@ -9,7 +9,7 @@
 /*
  * Include to test
  */
-use PMA\libraries\config\ConfigFile;
+use PhpMyAdmin\Config\ConfigFile;
 
 require_once 'libraries/user_preferences.lib.php';
 require_once 'libraries/relation.lib.php';