Merge pull request #13411 from mauriciofauth/classes

Move classes to PhpMyAdmin namespace
phpmyadmin · Jun 30, 2017 · ed6353d · ed6353d
2 parents d54f082 + 13c0f7b
commit ed6353d
Show file tree

Hide file tree

Showing 265 changed files with 815 additions and 748 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
     "non-feature-branches": ["RELEASE_.*"],
     "autoload": {
         "psr-4": {
-            "PMA\\": "./"
+            "PMA\\": "./",
+            "PhpMyAdmin\\": "libraries/classes"
         }
     },
     "repositories": [

diff --git a/db_central_columns.php b/db_central_columns.php
@@ -7,7 +7,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 use PMA\libraries\URL;
 use PMA\libraries\Response;
 

diff --git a/db_datadict.php b/db_datadict.php
@@ -201,8 +201,8 @@
     $count++;
     echo '</table>';
     // display indexes information
-    if (count(PMA\libraries\Index::getFromTable($table, $db)) > 0) {
-        echo PMA\libraries\Index::getHtmlForIndexes($table, $db, true);
+    if (count(PhpMyAdmin\Index::getFromTable($table, $db)) > 0) {
+        echo PhpMyAdmin\Index::getHtmlForIndexes($table, $db, true);
     }
     echo '</div>';
 } //ends main while

diff --git a/db_operations.php b/db_operations.php
@@ -303,6 +303,6 @@
     $test_rs = PMA_queryAsControlUser(
         $test_query,
         false,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
+        PhpMyAdmin\DatabaseInterface::QUERY_STORE
     );
 } // end if
diff --git a/db_qbe.php b/db_qbe.php
@@ -131,7 +131,7 @@
 unset($message_to_display);
 
 // create new qbe search instance
