Set namespace on config classes.

Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

1 files changed, 14 insertions, 12 deletions

diff --git a/prefs_manage.php b/prefs_manage.php
index 4c959eaecc..608e8293c5 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -5,7 +5,12 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\config\ConfigFile;
+use PMA\libraries\config\FormDisplay;
+use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\String;
+use PMA\libraries\Util;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -14,9 +19,6 @@ require_once 'libraries/common.inc.php';
 require_once 'libraries/user_preferences.lib.php';
 require_once 'libraries/config/config_functions.lib.php';
 require_once 'libraries/config/messages.inc.php';
-require_once 'libraries/config/ConfigFile.class.php';
-require_once 'libraries/config/Form.class.php';
-require_once 'libraries/config/FormDisplay.class.php';
 require 'libraries/config/user_preferences.forms.php';
 
 $cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings);
@@ -113,7 +115,7 @@ if (isset($_POST['submit_export'])
         if (!$all_ok) {
             // mimic original form and post json in a hidden field
             include 'libraries/user_preferences.inc.php';
-            $msg = PMA\libraries\Message::error(
+            $msg = Message::error(
                 __('Configuration contains incorrect data for some fields.')
             );
             $msg->display();
@@ -214,15 +216,15 @@ if (isset($_POST['submit_export'])
     exit;
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts = $header->getScripts();
 $scripts->addFile('config.js');
 
 require 'libraries/user_preferences.inc.php';
 if ($error) {
-    if (!$error instanceof PMA\libraries\Message) {
-        $error = PMA\libraries\Message::error($error);
+    if (!$error instanceof Message) {
+        $error = Message::error($error);
     }
     $error->display();
 }
@@ -239,7 +241,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
 echo '<h2>' . __('Import') . '</h2>'
     . '<form class="group-cnt prefs-form disableAjax" name="prefs_import"'
     . ' action="prefs_manage.php" method="post" enctype="multipart/form-data">'
-    . PMA\libraries\Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
+    . Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
     . PMA_URL_getHiddenInputs()
     . '<input type="hidden" name="json" value="" />'
     . '<input type="radio" id="import_text_file" name="import_type"'
@@ -261,11 +263,11 @@ echo '<h2>' . __('Import') . '</h2>'
     . __('Saved on: @DATE@')
     . '</div>'
     . '<div class="localStorage-empty">';
-PMA\libraries\Message::notice(__('You have no saved settings!'))->display();
+Message::notice(__('You have no saved settings!'))->display();
 echo  '</div>'
     . '</div>'
     . '<div class="localStorage-unsupported">';
-PMA\libraries\Message::notice(
+Message::notice(
     __('This feature is not supported by your web browser')
 )->display();
 echo '</div>'
@@ -304,7 +306,7 @@ if (file_exists('setup/index.php')) {
             <h2><?php echo __('Export'); ?></h2>
             <div class="click-hide-message group-cnt" style="display:none">
                 <?php
-                PMA\libraries\Message::rawSuccess(
+                Message::rawSuccess(
                     __('Configuration has been saved.')
                 )->display();
                 ?>
@@ -344,7 +346,7 @@ if (file_exists('setup/index.php')) {
                     </span>
                     <div class="localStorage-unsupported">
                         <?php
-                        PMA\libraries\Message::notice(
+                        Message::notice(
                             __('This feature is not supported by your web browser')
                         )->display();
                         ?>