-$db_qbe = new PMA\libraries\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
+$db_qbe = new PhpMyAdmin\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
 
 $url = 'db_designer.php' . URL::getCommon(
     array_merge(

diff --git a/db_search.php b/db_search.php
@@ -14,7 +14,7 @@
 require_once 'libraries/common.inc.php';
 
 use PMA\libraries\Response;
-use PMA\libraries\DbSearch;
+use PhpMyAdmin\DbSearch;
 
 $response = Response::getInstance();
 $header   = $response->getHeader();

diff --git a/export.php b/export.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Core;
-use PMA\libraries\Encoding;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Encoding;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;

diff --git a/gis_data_editor.php b/gis_data_editor.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 use PMA\libraries\gis\GISFactory;
 use PMA\libraries\gis\GISVisualization;
 use PMA\libraries\Response;

diff --git a/import.php b/import.php
@@ -6,10 +6,10 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Bookmark;
-use PMA\libraries\Core;
-use PMA\libraries\Encoding;
-use PMA\libraries\File;
+use PhpMyAdmin\Bookmark;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Encoding;
+use PhpMyAdmin\File;
 use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\Response;
 use PMA\libraries\Sql;
@@ -43,7 +43,7 @@
 // If it's a refresh console bookmarks request
 if (isset($_REQUEST['console_bookmark_refresh'])) {
     $response->addJSON(
-        'console_message_bookmark', PMA\libraries\Console::getBookmarkContent()
+        'console_message_bookmark', PhpMyAdmin\Console::getBookmarkContent()
     );
     exit;
 }

diff --git a/import_status.php b/import_status.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 
 /* PHP 5.4 stores upload progress data only in the default session.
  * After calling session_name(), we won't find the progress data anymore.

diff --git a/index.php b/index.php
@@ -6,9 +6,9 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Charsets;
-use PMA\libraries\Core;
-use PMA\libraries\LanguageManager;
+use PhpMyAdmin\Charsets;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\LanguageManager;
 use PMA\libraries\Message;
 use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\Response;
@@ -263,7 +263,7 @@
     echo '</li>';
 }
 echo '<li id="li_select_fontsize">';
-echo PMA\libraries\Config::getFontsizeForm();
+echo PhpMyAdmin\Config::getFontsizeForm();
 echo '</li>';
 
 echo '</ul>';

diff --git a/libraries/Logging.php b/libraries/Logging.php
@@ -9,7 +9,7 @@
  */
 namespace PMA\libraries;
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 
 /**
  * Misc logging functions

diff --git a/libraries/Menu.php b/libraries/Menu.php
@@ -7,6 +7,7 @@
  */
 namespace PMA\libraries;
 
+use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\URL;
 
 /**
@@ -655,4 +656,3 @@ public function setTable($table)
         return $this;
     }
 }
-
diff --git a/libraries/PDF.php b/libraries/PDF.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries;
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 use TCPDF;
 use TCPDF_FONTS;
 

diff --git a/libraries/Response.php b/libraries/Response.php
@@ -7,7 +7,9 @@
  */
 namespace PMA\libraries;
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Footer;
+use PhpMyAdmin\Header;
 
 /**
  * Singleton class used to manage the rendering of pages in PMA
@@ -47,7 +49,7 @@ class Response
      */
     private $_JSON;
     /**
-     * PMA\libraries\Footer instance
+     * PhpMyAdmin\Footer instance
      *
      * @access private
      * @var Footer
@@ -182,7 +184,7 @@ public function disable()
     }
 
     /**
-     * Returns a PMA\libraries\Header object
+     * Returns a PhpMyAdmin\Header object
      *
      * @return Header
      */
@@ -192,7 +194,7 @@ public function getHeader()
     }
 
     /**
-     * Returns a PMA\libraries\Footer object
+     * Returns a PhpMyAdmin\Footer object
      *
      * @return Footer
      */

diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries;
 
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 use PMA\libraries\Util;
 
 /**

diff --git a/libraries/Scripts.php b/libraries/Scripts.php
@@ -7,6 +7,7 @@
  */
 namespace PMA\libraries;
 
+use PhpMyAdmin\Header;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
 

diff --git a/libraries/Sql.php b/libraries/Sql.php
@@ -11,11 +11,11 @@
 use PhpMyAdmin\SqlParser\Statements\DropStatement;
 use PhpMyAdmin\SqlParser\Statements\SelectStatement;
 use PhpMyAdmin\SqlParser\Utils\Query;
-use PMA\libraries\Bookmark;
-use PMA\libraries\Core;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\DisplayResults;
-use PMA\libraries\Index;
+use PhpMyAdmin\Bookmark;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\DisplayResults;
+use PhpMyAdmin\Index;
 use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Table;

diff --git a/libraries/SystemDatabase.php b/libraries/SystemDatabase.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PhpMyAdmin\DatabaseInterface;
+
 require_once 'libraries/database_interface.inc.php';
 
 /**

diff --git a/libraries/Table.php b/libraries/Table.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Index;
 use PMA\libraries\plugins\export\ExportSql;
 use PhpMyAdmin\SqlParser\Components\Expression;
 use PhpMyAdmin\SqlParser\Components\OptionsArray;

diff --git a/libraries/Transformations.php b/libraries/Transformations.php
@@ -17,7 +17,7 @@
  */
 namespace PMA\libraries;
 
-use PMA\libraries\DatabaseInterface;
+use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\Util;
 
 /**

diff --git a/libraries/Util.php b/libraries/Util.php
@@ -7,13 +7,14 @@
  */
 namespace PMA\libraries;
 
+use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\plugins\ImportPlugin;
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Lexer;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Token;
 use stdClass;
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
 use PMA\libraries\Template;

diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Charsets;
+use PhpMyAdmin\Charsets;
 use PMA\libraries\Message;
 use PMA\libraries\Util;
 use PMA\libraries\URL;

diff --git a/libraries/Advisor.php → libraries/classes/Advisor.php b/libraries/Advisor.php → libraries/classes/Advisor.php
@@ -6,11 +6,12 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use Exception;
-use PMA\libraries\Core;
+use PhpMyAdmin\Core;
 use PMA\libraries\URL;
+use PMA\libraries\Util;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 /**

diff --git a/libraries/Bookmark.php → libraries/classes/Bookmark.php b/libraries/Bookmark.php → libraries/classes/Bookmark.php
@@ -5,10 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PMA\libraries\Util;
-use PMA\libraries\DatabaseInterface;
+use PhpMyAdmin\DatabaseInterface;
 
 /**
  * Handles bookmarking SQL queries

diff --git a/libraries/Charsets.php → libraries/classes/Charsets.php b/libraries/Charsets.php → libraries/classes/Charsets.php
@@ -5,7 +5,8 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
+
 use PMA\libraries\Util;
 
 /**

diff --git a/libraries/Config.php → libraries/classes/Config.php b/libraries/Config.php → libraries/classes/Config.php
@@ -5,12 +5,15 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use DirectoryIterator;
-use PMA\libraries\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Error;
+use PhpMyAdmin\LanguageManager;
 use PMA\libraries\ThemeManager;
+use PMA\libraries\URL;
+use PMA\libraries\Util;
 
 /**
  * Indication for error handler (see end of this file).
@@ -88,7 +91,7 @@ public function __construct($source = null)
         $this->settings = array();
 
         // functions need to refresh in case of config file changed goes in
-        // PMA\libraries\Config::load()
+        // PhpMyAdmin\Config::load()
         $this->load($source);
 
         // other settings, independent from config file, comes in
@@ -1794,5 +1797,5 @@ public function getUploadTempDir()
 }
 
 if (!defined('TESTSUITE')) {
-    register_shutdown_function(array('PMA\libraries\Config', 'fatalErrorHandler'));
+    register_shutdown_function(array('PhpMyAdmin\Config', 'fatalErrorHandler'));
 }
diff --git a/libraries/Console.php → libraries/classes/Console.php b/libraries/Console.php → libraries/classes/Console.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
+use PhpMyAdmin\Bookmark;
 use PMA\libraries\Template;
-use PMA\libraries\Bookmark;
+use PMA\libraries\Util;
 
 if (! defined('PHPMYADMIN')) {
     exit;

diff --git a/libraries/Core.php → libraries/classes/Core.php b/libraries/Core.php → libraries/classes/Core.php
@@ -7,9 +7,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-use PMA\libraries\DatabaseInterface;
+use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Sanitize;