diff options
265 files changed, 815 insertions, 748 deletions
diff --git a/composer.json b/composer.json index 57f36e1365..938a734202 100644 --- 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 index e5d182d409..4b01cebcae 100644 --- 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 index 8c02c89431..cf3f66d6a1 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -201,8 +201,8 @@ foreach ($tables as $table) { $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 index 468cdc134e..e24c49306b 100644 --- a/db_operations.php +++ b/db_operations.php @@ -303,6 +303,6 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { $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 index 0cb1b2df28..f64e973398 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -131,7 +131,7 @@ if ($message_to_display) { 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 index 314eb487cc..2ebf417223 100644 --- 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 index d354ccf88f..e9e82a9938 100644 --- 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 index 538271e3c2..a3ec478170 100644 --- 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 index 7cd6affe6d..d910c34cfc 100644 --- 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 @@ $response = Response::getInstance(); // 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 index 3b906fb9dc..d735308d78 100644 --- 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. @@ -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 @@ if ($GLOBALS['cfg']['ThemeManager']) { 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 index 59b29515bd..625caeb795 100644 --- 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 index ae2f0c9e85..6d5778d42b 100644 --- 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 @@ class Menu return $this; } } - diff --git a/libraries/PDF.php b/libraries/PDF.php index 5195c16596..56cfd2b979 100644 --- 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 index dc5caf2695..cd7ea5385a 100644 --- 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 @@ class Response } /** - * Returns a PMA\libraries\Header object + * Returns a PhpMyAdmin\Header object * * @return Header */ @@ -192,7 +194,7 @@ class Response } /** - * Returns a PMA\libraries\Footer object + * Returns a PhpMyAdmin\Footer object * * @return Footer */ diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php index 8f604a4021..e05340a5ca 100644 --- 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 index f7a6152763..551d0102b3 100644 --- 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 index bc18b1a8d2..af42467844 100644 --- a/libraries/Sql.php +++ b/libraries/Sql.php @@ -11,11 +11,11 @@ use PhpMyAdmin\SqlParser\Statements\AlterStatement; 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 index 7e39e46293..df5976a4e7 100644 --- 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 index 9d050be638..ddeb0f0986 100644 --- 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 index 00cfa214f7..9581154860 100644 --- 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 index e2c470ba37..cbbed3dc0e 100644 --- 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 index 524ca5970d..fb1e4aae1e 100644 --- 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 b/libraries/classes/Advisor.php index bf81f7909f..7ad674126b 100644 --- a/libraries/Advisor.php +++ b/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 b/libraries/classes/Bookmark.php index 9a34a9a88b..565f37b5b0 100644 --- a/libraries/Bookmark.php +++ b/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 b/libraries/classes/Charsets.php index 56c5625222..b757ce6cae 100644 --- a/libraries/Charsets.php +++ b/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 b/libraries/classes/Config.php index 40fc174e2e..15514f8972 100644 --- a/libraries/Config.php +++ b/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 @@ class Config $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 @@ class Config } if (!defined('TESTSUITE')) { - register_shutdown_function(array('PMA\libraries\Config', 'fatalErrorHandler')); + register_shutdown_function(array('PhpMyAdmin\Config', 'fatalErrorHandler')); } diff --git a/libraries/Console.php b/libraries/classes/Console.php index a419cef0ad..d7419a79b1 100644 --- a/libraries/Console.php +++ b/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 b/libraries/classes/Core.php index a4155f436f..9b9748162a 100644 --- a/libraries/Core.php +++ b/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; diff --git a/libraries/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 9e9bc03aac..101b4e2efb 100644 --- a/libraries/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -5,12 +5,18 @@ * * @package PhpMyAdmin-DBI */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\dbi\DBIExtension; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\Error; +use PhpMyAdmin\Index; +use PhpMyAdmin\LanguageManager; +use PMA\libraries\SystemDatabase; +use PMA\libraries\Table; +use PMA\libraries\Tracker; use PMA\libraries\URL; +use PMA\libraries\Util; require_once './libraries/util.lib.php'; @@ -917,7 +923,7 @@ class DatabaseInterface $GLOBALS['callback_sort_by'] = $sort_by; usort( $databases, - array('PMA\libraries\DatabaseInterface', '_usortComparisonCallback') + array(self::class, '_usortComparisonCallback') ); unset($GLOBALS['callback_sort_order'], $GLOBALS['callback_sort_by']); @@ -1391,7 +1397,7 @@ class DatabaseInterface } } - if (PMA_MYSQL_INT_VERSION > 50503) { + if (PMA_MYSQL_INT_VERSION > 50503) { $default_charset = 'utf8mb4'; $default_collation = 'utf8mb4_general_ci'; } else { diff --git a/libraries/DbList.php b/libraries/classes/DbList.php index c315ed0b44..2f62b2040a 100644 --- a/libraries/DbList.php +++ b/libraries/classes/DbList.php @@ -6,7 +6,9 @@ * @package PhpMyAdmin * */ -namespace PMA\libraries; +namespace PhpMyAdmin; + +use PhpMyAdmin\ListDatabase; /** * holds the DbList class diff --git a/libraries/DbQbe.php b/libraries/classes/DbQbe.php index ee616c41b9..d1dc8e963e 100644 --- a/libraries/DbQbe.php +++ b/libraries/classes/DbQbe.php @@ -5,9 +5,11 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Core; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PMA\libraries\Table; use PMA\libraries\URL; use PMA\libraries\Util; diff --git a/libraries/DbSearch.php b/libraries/classes/DbSearch.php index aa6c8b6558..c8fdee8838 100644 --- a/libraries/DbSearch.php +++ b/libraries/classes/DbSearch.php @@ -5,9 +5,10 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PMA\libraries\URL; +use PMA\libraries\Util; use PMA\libraries\Sanitize; /** diff --git a/libraries/DisplayResults.php b/libraries/classes/DisplayResults.php index 46a0aa037c..c7811bf4bb 100644 --- a/libraries/DisplayResults.php +++ b/libraries/classes/DisplayResults.php @@ -1,19 +1,26 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Hold the PMA\libraries\DisplayResults class + * Hold the PhpMyAdmin\DisplayResults class * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PhpMyAdmin\SqlParser\Utils\Query; -use PMA\libraries\Core; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Index; +use PMA\libraries\Message; use PMA\libraries\plugins\transformations\Text_Plain_Link; +use PMA\libraries\Response; use PMA\libraries\Sanitize; use PMA\libraries\Sql; +use PMA\libraries\Table; +use PMA\libraries\Template; use PMA\libraries\Transformations; use PMA\libraries\URL; +use PMA\libraries\Util; /** * Handle all the functionalities related to displaying results @@ -3055,7 +3062,7 @@ class DisplayResults $plugin_manager ); - $transform_options = Transformations::getOptions( + $transform_options = Transformations::getOptions( isset( $mime_map[$orgFullColName] ['transformation_options'] @@ -3088,7 +3095,7 @@ class DisplayResults $transformation_plugin = new $this->transformation_info [$dbLower][$tblLower][$nameLower][1](null); - $transform_options = Transformations::getOptions( + $transform_options = Transformations::getOptions( isset($mime_map[$orgFullColName]['transformation_options']) ? $mime_map[$orgFullColName]['transformation_options'] : '' diff --git a/libraries/Encoding.php b/libraries/classes/Encoding.php index 2cc398c0c3..2764729faf 100644 --- a/libraries/Encoding.php +++ b/libraries/classes/Encoding.php @@ -1,13 +1,13 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Hold the PMA\libraries\Encoding class + * Hold the PhpMyAdmin\Encoding class * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\config\ConfigFile; /** diff --git a/libraries/Error.php b/libraries/classes/Error.php index 879be92c64..9c348abb00 100644 --- a/libraries/Error.php +++ b/libraries/classes/Error.php @@ -1,13 +1,14 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Holds class PMA\libraries\Error + * Holds class PhpMyAdmin\Error * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use Exception; +use PMA\libraries\Message; /** * a single error @@ -164,7 +165,7 @@ class Error extends Message } /** - * sets PMA\libraries\Error::$_backtrace + * sets PhpMyAdmin\Error::$_backtrace * * We don't store full arguments to avoid wakeup or memory problems. * @@ -178,7 +179,7 @@ class Error extends Message } /** - * sets PMA\libraries\Error::$_line + * sets PhpMyAdmin\Error::$_line * * @param integer $line the line * @@ -190,7 +191,7 @@ class Error extends Message } /** - * sets PMA\libraries\Error::$_file + * sets PhpMyAdmin\Error::$_file * * @param string $file the file * @@ -203,9 +204,9 @@ class Error extends Message /** - * returns unique PMA\libraries\Error::$hash, if not exists it will be created + * returns unique PhpMyAdmin\Error::$hash, if not exists it will be created * - * @return string PMA\libraries\Error::$hash + * @return string PhpMyAdmin\Error::$hash */ public function getHash() { @@ -228,13 +229,13 @@ class Error extends Message } /** - * returns PMA\libraries\Error::$_backtrace for first $count frames + * returns PhpMyAdmin\Error::$_backtrace for first $count frames * pass $count = -1 to get full backtrace. * The same can be done by not passing $count at all. * * @param integer $count Number of stack frames. * - * @return array PMA\libraries\Error::$_backtrace + * @return array PhpMyAdmin\Error::$_backtrace */ public function getBacktrace($count = -1) { @@ -245,9 +246,9 @@ class Error extends Message } /** - * returns PMA\libraries\Error::$file + * returns PhpMyAdmin\Error::$file * - * @return string PMA\libraries\Error::$file + * @return string PhpMyAdmin\Error::$file */ public function getFile() { @@ -255,9 +256,9 @@ class Error extends Message } /** - * returns PMA\libraries\Error::$line + * returns PhpMyAdmin\Error::$line * - * @return integer PMA\libraries\Error::$line + * @return integer PhpMyAdmin\Error::$line */ public function getLine() { @@ -483,7 +484,7 @@ class Error extends Message $Ahere = explode( DIRECTORY_SEPARATOR, - realpath(__DIR__ . DIRECTORY_SEPARATOR . '..') + realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..') ); $Adest = explode(DIRECTORY_SEPARATOR, $dest); @@ -492,7 +493,7 @@ class Error extends Message while (implode(DIRECTORY_SEPARATOR, $Adest) != implode(DIRECTORY_SEPARATOR, $Ahere)) { if (count($Ahere) > count($Adest)) { array_pop($Ahere); - $result .= DIRECTORY_SEPARATOR . '..'; + $result .= DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..'; } else { array_pop($Adest); } diff --git a/libraries/ErrorHandler.php b/libraries/classes/ErrorHandler.php index 73a1cd6263..24633ff090 100644 --- a/libraries/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -1,13 +1,15 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Holds class PMA\libraries\ErrorHandler + * Holds class PhpMyAdmin\ErrorHandler * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Error; +use PhpMyAdmin\Error; +use PMA\libraries\Response; +use PMA\libraries\URL; /** * handling errors diff --git a/libraries/File.php b/libraries/classes/File.php index c640698cba..2ecad40fb1 100644 --- a/libraries/File.php +++ b/libraries/classes/File.php @@ -3,13 +3,15 @@ /** * file upload functions * - * @package PMA\libraries + * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PMA\libraries\config\ConfigFile; +use PhpMyAdmin\Core; +use PMA\libraries\Message; +use PMA\libraries\Util; use PMA\libraries\ZipExtension; -use PMA\libraries\Core; /** * File wrapper class @@ -17,7 +19,7 @@ use PMA\libraries\Core; * @todo when uploading a file into a blob field, should we also consider using * chunks like in import? UPDATE `table` SET `field` = `field` + [chunk] * - * @package PMA\libraries + * @package PhpMyAdmin */ class File { diff --git a/libraries/Font.php b/libraries/classes/Font.php index dd4bd81042..864f803ae2 100644 --- a/libraries/Font.php +++ b/libraries/classes/Font.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; /** * Class with Font related methods. diff --git a/libraries/Footer.php b/libraries/classes/Footer.php index cefd15a11a..124af19817 100644 --- a/libraries/Footer.php +++ b/libraries/classes/Footer.php @@ -5,13 +5,17 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use Traversable; -use PMA\libraries\URL; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; +use PMA\libraries\Message; +use PMA\libraries\Response; use PMA\libraries\Sanitize; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PMA\libraries\Scripts; +use PMA\libraries\URL; +use PMA\libraries\Util; +use Traversable; /** * Class used to output the footer diff --git a/libraries/Header.php b/libraries/classes/Header.php index 7fa88498e2..9899e76588 100644 --- a/libraries/Header.php +++ b/libraries/classes/Header.php @@ -5,13 +5,19 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; +use PhpMyAdmin\Config; +use PhpMyAdmin\Console; +use PhpMyAdmin\Core; +use PMA\libraries\Menu; +use PMA\libraries\Message; use PMA\libraries\navigation\Navigation; -use PMA\libraries\URL; +use PMA\libraries\RecentFavoriteTable; use PMA\libraries\Sanitize; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PMA\libraries\Scripts; +use PMA\libraries\URL; +use PMA\libraries\Util; /** * Class used to output the HTTP and HTML headers @@ -28,7 +34,7 @@ class Header */ private $_scripts; /** - * PMA\libraries\Console instance + * PhpMyAdmin\Console instance * * @access private * @var Console @@ -126,7 +132,7 @@ class Header $this->_menuEnabled = true; $this->_warningsEnabled = true; $this->_isPrintView = false; - $this->_scripts = new Scripts(); + $this->_scripts = new Scripts(); $this->_addDefaultScripts(); $this->_headerIsSent = false; // if database storage for user preferences is transient, diff --git a/libraries/Index.php b/libraries/classes/Index.php index c6c814aab0..6d4553ed37 100644 --- a/libraries/Index.php +++ b/libraries/classes/Index.php @@ -5,10 +5,13 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\URL; +use PhpMyAdmin\IndexColumn; +use PMA\libraries\Message; use PMA\libraries\Sanitize; +use PMA\libraries\URL; +use PMA\libraries\Util; /** * Index manipulation class diff --git a/libraries/IndexColumn.php b/libraries/classes/IndexColumn.php index 2ca024b9db..6590ff0d41 100644 --- a/libraries/IndexColumn.php +++ b/libraries/classes/IndexColumn.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; /** * Index column wrapper diff --git a/libraries/Language.php b/libraries/classes/Language.php index 8dd53ed6be..7faa6f403c 100644 --- a/libraries/Language.php +++ b/libraries/classes/Language.php @@ -1,14 +1,13 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Hold the PMA\libraries\LanguageManager class + * Hold the PhpMyAdmin\Language class * * @package PhpMyAdmin */ -namespace PMA\libraries; - -use PMA\libraries\LanguageManager; +namespace PhpMyAdmin; +use PhpMyAdmin\LanguageManager; /** * Language object diff --git a/libraries/LanguageManager.php b/libraries/classes/LanguageManager.php index e9a48b3ff1..de0fec261e 100644 --- a/libraries/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -1,15 +1,17 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Hold the PMA\libraries\LanguageManager class + * Hold the PhpMyAdmin\LanguageManager class * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Core; -use PMA\libraries\Language; +use PhpMyAdmin\Core; +use PhpMyAdmin\Language; +use PMA\libraries\Template; use PMA\libraries\URL; +use PMA\libraries\Util; /** * Language selection manager diff --git a/libraries/Linter.php b/libraries/classes/Linter.php index 34f6003f5a..66742b3605 100644 --- a/libraries/Linter.php +++ b/libraries/classes/Linter.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PhpMyAdmin\SqlParser\Lexer; use PhpMyAdmin\SqlParser\Parser; @@ -19,7 +19,6 @@ use PhpMyAdmin\SqlParser\Utils\Error as ParserError; */ class Linter { - /** * Gets the starting position of each line. * diff --git a/libraries/ListAbstract.php b/libraries/classes/ListAbstract.php index f557c1777a..f46fa1ef7f 100644 --- a/libraries/ListAbstract.php +++ b/libraries/classes/ListAbstract.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use ArrayObject; diff --git a/libraries/ListDatabase.php b/libraries/classes/ListDatabase.php index 35e03b673e..859e1dcd65 100644 --- a/libraries/ListDatabase.php +++ b/libraries/classes/ListDatabase.php @@ -5,7 +5,10 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; + +use PhpMyAdmin\ListAbstract; +use PMA\libraries\Util; require_once './libraries/check_user_privileges.lib.php'; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index a99d3c6f0e..2d3456ec64 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -31,19 +31,19 @@ * @package PhpMyAdmin */ -use PMA\libraries\Config; -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; -use PMA\libraries\ErrorHandler; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\ErrorHandler; use PMA\libraries\Message; use PMA\libraries\plugins\AuthenticationPlugin; -use PMA\libraries\DbList; +use PhpMyAdmin\DbList; use PMA\libraries\ThemeManager; use PMA\libraries\Tracker; use PMA\libraries\Response; use PMA\libraries\TypesMySQL; use PMA\libraries\Util; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\LanguageManager; use PMA\libraries\Logging; /** @@ -361,14 +361,14 @@ if (Core::checkPageValidity($_REQUEST['back'], $goto_whitelist)) { * * remember that some objects in the session with session_start and __wakeup() * could access this variables before we reach this point - * f.e. PMA\libraries\Config: fontsize + * f.e. PhpMyAdmin\Config: fontsize * * Check for token mismatch only if the Request method is POST * GET Requests would never have token and therefore checking * mis-match does not make sense * * @todo variables should be handled by their respective owners (objects) - * f.e. lang, server, collation_connection in PMA\libraries\Config + * f.e. lang, server, collation_connection in PhpMyAdmin\Config */ $token_mismatch = true; @@ -487,8 +487,8 @@ $GLOBALS['server'] = 0; /** * Servers array fixups. - * $default_server comes from PMA\libraries\Config::enableBc() - * @todo merge into PMA\libraries\Config + * $default_server comes from PhpMyAdmin\Config::enableBc() + * @todo merge into PhpMyAdmin\Config */ // Do we have some server? if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) { @@ -590,7 +590,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * save some settings in cookies - * @todo should be done in PMA\libraries\Config + * @todo should be done in PhpMyAdmin\Config */ $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']); if (isset($GLOBALS['collation_connection'])) { @@ -612,7 +612,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // get LoginCookieValidity from preferences cache // no generic solution for loading preferences from cache as some settings // need to be kept for processing in - // PMA\libraries\Config::loadUserPreferences() + // PhpMyAdmin\Config::loadUserPreferences() $cache_key = 'server_' . $GLOBALS['server']; if (isset($_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity']) ) { diff --git a/libraries/config/ConfigFile.php b/libraries/config/ConfigFile.php index 26a2843800..44de1196d9 100644 --- a/libraries/config/ConfigFile.php +++ b/libraries/config/ConfigFile.php @@ -7,8 +7,8 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; /** * Config file management class. @@ -78,7 +78,7 @@ class ConfigFile * Constructor * * @param array $base_config base configuration read from - * {@link PMA\libraries\Config::$base_config}, + * {@link PhpMyAdmin\Config::$base_config}, * use only when not in PMA Setup */ public function __construct(array $base_config = null) diff --git a/libraries/config/PageSettings.php b/libraries/config/PageSettings.php index fa9cbd95cf..aec1353600 100644 --- a/libraries/config/PageSettings.php +++ b/libraries/config/PageSettings.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; diff --git a/libraries/config/ServerConfigChecks.php b/libraries/config/ServerConfigChecks.php index f63f70c8e9..43bd9397ba 100644 --- a/libraries/config/ServerConfigChecks.php +++ b/libraries/config/ServerConfigChecks.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Util; diff --git a/libraries/config/Validator.php b/libraries/config/Validator.php index 8dab95684e..eb816f11f7 100644 --- a/libraries/config/Validator.php +++ b/libraries/config/Validator.php @@ -7,8 +7,8 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Util; /** @@ -49,7 +49,7 @@ class Validator // not in setup script: load additional validators for user // preferences we need original config values not overwritten - // by user preferences, creating a new PMA\libraries\Config instance is a + // by user preferences, creating a new PhpMyAdmin\Config instance is a // better idea than hacking into its code $uvs = $cf->getDbEntry('_userValidators', array()); foreach ($uvs as $field => $uv_list) { diff --git a/libraries/controllers/Controller.php b/libraries/controllers/Controller.php index cbb1835762..2a38876f6e 100644 --- a/libraries/controllers/Controller.php +++ b/libraries/controllers/Controller.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\controllers; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\di\Container; use PMA\libraries\Response; diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php index e2f1018694..0b23da08ae 100644 --- a/libraries/controllers/database/DatabaseStructureController.php +++ b/libraries/controllers/database/DatabaseStructureController.php @@ -11,8 +11,8 @@ namespace PMA\libraries\controllers\database; use PMA\libraries\config\PageSettings; use PMA\libraries\controllers\DatabaseController; -use PMA\libraries\Charsets; -use PMA\libraries\Core; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\RecentFavoriteTable; use PMA\libraries\Response; diff --git a/libraries/controllers/server/ServerBinlogController.php b/libraries/controllers/server/ServerBinlogController.php index 74fd565b76..ec87fccaad 100644 --- a/libraries/controllers/server/ServerBinlogController.php +++ b/libraries/controllers/server/ServerBinlogController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Message; use PMA\libraries\Util; use PMA\libraries\Template; diff --git a/libraries/controllers/server/ServerCollationsController.php b/libraries/controllers/server/ServerCollationsController.php index 9a5a7517bf..b1ab0f0292 100644 --- a/libraries/controllers/server/ServerCollationsController.php +++ b/libraries/controllers/server/ServerCollationsController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; -use PMA\libraries\Charsets; +use PhpMyAdmin\Charsets; use PMA\libraries\Template; /** diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php index 7efbe50e28..4f8cb1f1cd 100644 --- a/libraries/controllers/server/ServerDatabasesController.php +++ b/libraries/controllers/server/ServerDatabasesController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; -use PMA\libraries\Charsets; +use PhpMyAdmin\Charsets; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Template; @@ -336,7 +336,7 @@ class ServerDatabasesController extends Controller $column_order = array(); $column_order['DEFAULT_COLLATION_NAME'] = array( 'disp_name' => __('Collation'), - 'description_function' => array('\PMA\libraries\Charsets', 'getCollationDescr'), + 'description_function' => array(Charsets::class, 'getCollationDescr'), 'format' => 'string', 'footer' => $this->dbi->getServerCollation(), ); diff --git a/libraries/controllers/table/TableGisVisualizationController.php b/libraries/controllers/table/TableGisVisualizationController.php index d7c430d78a..b8971a16d8 100644 --- a/libraries/controllers/table/TableGisVisualizationController.php +++ b/libraries/controllers/table/TableGisVisualizationController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Template; use PMA\libraries\gis\GISVisualization; diff --git a/libraries/controllers/table/TableIndexesController.php b/libraries/controllers/table/TableIndexesController.php index 0664c45b85..062cd74441 100644 --- a/libraries/controllers/table/TableIndexesController.php +++ b/libraries/controllers/table/TableIndexesController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\Index; +use PhpMyAdmin\Index; use PMA\libraries\Message; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php index 9ffe8e1d33..25cc9a5b7e 100644 --- a/libraries/controllers/table/TableRelationController.php +++ b/libraries/controllers/table/TableRelationController.php @@ -9,9 +9,9 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; -use PMA\libraries\Index; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Index; use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php index 8db5f794e9..6ab0e6986a 100644 --- a/libraries/controllers/table/TableSearchController.php +++ b/libraries/controllers/table/TableSearchController.php @@ -9,7 +9,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Sql; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php index d64cd26fb2..31cfb0759c 100644 --- a/libraries/controllers/table/TableStructureController.php +++ b/libraries/controllers/table/TableStructureController.php @@ -14,8 +14,8 @@ use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\SqlParser\Utils\Table as SqlTable; use PMA\libraries\config\PageSettings; use PMA\libraries\controllers\TableController; -use PMA\libraries\Core; -use PMA\libraries\Index; +use PhpMyAdmin\Core; +use PhpMyAdmin\Index; use PMA\libraries\Message; use PMA\libraries\Sql; use PMA\libraries\Table; diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php index 45508e7f77..bf5a192f46 100644 --- a/libraries/create_addfield.lib.php +++ b/libraries/create_addfield.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Table; use PMA\libraries\Util; @@ -176,7 +176,7 @@ function PMA_buildIndexStatements($index, $index_choice, $type = $index['Index_type']; if ($index['Index_choice'] != 'SPATIAL' && $index['Index_choice'] != 'FULLTEXT' - && in_array($type, PMA\libraries\Index::getIndexTypes()) + && in_array($type, PhpMyAdmin\Index::getIndexTypes()) ) { $sql_query .= ' USING ' . $type; } diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php index 5d734fb8c7..c8ffdcff04 100644 --- a/libraries/database_interface.inc.php +++ b/libraries/database_interface.inc.php @@ -7,10 +7,10 @@ * @package PhpMyAdmin-DBI */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\dbi\DBIDummy; use PMA\libraries\di\Container; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\dbi\DBIMysql; use PMA\libraries\dbi\DBIMysqli; @@ -42,7 +42,7 @@ if (defined('TESTSUITE')) { if (PHP_VERSION_ID < 70000) { $extension = 'mysql'; - if (! PMA\libraries\DatabaseInterface::checkDbExtension($extension)) { + if (! PhpMyAdmin\DatabaseInterface::checkDbExtension($extension)) { // warn about both extensions missing and exit Core::warnMissingExtension( 'mysqli', diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 0e6c73c4b1..74a9bc0254 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\URL; diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 10d8095782..c07e827dcc 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -85,7 +85,7 @@ function PMA_getPageIdsAndNames($db) . " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($db) . "'" . " ORDER BY `page_descr`"; $page_rs = PMA_queryAsControlUser( - $page_query, false, PMA\libraries\DatabaseInterface::QUERY_STORE + $page_query, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $result = array(); diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php index 562a85350e..ebdfa3bbce 100644 --- a/libraries/db_table_exists.inc.php +++ b/libraries/db_table_exists.inc.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\URL; @@ -67,7 +67,7 @@ if (empty($is_table) $_result = $GLOBALS['dbi']->tryQuery( 'SHOW TABLES LIKE \'' . $GLOBALS['dbi']->escapeString($table) . '\';', - null, PMA\libraries\DatabaseInterface::QUERY_STORE + null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $is_table = @$GLOBALS['dbi']->numRows($_result); $GLOBALS['dbi']->freeResult($_result); @@ -91,7 +91,7 @@ if (empty($is_table) 'SELECT COUNT(*) FROM ' . PMA\libraries\Util::backquote($table) . ';', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $is_table = ($_result && @$GLOBALS['dbi']->numRows($_result)); $GLOBALS['dbi']->freeResult($_result); diff --git a/libraries/dbi/DBIMysql.php b/libraries/dbi/DBIMysql.php index 1b1236b420..0dea65820d 100644 --- a/libraries/dbi/DBIMysql.php +++ b/libraries/dbi/DBIMysql.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\dbi; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index d2207be61c..4e0bd663a7 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\dbi; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index b1b1fb0f4a..c131777138 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -7,8 +7,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\Encoding; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Response; diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php index 17a671ae19..13c5f3d556 100644 --- a/libraries/display_git_revision.lib.php +++ b/libraries/display_git_revision.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; /** diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 82d036e642..24cab70352 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -9,9 +9,9 @@ * @package PhpMyAdmin */ -use PMA\libraries\Charsets; -use PMA\libraries\Core; -use PMA\libraries\Encoding; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\plugins\ImportPlugin; use PMA\libraries\URL; diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 67887ae854..6465014fc2 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Sets up some variables for upload progress diff --git a/libraries/engines/Pbxt.php b/libraries/engines/Pbxt.php index d3058e37ba..e7a033ed04 100644 --- a/libraries/engines/Pbxt.php +++ b/libraries/engines/Pbxt.php @@ -8,7 +8,7 @@ namespace PMA\libraries\engines; use PMA; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\StorageEngine; /** diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php index 807520b108..7aa58e0c40 100644 --- a/libraries/error_report.lib.php +++ b/libraries/error_report.lib.php @@ -92,7 +92,7 @@ function PMA_getReportData($exception_type = 'js') return array(); } foreach ($_SESSION['prev_errors'] as $errorObj) { - /* @var $errorObj PMA\libraries\Error */ + /* @var $errorObj PhpMyAdmin\Error */ if ($errorObj->getLine() && $errorObj->getType() && $errorObj->getNumber() != E_USER_WARNING diff --git a/libraries/export.lib.php b/libraries/export.lib.php index 5f8643ef33..667ec8b8f0 100644 --- a/libraries/export.lib.php +++ b/libraries/export.lib.php @@ -6,7 +6,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Table; diff --git a/libraries/gis/GISVisualization.php b/libraries/gis/GISVisualization.php index c9be03c95a..37f668f580 100644 --- a/libraries/gis/GISVisualization.php +++ b/libraries/gis/GISVisualization.php @@ -8,7 +8,7 @@ namespace PMA\libraries\gis; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Util; use \TCPDF; use PMA\libraries\Sanitize; diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 6e0c60cd6a..38327a4b53 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Import */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Table; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 07594fbe0b..9bbf4cd1b6 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -87,7 +87,7 @@ function PMA_analyzeWhereClauses( . PMA\libraries\Util::backquote($table) . ' WHERE ' . $where_clause . ';'; $result[$key_id] = $GLOBALS['dbi']->query( - $local_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $local_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $rows[$key_id] = $GLOBALS['dbi']->fetchAssoc($result[$key_id]); @@ -167,7 +167,7 @@ function PMA_loadFirstRow($table, $db) 'SELECT * FROM ' . PMA\libraries\Util::backquote($db) . '.' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $rows = array_fill(0, $GLOBALS['cfg']['InsertRows'], false); return array($result, $rows); @@ -2091,7 +2091,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, . ' WHERE ' . PMA\libraries\Util::backquote($foreigner['foreign_field']) . $where_comparison; $dispresult = $GLOBALS['dbi']->tryQuery( - $dispsql, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $dispsql, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($dispresult && $GLOBALS['dbi']->numRows($dispresult) > 0) { list($dispval) = $GLOBALS['dbi']->fetchRow($dispresult, 0); diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 1613b44156..87ea8125b1 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; require_once './libraries/hash.lib.php'; /** diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index beb7003b84..07acc84a88 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -181,7 +181,7 @@ function PMA_getHtmlContentsFor1NFStep2($db, $table) { $step = 2; $stepTxt = __('Have a primary key'); - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $hasPrimaryKey = "0"; $legendText = __('Step 1.') . $step . " " . $stepTxt; $extra = ''; @@ -288,7 +288,7 @@ function PMA_getHtmlContentsFor1NFStep3($db, $table) . '<input type="submit" value="' . __('No repeating group') . '" onclick="goToStep4();"' . '/>'; - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); foreach ($primarycols as $col) { @@ -315,7 +315,7 @@ function PMA_getHtmlContentsFor1NFStep3($db, $table) function PMA_getHtmlFor2NFstep1($db, $table) { $legendText = __('Step 2.') . "1 " . __('Find partial dependencies'); - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); $subText = ''; @@ -521,7 +521,7 @@ function PMA_getHtmlForNewTables3NF($dependencies, $tables, $db) if (count(array_unique($arrDependson)) == 1) { continue; } - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); foreach ($primarycols as $col) { @@ -735,7 +735,7 @@ function PMA_getHtmlFor3NFstep1($db, $tables) ); $cnt = 0; foreach ($tables as $table) { - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $selectTdForm = ""; $pk = array(); @@ -847,7 +847,7 @@ function PMA_findPartialDependencies($table, $db) . Util::backquote($table) . ' LIMIT 500) as dt;' ); $totalRows = $totalRowsRes[0]; - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); foreach ($primarycols as $col) { diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index c6bac87eef..ba6487e812 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ use PMA\libraries\engines\Innodb; -use PMA\libraries\Charsets; -use PMA\libraries\Core; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Partition; use PMA\libraries\plugins\export\ExportSql; diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/plugins/AuthenticationPlugin.php index 63f4cd187c..37e5b6c9a1 100644 --- a/libraries/plugins/AuthenticationPlugin.php +++ b/libraries/plugins/AuthenticationPlugin.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\plugins; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Sanitize; use PMA\libraries\URL; diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php index 2856ab0108..f3775661c6 100644 --- a/libraries/plugins/auth/AuthenticationCookie.php +++ b/libraries/plugins/auth/AuthenticationCookie.php @@ -9,13 +9,13 @@ namespace PMA\libraries\plugins\auth; use phpseclib\Crypt; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\LanguageManager; use PMA\libraries\Message; use PMA\libraries\plugins\AuthenticationPlugin; use PMA\libraries\Response; use PMA\libraries\Util; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; use ReCaptcha; use PMA\libraries\URL; diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/plugins/auth/AuthenticationHttp.php index 4595f64194..8b4df70543 100644 --- a/libraries/plugins/auth/AuthenticationHttp.php +++ b/libraries/plugins/auth/AuthenticationHttp.php @@ -12,8 +12,8 @@ namespace PMA\libraries\plugins\auth; use PMA\libraries\plugins\AuthenticationPlugin; use PMA\libraries\Message; use PMA\libraries\Response; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; require_once './libraries/hash.lib.php'; diff --git a/libraries/plugins/auth/AuthenticationSignon.php b/libraries/plugins/auth/AuthenticationSignon.php index f1e1685ddf..7d5a4d2347 100644 --- a/libraries/plugins/auth/AuthenticationSignon.php +++ b/libraries/plugins/auth/AuthenticationSignon.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\auth; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\plugins\AuthenticationPlugin; use PMA; diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/plugins/export/ExportCsv.php index 5548365879..97a561b15f 100644 --- a/libraries/plugins/export/ExportCsv.php +++ b/libraries/plugins/export/ExportCsv.php @@ -9,6 +9,7 @@ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; @@ -228,7 +229,7 @@ class ExportCsv extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $fields_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/plugins/export/ExportHtmlword.php index 09057a1fb5..7c1fb3ba93 100644 --- a/libraries/plugins/export/ExportHtmlword.php +++ b/libraries/plugins/export/ExportHtmlword.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportJson.php b/libraries/plugins/export/ExportJson.php index 5f582d5619..860e7c7ba8 100644 --- a/libraries/plugins/export/ExportJson.php +++ b/libraries/plugins/export/ExportJson.php @@ -8,6 +8,7 @@ */ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; @@ -236,7 +237,7 @@ class ExportJson extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $columns_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/plugins/export/ExportLatex.php index 678c234245..bfd0c29778 100644 --- a/libraries/plugins/export/ExportLatex.php +++ b/libraries/plugins/export/ExportLatex.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/plugins/export/ExportMediawiki.php index d2d9dfb731..892103b73d 100644 --- a/libraries/plugins/export/ExportMediawiki.php +++ b/libraries/plugins/export/ExportMediawiki.php @@ -8,6 +8,7 @@ */ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; @@ -329,7 +330,7 @@ class ExportMediawiki extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $fields_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportOds.php b/libraries/plugins/export/ExportOds.php index 87fb42a6a5..9d1870be75 100644 --- a/libraries/plugins/export/ExportOds.php +++ b/libraries/plugins/export/ExportOds.php @@ -14,7 +14,7 @@ use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\TextPropertyItem; use PMA\libraries\OpenDocument; diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/plugins/export/ExportOdt.php index 9852219673..9ce688fa05 100644 --- a/libraries/plugins/export/ExportOdt.php +++ b/libraries/plugins/export/ExportOdt.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/plugins/export/ExportPhparray.php index b48c214748..030b89c8cb 100644 --- a/libraries/plugins/export/ExportPhparray.php +++ b/libraries/plugins/export/ExportPhparray.php @@ -9,6 +9,7 @@ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; @@ -181,7 +182,7 @@ class ExportPhparray extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $columns_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php index eafb399180..fad8a88e5e 100644 --- a/libraries/plugins/export/ExportSql.php +++ b/libraries/plugins/export/ExportSql.php @@ -13,8 +13,8 @@ use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Token; -use PMA\libraries\Charsets; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; @@ -1386,7 +1386,7 @@ class ExportSql extends ExportPlugin $compat = 'NONE'; } - // need to use PMA\libraries\DatabaseInterface::QUERY_STORE + // need to use PhpMyAdmin\DatabaseInterface::QUERY_STORE // with $GLOBALS['dbi']->numRows() in mysqli $result = $GLOBALS['dbi']->query( 'SHOW TABLE STATUS FROM ' . Util::backquote($db) diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/plugins/export/ExportTexytext.php index f8e0bbf09a..f3b0c375ab 100644 --- a/libraries/plugins/export/ExportTexytext.php +++ b/libraries/plugins/export/ExportTexytext.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportXml.php b/libraries/plugins/export/ExportXml.php index be8970988d..47613218b4 100644 --- a/libraries/plugins/export/ExportXml.php +++ b/libraries/plugins/export/ExportXml.php @@ -13,7 +13,7 @@ use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Util; diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/plugins/export/ExportYaml.php index 6689b864a8..d0f2b3d96d 100644 --- a/libraries/plugins/export/ExportYaml.php +++ b/libraries/plugins/export/ExportYaml.php @@ -9,6 +9,7 @@ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; @@ -157,7 +158,7 @@ class ExportYaml extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $columns_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/plugins/export/helpers/Pdf.php index 62410a54d9..3269891d02 100644 --- a/libraries/plugins/export/helpers/Pdf.php +++ b/libraries/plugins/export/helpers/Pdf.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export\helpers; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\PDF as PdfLib; use PMA\libraries\Transformations; use PMA\libraries\Util; diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php index 07744277d6..726de09542 100644 --- a/libraries/plugins/import/ImportSql.php +++ b/libraries/plugins/import/ImportSql.php @@ -172,7 +172,7 @@ class ImportSql extends ImportPlugin /** * Handle compatibility options * - * @param PMA\libraries\DatabaseInterface $dbi Database interface + * @param PhpMyAdmin\DatabaseInterface $dbi Database interface * @param array $request Request array * * @return void diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/plugins/schema/ExportRelationSchema.php index ae203b2b28..43fb5feb18 100644 --- a/libraries/plugins/schema/ExportRelationSchema.php +++ b/libraries/plugins/schema/ExportRelationSchema.php @@ -8,8 +8,8 @@ */ namespace PMA\libraries\plugins\schema; -use PMA; use PMA\libraries\URL; +use PMA\libraries\Util; /** * This class is inherited by all schema classes @@ -262,8 +262,8 @@ class ExportRelationSchema // Get the name of this page to use as filename if ($this->pageNumber != -1 && !$this->offline) { $_name_sql = 'SELECT page_descr FROM ' - . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.' - . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['pdf_pages']) + . Util::backquote($GLOBALS['cfgRelation']['db']) . '.' + . Util::backquote($GLOBALS['cfgRelation']['pdf_pages']) . ' WHERE page_nr = ' . $this->pageNumber; $_name_rs = PMA_queryAsControlUser($_name_sql); $_name_row = $GLOBALS['dbi']->fetchRow($_name_rs); diff --git a/libraries/plugins/schema/TableStats.php b/libraries/plugins/schema/TableStats.php index 69fea39655..66df3c2e52 100644 --- a/libraries/plugins/schema/TableStats.php +++ b/libraries/plugins/schema/TableStats.php @@ -7,7 +7,9 @@ */ namespace PMA\libraries\plugins\schema; -use PMA; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Index; +use PMA\libraries\Util; /** * Table preferences/statistics @@ -78,16 +80,16 @@ abstract class TableStats */ protected function validateTableAndLoadFields() { - $sql = 'DESCRIBE ' . PMA\libraries\Util::backquote($this->tableName); + $sql = 'DESCRIBE ' . Util::backquote($this->tableName); $result = $GLOBALS['dbi']->tryQuery( - $sql, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql, null, DatabaseInterface::QUERY_STORE ); if (! $result || ! $GLOBALS['dbi']->numRows($result)) { $this->showMissingTableError(); } if ($this->showKeys) { - $indexes = PMA\libraries\Index::getFromTable($this->tableName, $this->db); + $indexes = Index::getFromTable($this->tableName, $this->db); $all_columns = array(); foreach ($indexes as $index) { $all_columns = array_merge( @@ -145,8 +147,8 @@ abstract class TableStats protected function loadPrimaryKey() { $result = $GLOBALS['dbi']->query( - 'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($this->tableName) . ';', - null, PMA\libraries\DatabaseInterface::QUERY_STORE + 'SHOW INDEX FROM ' . Util::backquote($this->tableName) . ';', + null, DatabaseInterface::QUERY_STORE ); if ($GLOBALS['dbi']->numRows($result) > 0) { while ($row = $GLOBALS['dbi']->fetchAssoc($result)) { diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/plugins/schema/dia/Dia.php index 9bd93c6436..469d8f971d 100644 --- a/libraries/plugins/schema/dia/Dia.php +++ b/libraries/plugins/schema/dia/Dia.php @@ -8,7 +8,7 @@ namespace PMA\libraries\plugins\schema\dia; use PMA; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use XMLWriter; diff --git a/libraries/plugins/schema/eps/Eps.php b/libraries/plugins/schema/eps/Eps.php index 3cf4034906..ca05197ca5 100644 --- a/libraries/plugins/schema/eps/Eps.php +++ b/libraries/plugins/schema/eps/Eps.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\plugins\schema\eps; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; /** diff --git a/libraries/plugins/schema/eps/TableStatsEps.php b/libraries/plugins/schema/eps/TableStatsEps.php index c53cb883dc..9d4a3c2a0c 100644 --- a/libraries/plugins/schema/eps/TableStatsEps.php +++ b/libraries/plugins/schema/eps/TableStatsEps.php @@ -7,6 +7,7 @@ */ namespace PMA\libraries\plugins\schema\eps; +use PhpMyAdmin\Font; use PMA; use PMA\libraries\plugins\schema\ExportRelationSchema; use PMA\libraries\plugins\schema\TableStats; @@ -108,10 +109,10 @@ class TableStatsEps extends TableStats foreach ($this->fields as $field) { $this->width = max( $this->width, - PMA\libraries\Font::getStringWidth($field, $font, $fontSize) + Font::getStringWidth($field, $font, $fontSize) ); } - $this->width += PMA\libraries\Font::getStringWidth( + $this->width += Font::getStringWidth( ' ', $font, $fontSize @@ -121,7 +122,7 @@ class TableStatsEps extends TableStats * table title is affected by the table width value */ while ($this->width - < PMA\libraries\Font::getStringWidth( + < Font::getStringWidth( $this->getTitle(), $font, $fontSize diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php index 75ffe8b00c..897c897eac 100644 --- a/libraries/plugins/schema/svg/Svg.php +++ b/libraries/plugins/schema/svg/Svg.php @@ -8,7 +8,7 @@ namespace PMA\libraries\plugins\schema\svg; use PMA; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use XMLWriter; diff --git a/libraries/plugins/schema/svg/TableStatsSvg.php b/libraries/plugins/schema/svg/TableStatsSvg.php index 7675d5badc..4239fdb256 100644 --- a/libraries/plugins/schema/svg/TableStatsSvg.php +++ b/libraries/plugins/schema/svg/TableStatsSvg.php @@ -7,6 +7,7 @@ */ namespace PMA\libraries\plugins\schema\svg; +use PhpMyAdmin\Font; use PMA; use PMA\libraries\plugins\schema\ExportRelationSchema; use PMA\libraries\plugins\schema\TableStats; @@ -109,17 +110,17 @@ class TableStatsSvg extends TableStats foreach ($this->fields as $field) { $this->width = max( $this->width, - PMA\libraries\Font::getStringWidth($field, $font, $fontSize) + Font::getStringWidth($field, $font, $fontSize) ); } - $this->width += PMA\libraries\Font::getStringWidth(' ', $font, $fontSize); + $this->width += Font::getStringWidth(' ', $font, $fontSize); /* * it is unknown what value must be added, because * table title is affected by the table width value */ while ($this->width - < PMA\libraries\Font::getStringWidth($this->getTitle(), $font, $fontSize) + < Font::getStringWidth($this->getTitle(), $font, $fontSize) ) { $this->width += 7; } diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 67f7ee7894..4af26bbcd3 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -92,7 +92,7 @@ function PMA_getColumnsInfo() true ), null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $tbl_name_i = $GLOBALS['PMD']['TABLE_NAME'][$i]; $j = 0; @@ -121,7 +121,7 @@ function PMA_getScriptContr() $alltab_rs = $GLOBALS['dbi']->query( 'SHOW TABLES FROM ' . PMA\libraries\Util::backquote($GLOBALS['db']), null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); while ($val = @$GLOBALS['dbi']->fetchRow($alltab_rs)) { $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal'); @@ -203,7 +203,7 @@ function PMA_getAllKeys($unique_only = false) foreach ($GLOBALS['PMD']['TABLE_NAME_SMALL'] as $I => $table) { $schema = $GLOBALS['PMD']['OWNER'][$I]; // for now, take into account only the first index segment - foreach (PMA\libraries\Index::getFromTable($table, $schema) as $index) { + foreach (PhpMyAdmin\Index::getFromTable($table, $schema) as $index) { if ($unique_only && ! $index->isUnique()) { continue; } @@ -268,7 +268,7 @@ function PMA_getTablePositions($pg) 'name', null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); return $tab_pos; } @@ -296,7 +296,7 @@ function PMA_getPageName($pg) null, null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); return count($page_name) ? $page_name[0] : null; } @@ -319,7 +319,7 @@ function PMA_deletePage($pg) . "." . PMA\libraries\Util::backquote($cfgRelation['table_coords']) . " WHERE " . PMA\libraries\Util::backquote('pdf_page_number') . " = " . intval($pg); $success = PMA_queryAsControlUser( - $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($success) { @@ -327,7 +327,7 @@ function PMA_deletePage($pg) . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages']) . " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . intval($pg); $success = PMA_queryAsControlUser( - $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); } @@ -360,7 +360,7 @@ function PMA_getDefaultPage($db) null, null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (count($default_page_no)) { @@ -400,7 +400,7 @@ function PMA_getLoadingPage($db) null, null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (count($min_page_no[0])) { $page_no = $min_page_no[0]; @@ -458,7 +458,7 @@ function PMA_saveTablePositions($pg) $res = PMA_queryAsControlUser( $query, true, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (!$res) { @@ -483,7 +483,7 @@ function PMA_saveTablePositions($pg) . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['t_y'][$key]) . "')"; $res = PMA_queryAsControlUser( - $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); } @@ -630,7 +630,7 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update) . "'" . $GLOBALS['dbi']->escapeString($T1) . "', " . "'" . $GLOBALS['dbi']->escapeString($F1) . "')"; - if (PMA_queryAsControlUser($q, false, PMA\libraries\DatabaseInterface::QUERY_STORE) + if (PMA_queryAsControlUser($q, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE) ) { return array(true, __('Internal relationship has been added.')); } @@ -702,7 +702,7 @@ function PMA_removeRelation($T1, $F1, $T2, $F2) $result = PMA_queryAsControlUser( $delete_query, false, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (!$result) { diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index fbdea1c003..732ef5b6b0 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Table; use PMA\libraries\RecentFavoriteTable; @@ -510,7 +510,7 @@ function PMA_checkRelationsParam() $GLOBALS['cfg']['Server']['pmadb'] ); $tab_rs = PMA_queryAsControlUser( - $tab_query, false, PMA\libraries\DatabaseInterface::QUERY_STORE + $tab_query, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (! $tab_rs) { @@ -688,7 +688,7 @@ function PMA_tryUpgradeTransformations() ) . ' WHERE Field IN (\'' . implode('\', \'', $new_cols) . '\')'; $result = PMA_queryAsControlUser( - $query, false, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($result) { $rows = $GLOBALS['dbi']->numRows($result); @@ -936,7 +936,7 @@ function PMA_getDbComment($db) AND table_name = '' AND column_name = '(db_comment)'"; $com_rs = PMA_queryAsControlUser( - $com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $com_qry, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($com_rs && $GLOBALS['dbi']->numRows($com_rs) > 0) { @@ -970,7 +970,7 @@ function PMA_getDbComments() . " WHERE `column_name` = '(db_comment)'"; $com_rs = PMA_queryAsControlUser( - $com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $com_qry, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($com_rs && $GLOBALS['dbi']->numRows($com_rs) > 0) { diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index cb93944849..76a9c7889d 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 9ca7c34fdb..1810ef6844 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\URL; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 654371eede..2f38fbe693 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -5,8 +5,8 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Charsets; -use PMA\libraries\Core; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Util; @@ -73,7 +73,7 @@ function PMA_RTN_main($type) /** * Display a warning for users with PHP's old "mysql" extension. */ - if (! PMA\libraries\DatabaseInterface::checkDbExtension('mysqli')) { + if (! PhpMyAdmin\DatabaseInterface::checkDbExtension('mysqli')) { trigger_error( __( 'You are using PHP\'s deprecated \'mysql\' extension, ' diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index eb6a9f4e1d..2068e24f40 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Template; @@ -3709,7 +3709,7 @@ function PMA_getHtmlForInitials($array_initials) 'SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user`' . ' ORDER BY UPPER(LEFT(`User`,1)) ASC', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($initials) { while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) { @@ -4587,10 +4587,10 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir) $sql_query_all .= ' ;'; $res = $GLOBALS['dbi']->tryQuery( - $sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $res_all = $GLOBALS['dbi']->tryQuery( - $sql_query_all, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql_query_all, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (! $res) { @@ -4603,7 +4603,7 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir) $GLOBALS['dbi']->freeResult($res_all); $sql_query = 'SELECT * FROM `mysql`.`user`'; $res = $GLOBALS['dbi']->tryQuery( - $sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (! $res) { @@ -4829,7 +4829,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition, 'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' . $user_host_condition, $GLOBALS['userlink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); while ($row = $GLOBALS['dbi']->fetchAssoc($res)) { @@ -4846,7 +4846,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition, . ' = \'' . $GLOBALS['dbi']->escapeString($row['Table_name']) . "'" . ';', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $tmp_privs1 = PMA_extractPrivInfo($row); diff --git a/libraries/server_status_advisor.lib.php b/libraries/server_status_advisor.lib.php index 3f23c8f25a..0b27de674b 100644 --- a/libraries/server_status_advisor.lib.php +++ b/libraries/server_status_advisor.lib.php @@ -9,7 +9,7 @@ */ /** - * Returns html with PMA\libraries\Advisor + * Returns html with PhpMyAdmin\Advisor * * @return string */ @@ -50,7 +50,7 @@ function PMA_getHtmlForAdvisor() $output .= '</p>'; $output .= '</div>'; $output .= '<div id="advisorData" class="hide">'; - $advisor = new PMA\libraries\Advisor(); + $advisor = new PhpMyAdmin\Advisor(); $output .= htmlspecialchars( json_encode( $advisor->run() diff --git a/libraries/session.inc.php b/libraries/session.inc.php index b0addbcc11..cf32c779ce 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -9,7 +9,7 @@ * @see https://secure.php.net/session */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (! defined('PHPMYADMIN')) { exit; @@ -84,7 +84,7 @@ session_cache_limiter('private'); /** * Session failed function * - * @param array $errors PMA\libraries\ErrorHandler array + * @param array $errors PhpMyAdmin\ErrorHandler array * * @return void */ diff --git a/libraries/session.lib.php b/libraries/session.lib.php index 62b0820883..d784e27edb 100644 --- a/libraries/session.lib.php +++ b/libraries/session.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Util; /** diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 3f945879c1..9033e359e7 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -10,9 +10,9 @@ * @usedby tbl_tracking.php * @package PhpMyAdmin */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; use PMA\libraries\URL; -use PMA\libraries\Bookmark; +use PhpMyAdmin\Bookmark; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 57fefedacb..afc0fcd66a 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -90,7 +90,7 @@ $comments_map = PMA_getComments($db, $table); $move_columns = array(); if (isset($fields_meta)) { - /** @var PMA\libraries\DatabaseInterface $dbi */ + /** @var PhpMyAdmin\DatabaseInterface $dbi */ $dbi = \PMA\libraries\di\Container::getDefaultContainer()->get('dbi'); $move_columns = $dbi->getTable($db, $table)->getColumnsMeta(); } diff --git a/libraries/tbl_partition_definition.inc.php b/libraries/tbl_partition_definition.inc.php index 8e2ae09e5e..1ef4a9db6c 100644 --- a/libraries/tbl_partition_definition.inc.php +++ b/libraries/tbl_partition_definition.inc.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (!isset($partitionDetails)) { diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index d6e0522a34..f410e3dfb0 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Tracker; diff --git a/libraries/twig/CharsetsExtension.php b/libraries/twig/CharsetsExtension.php index dfbcb09add..49d1ca58b1 100644 --- a/libraries/twig/CharsetsExtension.php +++ b/libraries/twig/CharsetsExtension.php @@ -27,7 +27,7 @@ class CharsetsExtension extends Twig_Extension return array( new Twig_SimpleFunction( 'Charsets_getCollationDescr', - 'PMA\libraries\Charsets::getCollationDescr' + 'PhpMyAdmin\Charsets::getCollationDescr' ), ); } diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index f86bf7bdf7..3cbc5810f9 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\ConfigFile; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\URL; @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\Linter; +use PhpMyAdmin\Core; +use PhpMyAdmin\Linter; use PMA\libraries\Response; $_GET['ajax_request'] = 'true'; diff --git a/logout.php b/logout.php index ff31a307a1..e715ed16e3 100644 --- a/logout.php +++ b/logout.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; require_once 'libraries/common.inc.php'; diff --git a/normalization.php b/normalization.php index 48cb46a165..f5d6f5bf45 100644 --- a/normalization.php +++ b/normalization.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/prefs_forms.php b/prefs_forms.php index 5ee6be0da2..f4d866d9bc 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -7,7 +7,7 @@ */ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use PMA\libraries\URL; diff --git a/prefs_manage.php b/prefs_manage.php index 726392641e..c5e987a582 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -7,8 +7,8 @@ */ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; -use PMA\libraries\File; +use PhpMyAdmin\Core; +use PhpMyAdmin\File; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Util; diff --git a/schema_export.php b/schema_export.php index 210facbea0..5ceff249ad 100644 --- a/schema_export.php +++ b/schema_export.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\plugins\SchemaPlugin; /** diff --git a/scripts/advisor2po b/scripts/advisor2po index fe0b34b0d2..128a5ecf50 100644 --- a/scripts/advisor2po +++ b/scripts/advisor2po @@ -15,7 +15,7 @@ function add_message($rules, $idx, $type) { global $messages, $locations; // Get message text if ($type == 'justification') { - $msgs = PMA\libraries\Advisor::splitJustification($rules['rules'][$idx]); + $msgs = PhpMyAdmin\Advisor::splitJustification($rules['rules'][$idx]); $msg = $msgs[0]; } else { $msg = $rules['rules'][$idx][$type]; @@ -43,7 +43,7 @@ function print_message($idx) { echo '#, php-format'; echo "\n"; } - echo 'msgid "' . addcslashes(PMA\libraries\Advisor::escapePercent($messages[$idx]), '"\\') . '"'; + echo 'msgid "' . addcslashes(PhpMyAdmin\Advisor::escapePercent($messages[$idx]), '"\\') . '"'; echo "\n"; echo 'msgstr ""'; echo "\n"; @@ -53,7 +53,7 @@ define('PHPMYADMIN', 1); require_once 'libraries/vendor_config.php'; require_once AUTOLOAD_FILE; -$rules = PMA\libraries\Advisor::parseRulesFile(); +$rules = PhpMyAdmin\Advisor::parseRulesFile(); foreach($rules['rules'] as $idx => $rule) { add_message($rules, $idx, 'name'); diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 22c43baec0..69ce6189ba 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -131,7 +131,7 @@ if [ $do_ci -eq 0 -a -$do_daily -eq 0 ] ; then cat <<END Please ensure you have incremented rc count or version in the repository : - - in $CONFIG_LIB PMA\libraries\Config::__constructor() the line + - in $CONFIG_LIB PhpMyAdmin\Config::__constructor() the line " \$this->set( 'PMA_VERSION', '$version' ); " - in doc/conf.py the line " version = '$version' " @@ -444,7 +444,7 @@ Todo now: based on documentation. 6. increment rc count or version in the repository : - - in $CONFIG_LIB PMA\libraries\Config::__constructor() the line + - in $CONFIG_LIB PhpMyAdmin\Config::__constructor() the line " \$this->set( 'PMA_VERSION', '2.7.1-dev' ); " - in Documentation.html (if it exists) the 2 lines " <title>phpMyAdmin 2.2.2-rc1 - Documentation</title> " diff --git a/server_privileges.php b/server_privileges.php index 170e923c45..e43f8c3df5 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; /** diff --git a/setup/config.php b/setup/config.php index b5a2d5c6d4..c41391dae7 100644 --- a/setup/config.php +++ b/setup/config.php @@ -7,7 +7,7 @@ */ use PMA\libraries\config\FormDisplay; use PMA\setup\lib\ConfigGenerator; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php index e7c3c3bb76..fc4de3bf35 100644 --- a/setup/frames/config.inc.php +++ b/setup/frames/config.inc.php @@ -7,7 +7,7 @@ */ use PMA\setup\lib\ConfigGenerator; -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (!defined('PHPMYADMIN')) { exit; diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index 9d64f660dd..9cf80405f3 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -7,7 +7,7 @@ */ use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (!defined('PHPMYADMIN')) { exit; diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 1405a4a17c..55fe3de9b0 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -9,8 +9,8 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; use PMA\libraries\config\ServerConfigChecks; -use PMA\libraries\Core; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\Core; +use PhpMyAdmin\LanguageManager; use PMA\libraries\URL; use PMA\libraries\Sanitize; diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php index 1784525202..0a36674ea3 100644 --- a/setup/frames/servers.inc.php +++ b/setup/frames/servers.inc.php @@ -8,7 +8,7 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; if (!defined('PHPMYADMIN')) { diff --git a/setup/index.php b/setup/index.php index 39ec3d8c64..84dd1429d1 100644 --- a/setup/index.php +++ b/setup/index.php @@ -7,7 +7,7 @@ * @license https://www.gnu.org/licenses/gpl.html GNU GPL 2.0 */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Core libraries. diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index b6f393e256..2316b4f371 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-Setup */ use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/setup/validate.php b/setup/validate.php index 70df31a4cf..cbfe619992 100644 --- a/setup/validate.php +++ b/setup/validate.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-Setup */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Core libraries. diff --git a/tbl_create.php b/tbl_create.php index 1beffcb3c7..d3f35da948 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/tbl_get_field.php b/tbl_get_field.php index 384eae91ef..7ab8936412 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Common functions. diff --git a/tbl_indexes.php b/tbl_indexes.php index 467e6289fd..362c6416d0 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -9,7 +9,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableIndexesController; -use PMA\libraries\Index; +use PhpMyAdmin\Index; use PMA\libraries\Response; require_once 'libraries/common.inc.php'; diff --git a/tbl_operations.php b/tbl_operations.php index a8e977fb83..1f3073f621 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -308,7 +308,7 @@ $hideOrderTable = false; // a user-defined clustered index (PRIMARY KEY or NOT NULL UNIQUE index). // InnoDB always orders table rows according to such an index if one is present. if ($tbl_storage_engine == 'INNODB') { - $indexes = PMA\libraries\Index::getFromTable($GLOBALS['table'], $GLOBALS['db']); + $indexes = PhpMyAdmin\Index::getFromTable($GLOBALS['table'], $GLOBALS['db']); foreach ($indexes as $name => $idx) { if ($name == 'PRIMARY') { $hideOrderTable = true; diff --git a/tbl_replace.php b/tbl_replace.php index e608c83fa5..84a6685f14 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -12,7 +12,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\plugins\IOTransformationsPlugin; use PMA\libraries\Response; use PMA\libraries\Table; @@ -206,7 +206,7 @@ foreach ($loop_array as $rownumber => $where_clause) { // Note: $key is an md5 of the fieldname. The actual fieldname is // available in $multi_edit_columns_name[$key] - $file_to_insert = new PMA\libraries\File(); + $file_to_insert = new PhpMyAdmin\File(); $file_to_insert->checkTblChangeForm($key, $rownumber); $possibly_uploaded_val = $file_to_insert->getContent(); diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml index 97f8636346..dd3084c1f9 100644 --- a/templates/columns_definitions/column_attributes.phtml +++ b/templates/columns_definitions/column_attributes.phtml @@ -54,7 +54,7 @@ $ci_offset = -1; <td class="center"> <!-- column collation --> <?php $tmp_collation = empty($columnMeta['Collation']) ? null : $columnMeta['Collation']; ?> - <?= PMA\libraries\Charsets::getCollationDropdownBox( + <?= PhpMyAdmin\Charsets::getCollationDropdownBox( 'field_collation[' . $columnNumber . ']', 'field_' . $columnNumber . '_' . ($ci - $ci_offset), $tmp_collation, diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml index e8bb5cf90a..07ed3c51b0 100644 --- a/templates/columns_definitions/column_definitions_form.phtml +++ b/templates/columns_definitions/column_definitions_form.phtml @@ -114,7 +114,7 @@ use PMA\libraries\URL; </td> <td width="25"> </td> <td> - <?= PMA\libraries\Charsets::getCollationDropdownBox( + <?= PhpMyAdmin\Charsets::getCollationDropdownBox( 'tbl_collation', null, isset($_REQUEST['tbl_collation']) ? $_REQUEST['tbl_collation'] : null, diff --git a/templates/database/structure/body_for_table_summary.phtml b/templates/database/structure/body_for_table_summary.phtml index ea53f2a19f..68cc079f96 100644 --- a/templates/database/structure/body_for_table_summary.phtml +++ b/templates/database/structure/body_for_table_summary.phtml @@ -52,7 +52,7 @@ $cell_text = ($approx_rows) </th> <th> <?php if (! empty($db_collation)): ?> - <dfn title="<?= PMA\libraries\Charsets::getCollationDescr($db_collation) , ' (' , __('Default') , ')'; ?>"> + <dfn title="<?= PhpMyAdmin\Charsets::getCollationDescr($db_collation) , ' (' , __('Default') , ')'; ?>"> <?= $db_collation; ?> </dfn> <?php endif; ?> diff --git a/templates/database/structure/show_create_row.phtml b/templates/database/structure/show_create_row.phtml index e73c7ad350..824e928a23 100644 --- a/templates/database/structure/show_create_row.phtml +++ b/templates/database/structure/show_create_row.phtml @@ -1,4 +1,4 @@ -<?php use PMA\libraries\Core; ?> +<?php use PhpMyAdmin\Core; ?> <fieldset> <legend><?= $title; ?></legend> <table class="show_create"> diff --git a/templates/database/structure/sortable_header.phtml b/templates/database/structure/sortable_header.phtml index f96c3e4560..48a5357abc 100644 --- a/templates/database/structure/sortable_header.phtml +++ b/templates/database/structure/sortable_header.phtml @@ -1,5 +1,5 @@ <?php -use PMA\libraries\Core; +use PhpMyAdmin\Core; $requested_sort = 'table'; $requested_sort_order = $future_sort_order = $initial_sort_order; diff --git a/templates/server/databases/create.phtml b/templates/server/databases/create.phtml index 2488316fbb..7f5ee2ca31 100644 --- a/templates/server/databases/create.phtml +++ b/templates/server/databases/create.phtml @@ -18,7 +18,7 @@ <input type="text" name="new_db" value="<?= htmlspecialchars($GLOBALS['db_to_create']); ?>" maxlength="64" class="textfield" id="text_create_db" required placeholder="<?= __('Database name'); ?>" /> - <?= PMA\libraries\Charsets::getCollationDropdownBox('db_collation', null, $GLOBALS['dbi']->getServerCollation(), true); ?> + <?= PhpMyAdmin\Charsets::getCollationDropdownBox('db_collation', null, $GLOBALS['dbi']->getServerCollation(), true); ?> <input type="submit" value="<?= __('Create'); ?>" id="buttonGo" /> </form> <?php else: ?> diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml index 8bcfea93e8..b743bf86a4 100644 --- a/templates/table/relation/foreign_key_row.phtml +++ b/templates/table/relation/foreign_key_row.phtml @@ -1,5 +1,5 @@ <?php -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Table; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml index bb36efd06a..ebcedb8ec9 100644 --- a/templates/table/structure/display_structure.phtml +++ b/templates/table/structure/display_structure.phtml @@ -1,5 +1,5 @@ <?php -use PMA\libraries\Index; +use PhpMyAdmin\Index; use PMA\libraries\Partition; use PMA\libraries\Template; use PMA\libraries\Tracker; diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 38fdebe17a..fbd51e8d25 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -61,14 +61,14 @@ if (PHP_SAPI == 'cli') { require_once 'libraries/vendor_config.php'; require_once AUTOLOAD_FILE; PhpMyAdmin\MoTranslator\Loader::loadFunctions(); -$CFG = new PMA\libraries\Config(); +$CFG = new PhpMyAdmin\Config(); // Initialize PMA_VERSION variable define('PMA_VERSION', $CFG->get('PMA_VERSION')); define('PMA_MAJOR_VERSION', $CFG->get('PMA_MAJOR_VERSION')); unset($CFG); /* Ensure default langauge is active */ -PMA\libraries\LanguageManager::getInstance()->getLanguage('en')->activate(); +PhpMyAdmin\LanguageManager::getInstance()->getLanguage('en')->activate(); // Set proxy information from env, if available $http_proxy = getenv('http_proxy'); diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index ccff7ca6ba..c6449d9dea 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -11,7 +11,7 @@ */ require_once 'test/PMATestCase.php'; -use PMA\libraries\Advisor; +use PhpMyAdmin\Advisor; use PMA\libraries\Theme; /** diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index 4d491b69d5..a27b656156 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-test */ -use PMA\libraries\Bookmark; +use PhpMyAdmin\Bookmark; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index b55a00468a..ea0036dfca 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-test */ +use PhpMyAdmin\Charsets; + /** * Tests for MySQL Charsets * @@ -19,7 +21,7 @@ class CharsetsTest extends PHPUnit_Framework_TestCase } /** - * Test case for PMA\libraries\Charsets::getCollationDescr() + * Test case for getCollationDescr() * * @param string $collation Collation for which description is reqd * @param string $desc Expected Description @@ -32,7 +34,7 @@ class CharsetsTest extends PHPUnit_Framework_TestCase { $this->assertEquals( $desc, - PMA\libraries\Charsets::getCollationDescr($collation) + Charsets::getCollationDescr($collation) ); } @@ -137,14 +139,14 @@ class CharsetsTest extends PHPUnit_Framework_TestCase } /** - * Test for PMA\libraries\Charsets::getCollationDropdownBox + * Test for getCollationDropdownBox * * @return void * @test */ public function testGetCollationDropdownBox() { - $result = PMA\libraries\Charsets::getCollationDropdownBox(); + $result = Charsets::getCollationDropdownBox(); $this->assertContains('name="collation"', $result); $this->assertNotContains('id="', $result); @@ -159,14 +161,14 @@ class CharsetsTest extends PHPUnit_Framework_TestCase } /** - * Test for PMA\libraries\Charsets::getCharsetDropdownBox + * Test for getCharsetDropdownBox * * @return void * @test */ public function testGetCharsetDropdownBox() { - $result = PMA\libraries\Charsets::getCharsetDropdownBox( + $result = Charsets::getCharsetDropdownBox( null, "test_id", "latin1", false, true ); $this->assertContains('name="character_set"', $result); @@ -176,4 +178,3 @@ class CharsetsTest extends PHPUnit_Framework_TestCase $this->assertContains('selected="selected">latin1', $result); } } - diff --git a/test/classes/ConfigGeneratorTest.php b/test/classes/ConfigGeneratorTest.php index 59c42fe97a..a302e84cab 100644 --- a/test/classes/ConfigGeneratorTest.php +++ b/test/classes/ConfigGeneratorTest.php @@ -9,7 +9,7 @@ /* * Include to test */ -use PMA\libraries\Config; +use PhpMyAdmin\Config; use PMA\libraries\config\ConfigFile; use PMA\setup\lib\ConfigGenerator; diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 1cb7a0f4a7..f6e6c74658 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA\libraries\Config class + * Test for PhpMyAdmin\Config class * * @package PhpMyAdmin-test * @group current @@ -16,7 +16,7 @@ require_once 'libraries/relation.lib.php'; require_once 'test/PMATestCase.php'; /** - * Tests behaviour of PMA\libraries\Config class + * Tests behaviour of PhpMyAdmin\Config class * * @package PhpMyAdmin-test */ @@ -28,7 +28,7 @@ class ConfigTest extends PMATestCase protected $backupGlobals = false; /** - * @var PMA\libraries\Config + * @var PhpMyAdmin\Config */ protected $object; @@ -45,14 +45,14 @@ class ConfigTest extends PMATestCase */ protected function setUp() { - $this->object = new PMA\libraries\Config; + $this->object = new PhpMyAdmin\Config; $GLOBALS['server'] = 0; $_SESSION['is_git_revision'] = true; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(CONFIG_FILE); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(CONFIG_FILE); $GLOBALS['cfg']['ProxyUrl'] = ''; //for testing file permissions - $this->permTestObj = new PMA\libraries\Config("./config.sample.inc.php"); + $this->permTestObj = new PhpMyAdmin\Config("./config.sample.inc.php"); } /** @@ -91,12 +91,12 @@ class ConfigTest extends PMATestCase { $this->assertContains( '<form name="form_fontsize_selection" id="form_fontsize_selection"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); $this->assertContains( '<label for="select_fontsize">', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); //test getFontsizeOptions for "em" unit @@ -105,44 +105,44 @@ class ConfigTest extends PMATestCase $_COOKIE['pma_fontsize'] = "10em"; $this->assertContains( '<option value="7em"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); $this->assertContains( '<option value="8em"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); //test getFontsizeOptions for "pt" unit $_COOKIE['pma_fontsize'] = "10pt"; $this->assertContains( '<option value="2pt"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); $this->assertContains( '<option value="4pt"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); //test getFontsizeOptions for "px" unit $_COOKIE['pma_fontsize'] = "10px"; $this->assertContains( '<option value="5px"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); $this->assertContains( '<option value="6px"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); //test getFontsizeOptions for unknown unit $_COOKIE['pma_fontsize'] = "10abc"; $this->assertContains( '<option value="7abc"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); $this->assertContains( '<option value="8abc"', - PMA\libraries\Config::getFontsizeForm() + PhpMyAdmin\Config::getFontsizeForm() ); unset($_COOKIE['pma_fontsize']); //rollback the fontsize setting diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index eea6c2f9e5..8997ecf9a2 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Tests for PMA\libraries\Core class + * Tests for PhpMyAdmin\Core class * * @package PhpMyAdmin-test */ @@ -11,12 +11,12 @@ */ require_once 'test/PMATestCase.php'; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; use PMA\libraries\Sanitize; /** - * Tests for PMA\libraries\Core class + * Tests for PhpMyAdmin\Core class * * @package PhpMyAdmin-test */ diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index 99c4b7aadb..0d4888bd03 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Util; require_once 'test/PMATestCase.php'; @@ -29,7 +29,7 @@ class DatabaseInterfaceTest extends PMATestCase function setup() { $extension = new PMA\libraries\dbi\DBIDummy(); - $this->_dbi = new PMA\libraries\DatabaseInterface($extension); + $this->_dbi = new DatabaseInterface($extension); } /** @@ -46,7 +46,7 @@ class DatabaseInterfaceTest extends PMATestCase $extension = new PMA\libraries\dbi\DBIDummy(); $extension->setResult('SELECT CURRENT_USER();', $value); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new DatabaseInterface($extension); $this->assertEquals( $expected, @@ -107,7 +107,7 @@ class DatabaseInterfaceTest extends PMATestCase ) ); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new DatabaseInterface($extension); $sql_query = "PMA_sql_query"; $view_columns = array( @@ -390,7 +390,7 @@ class DatabaseInterfaceTest extends PMATestCase $extension = new PMA\libraries\dbi\DBIDummy(); $extension->setResult('SELECT @@basedir', $value); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new DatabaseInterface($extension); $this->assertEquals( $expected, diff --git a/test/classes/DbQbeTest.php b/test/classes/DbQbeTest.php index 8f43204c7a..e758d44063 100644 --- a/test/classes/DbQbeTest.php +++ b/test/classes/DbQbeTest.php @@ -13,10 +13,10 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; require_once 'test/PMATestCase.php'; -use PMA\libraries\DbQbe; +use PhpMyAdmin\DbQbe; /** - * Tests for PMA\libraries\DbQbe class + * Tests for PhpMyAdmin\DbQbe class * * @package PhpMyAdmin-test */ @@ -40,7 +40,7 @@ class DbQbeTest extends PMATestCase $GLOBALS['server'] = 0; $GLOBALS['db'] = 'pma_test'; //mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -86,7 +86,7 @@ class DbQbeTest extends PMATestCase */ private function _callProtectedFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\DbQbe'); + $class = new ReflectionClass(DbQbe::class); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php index dab29f6a30..e9f0abba76 100644 --- a/test/classes/DbSearchTest.php +++ b/test/classes/DbSearchTest.php @@ -12,7 +12,7 @@ require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; -use PMA\libraries\DbSearch; +use PhpMyAdmin\DbSearch; use PMA\libraries\Theme; /** @@ -42,7 +42,7 @@ class DbSearchTest extends PMATestCase $GLOBALS['collation_connection'] = 'utf-8'; //mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -83,7 +83,7 @@ class DbSearchTest extends PMATestCase */ private function _callProtectedFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\DbSearch'); + $class = new ReflectionClass(DbSearch::class); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php index ad5bdad73a..e099cae788 100644 --- a/test/classes/DisplayResultsTest.php +++ b/test/classes/DisplayResultsTest.php @@ -8,7 +8,8 @@ /* * Include to test. */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; +use PhpMyAdmin\DisplayResults; use PMA\libraries\plugins\transformations\Text_Plain_Link; require_once 'libraries/relation.lib.php'; @@ -36,13 +37,13 @@ class DisplayResultsTest extends PMATestCase protected function setUp() { $GLOBALS['server'] = 0; - $this->object = new PMA\libraries\DisplayResults('as', '', '', ''); - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $this->object = new DisplayResults('as', '', '', ''); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['collation_connection'] = 'utf-8'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -74,7 +75,7 @@ class DisplayResultsTest extends PMATestCase */ private function _callPrivateFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\DisplayResults'); + $class = new ReflectionClass(DisplayResults::class); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); @@ -277,7 +278,7 @@ class DisplayResultsTest extends PMATestCase 'datetimefield', $this->_callPrivateFunction( '_getClassForDateTimeRelatedFields', - array(PMA\libraries\DisplayResults::DATETIME_FIELD) + array(DisplayResults::DATETIME_FIELD) ) ); } @@ -293,7 +294,7 @@ class DisplayResultsTest extends PMATestCase 'datefield', $this->_callPrivateFunction( '_getClassForDateTimeRelatedFields', - array(PMA\libraries\DisplayResults::DATE_FIELD) + array(DisplayResults::DATE_FIELD) ) ); } @@ -309,7 +310,7 @@ class DisplayResultsTest extends PMATestCase 'text', $this->_callPrivateFunction( '_getClassForDateTimeRelatedFields', - array(PMA\libraries\DisplayResults::STRING_FIELD) + array(DisplayResults::STRING_FIELD) ) ); } @@ -321,7 +322,7 @@ class DisplayResultsTest extends PMATestCase */ public function testGetOffsetsCase1() { - $_SESSION['tmpval']['max_rows'] = PMA\libraries\DisplayResults::ALL_ROWS; + $_SESSION['tmpval']['max_rows'] = DisplayResults::ALL_ROWS; $this->assertEquals( array(0, 0), $this->_callPrivateFunction('_getOffsets', array()) @@ -615,7 +616,7 @@ class DisplayResultsTest extends PMATestCase { return array( array( - PMA\libraries\DisplayResults::POSITION_LEFT, + DisplayResults::POSITION_LEFT, 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data' . '%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=' . 'The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3D' @@ -687,7 +688,7 @@ class DisplayResultsTest extends PMATestCase . '</div></td>' ), array( - PMA\libraries\DisplayResults::POSITION_RIGHT, + DisplayResults::POSITION_RIGHT, 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60' . '.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=' . 'The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3D' @@ -757,7 +758,7 @@ class DisplayResultsTest extends PMATestCase . '{"`new`.`id`":"= 1"}" /> </td>' ), array( - PMA\libraries\DisplayResults::POSITION_NONE, + DisplayResults::POSITION_NONE, 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.' . '%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+' . 'row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew' @@ -854,7 +855,7 @@ class DisplayResultsTest extends PMATestCase { return array( array( - PMA\libraries\DisplayResults::POSITION_NONE, + DisplayResults::POSITION_NONE, 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.' . '%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+' . 'row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew' @@ -1391,7 +1392,7 @@ class DisplayResultsTest extends PMATestCase * @param string $content the binary content * @param string $transformation_plugin transformation plugin. * Can also be the default function: - * PMA\libraries\Core::mimeDefaultFunction + * PhpMyAdmin\Core::mimeDefaultFunction * @param string $transform_options transformation parameters * @param string $default_function default transformation function * @param object $meta the meta-information about the field diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index 23c24aaadf..5860f7faf3 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; /** * Tests for Charset Conversions diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php index ddc4406f87..c228e4b003 100644 --- a/test/classes/ErrorHandlerTest.php +++ b/test/classes/ErrorHandlerTest.php @@ -9,12 +9,13 @@ * Include to test. */ +use PhpMyAdmin\ErrorHandler; use PMA\libraries\Theme; require_once 'test/PMATestCase.php'; /** - * Test for PMA\libraries\ErrorHandler class. + * Test for PhpMyAdmin\ErrorHandler class. * * @package PhpMyAdmin-test */ @@ -34,7 +35,7 @@ class ErrorHandlerTest extends PMATestCase */ protected function setUp() { - $this->object = new PMA\libraries\ErrorHandler(); + $this->object = new ErrorHandler(); } @@ -60,7 +61,7 @@ class ErrorHandlerTest extends PMATestCase */ private function _callProtectedFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\ErrorHandler'); + $class = new ReflectionClass(ErrorHandler::class); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index 1e528f620f..2395cb26bc 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -10,6 +10,7 @@ * Include to test. */ +use PhpMyAdmin\Error; use PMA\libraries\Theme; require_once 'test/PMATestCase.php'; @@ -35,8 +36,7 @@ class ErrorTest extends PMATestCase */ protected function setUp() { - $this->object = new PMA\libraries\Error('2', 'Compile Error', 'error.txt', 15); - + $this->object = new Error('2', 'Compile Error', 'error.txt', 15); } /** diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php index 53e6486f9b..a9898079d7 100644 --- a/test/classes/FileTest.php +++ b/test/classes/FileTest.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * tests for PMA\libraries\File class + * tests for PhpMyAdmin\File class * * @package PhpMyAdmin-test */ @@ -9,7 +9,7 @@ require_once 'test/PMATestCase.php'; /** - * tests for PMA\libraries\File class + * tests for PhpMyAdmin\File class * * @package PhpMyAdmin-test */ @@ -26,7 +26,7 @@ class FileTest extends PMATestCase } /** - * Test for PMA\libraries\File::getCompression + * Test for PhpMyAdmin\File::getCompression * * @param string $file file string * @param string $mime expected mime @@ -36,12 +36,12 @@ class FileTest extends PMATestCase */ public function testMIME($file, $mime) { - $arr = new PMA\libraries\File($file); + $arr = new PhpMyAdmin\File($file); $this->assertEquals($mime, $arr->getCompression()); } /** - * Test for PMA\libraries\File::getContent + * Test for PhpMyAdmin\File::getContent * * @param string $file file string * @@ -51,12 +51,12 @@ class FileTest extends PMATestCase public function testBinaryContent($file) { $data = '0x' . bin2hex(file_get_contents($file)); - $file = new PMA\libraries\File($file); + $file = new PhpMyAdmin\File($file); $this->assertEquals($data, $file->getContent()); } /** - * Test for PMA\libraries\File::read + * Test for PhpMyAdmin\File::read * * @param string $file file string * @@ -65,7 +65,7 @@ class FileTest extends PMATestCase */ public function testReadCompressed($file) { - $file = new PMA\libraries\File($file); + $file = new PhpMyAdmin\File($file); $file->setDecompressContent(true); $file->open(); $this->assertEquals("TEST FILE\n", $file->read(100)); diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php index 5efb7d06c1..fcf4163232 100644 --- a/test/classes/FontTest.php +++ b/test/classes/FontTest.php @@ -1,14 +1,16 @@ <?php /** - * Tests for PMA\libraries\Font class + * Tests for PhpMyAdmin\Font class * * @package PhpMyAdmin-test */ +use PhpMyAdmin\Font; + require_once 'test/PMATestCase.php'; /** - * Tests for PMA\libraries\Font class + * Tests for PhpMyAdmin\Font class * * @package PhpMyAdmin-test */ @@ -24,115 +26,115 @@ class FontTest extends PMATestCase // empty string $this->assertEquals( 0, - PMA\libraries\Font::getStringWidth("", "arial", "10") + Font::getStringWidth("", "arial", "10") ); // empty string $this->assertEquals( 3, - PMA\libraries\Font::getStringWidth(" ", "arial", "10") + Font::getStringWidth(" ", "arial", "10") ); // string "a" $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth("a", "arial", "10") + Font::getStringWidth("a", "arial", "10") ); // string "aa" $this->assertEquals( 12, - PMA\libraries\Font::getStringWidth("aa", "arial", "10") + Font::getStringWidth("aa", "arial", "10") ); // string "i" $this->assertEquals( 3, - PMA\libraries\Font::getStringWidth("i", "arial", "10") + Font::getStringWidth("i", "arial", "10") ); // string "f" $this->assertEquals( 3, - PMA\libraries\Font::getStringWidth("f", "arial", "10") + Font::getStringWidth("f", "arial", "10") ); // string "t" $this->assertEquals( 3, - PMA\libraries\Font::getStringWidth("t", "arial", "10") + Font::getStringWidth("t", "arial", "10") ); // string "if" $this->assertEquals( 5, - PMA\libraries\Font::getStringWidth("if", "arial", "10") + Font::getStringWidth("if", "arial", "10") ); // string "it" $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth("it", "arial", "10") + Font::getStringWidth("it", "arial", "10") ); // string "r" $this->assertEquals( 4, - PMA\libraries\Font::getStringWidth("r", "arial", "10") + Font::getStringWidth("r", "arial", "10") ); // string "1" $this->assertEquals( 5, - PMA\libraries\Font::getStringWidth("1", "arial", "10") + Font::getStringWidth("1", "arial", "10") ); // string "c" $this->assertEquals( 5, - PMA\libraries\Font::getStringWidth("c", "arial", "10") + Font::getStringWidth("c", "arial", "10") ); // string "F" $this->assertEquals( 7, - PMA\libraries\Font::getStringWidth("F", "arial", "10") + Font::getStringWidth("F", "arial", "10") ); // string "A" $this->assertEquals( 7, - PMA\libraries\Font::getStringWidth("A", "arial", "10") + Font::getStringWidth("A", "arial", "10") ); // string "w" $this->assertEquals( 8, - PMA\libraries\Font::getStringWidth("w", "arial", "10") + Font::getStringWidth("w", "arial", "10") ); // string "G" $this->assertEquals( 8, - PMA\libraries\Font::getStringWidth("G", "arial", "10") + Font::getStringWidth("G", "arial", "10") ); // string "m" $this->assertEquals( 9, - PMA\libraries\Font::getStringWidth("m", "arial", "10") + Font::getStringWidth("m", "arial", "10") ); // string "W" $this->assertEquals( 10, - PMA\libraries\Font::getStringWidth("W", "arial", "10") + Font::getStringWidth("W", "arial", "10") ); // string "$" $this->assertEquals( 3, - PMA\libraries\Font::getStringWidth("$", "arial", "10") + Font::getStringWidth("$", "arial", "10") ); } @@ -146,25 +148,25 @@ class FontTest extends PMATestCase // string "phpMyAdmin", with Arial 10 $this->assertEquals( 59, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "10") + Font::getStringWidth("phpMyAdmin", "arial", "10") ); // string "phpMyAdmin", with No font $this->assertEquals( 59, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "", "10") + Font::getStringWidth("phpMyAdmin", "", "10") ); // string "phpMyAdmin", with Times 10 $this->assertEquals( 55, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "times", "10") + Font::getStringWidth("phpMyAdmin", "times", "10") ); // string "phpMyAdmin", with Broadway 10 $this->assertEquals( 73, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "broadway", "10") + Font::getStringWidth("phpMyAdmin", "broadway", "10") ); } @@ -179,25 +181,25 @@ class FontTest extends PMATestCase // string "phpMyAdmin", with font size 0 $this->assertEquals( 0, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "0") + Font::getStringWidth("phpMyAdmin", "arial", "0") ); // string "phpMyAdmin", with Arial 10 $this->assertEquals( 59, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "10") + Font::getStringWidth("phpMyAdmin", "arial", "10") ); // string "phpMyAdmin", with Arial 11 $this->assertEquals( 65, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "11") + Font::getStringWidth("phpMyAdmin", "arial", "11") ); // string "phpMyAdmin", with Arial 20 $this->assertEquals( 118, - PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "20") + Font::getStringWidth("phpMyAdmin", "arial", "20") ); } @@ -211,20 +213,20 @@ class FontTest extends PMATestCase // string "a", with invalid charlist (= string) $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth("a", "arial", "10", "list") + Font::getStringWidth("a", "arial", "10", "list") ); // string "a", with invalid charlist (= array without proper structure) $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth("a", "arial", "10", array("list")) + Font::getStringWidth("a", "arial", "10", array("list")) ); // string "a", with invalid charlist (= array without proper structure : // modifier is missing $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth( + Font::getStringWidth( "a", "arial", "10", array(array("chars" => "a")) ) @@ -234,7 +236,7 @@ class FontTest extends PMATestCase // chars is missing $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth( + Font::getStringWidth( "a", "arial", "10", array(array("modifier" => 0.61)) ) @@ -244,7 +246,7 @@ class FontTest extends PMATestCase // chars is not an array $this->assertEquals( 6, - PMA\libraries\Font::getStringWidth( + Font::getStringWidth( "a", "arial", "10", array(array("chars" => "a", "modifier" => 0.61)) ) @@ -253,7 +255,7 @@ class FontTest extends PMATestCase // string "a", with valid charlist $this->assertEquals( 7, - PMA\libraries\Font::getStringWidth( + Font::getStringWidth( "a", "arial", "10", array(array("chars" => array("a"), "modifier" => 0.61)) ) diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index 43efe51fde..03db57e344 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -9,6 +9,9 @@ * Include to test. */ +use PhpMyAdmin\Config; +use PhpMyAdmin\ErrorHandler; +use PhpMyAdmin\Footer; use PMA\libraries\Theme; require_once 'libraries/relation.lib.php'; @@ -23,7 +26,7 @@ class FooterTest extends PMATestCase { /** - * @var array store private attributes of PMA\libraries\Footer + * @var array store private attributes of PhpMyAdmin\Footer */ public $privates = array(); @@ -46,17 +49,17 @@ class FooterTest extends PMATestCase $GLOBALS['db'] = ''; $GLOBALS['table'] = ''; $GLOBALS['text_dir'] = 'ltr'; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['collation_connection'] = 'utf8_general_ci'; $GLOBALS['cfg']['Server']['verbose'] = 'verbose host'; $GLOBALS['server'] = '1'; $_GET['reload_left_frame'] = '1'; $GLOBALS['focus_querywindow'] = 'main_pane_left'; - $this->object = new PMA\libraries\Footer(); + $this->object = new Footer(); unset($GLOBALS['error_message']); unset($GLOBALS['sql_query']); - $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler(); + $GLOBALS['error_handler'] = new ErrorHandler(); unset($_POST); } @@ -83,7 +86,7 @@ class FooterTest extends PMATestCase */ private function _callPrivateFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\Footer'); + $class = new ReflectionClass(Footer::class); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); @@ -202,7 +205,7 @@ class FooterTest extends PMATestCase */ public function testDisable() { - $footer = new PMA\libraries\Footer(); + $footer = new Footer(); $footer->disable(); $this->assertEquals( '', @@ -217,7 +220,7 @@ class FooterTest extends PMATestCase */ public function testAjax() { - $footer = new PMA\libraries\Footer(); + $footer = new Footer(); $footer->setAjax(true); $this->assertEquals( '', @@ -232,7 +235,7 @@ class FooterTest extends PMATestCase */ public function testGetScripts() { - $footer = new PMA\libraries\Footer(); + $footer = new Footer(); $this->assertContains( '<script data-cfasync="false" type="text/javascript">', $footer->getScripts()->getDisplay() @@ -247,7 +250,7 @@ class FooterTest extends PMATestCase */ public function testDisplay() { - $footer = new PMA\libraries\Footer(); + $footer = new Footer(); $this->assertContains( 'Open new phpMyAdmin window', $footer->getDisplay() @@ -261,7 +264,7 @@ class FooterTest extends PMATestCase */ public function testMinimal() { - $footer = new PMA\libraries\Footer(); + $footer = new Footer(); $footer->setMinimal(); $this->assertEquals( '</div></body></html>', diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index fe45f3b8cd..3c22f61544 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -1,15 +1,14 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA\libraries\Header class + * Test for PhpMyAdmin\Header class * * @package PhpMyAdmin-test */ -/* - * Include to test. - */ -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; +use PhpMyAdmin\Header; use PMA\libraries\Theme; require_once 'libraries/database_interface.inc.php'; @@ -17,7 +16,7 @@ require_once 'libraries/relation.lib.php'; require_once 'test/PMATestCase.php'; /** - * Test for PMA\libraries\Header class + * Test for PhpMyAdmin\Header class * * @package PhpMyAdmin-test * @group medium @@ -41,7 +40,7 @@ class HeaderTest extends PMATestCase $GLOBALS['server'] = 'server'; $GLOBALS['db'] = 'pma_test'; $GLOBALS['table'] = 'table1'; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['cfg']['Server']['verbose'] = 'verbose host'; @@ -56,7 +55,7 @@ class HeaderTest extends PMATestCase */ public function testDisable() { - $header = new PMA\libraries\Header(); + $header = new Header(); $header->disable(); $this->assertEquals( '', @@ -71,7 +70,7 @@ class HeaderTest extends PMATestCase */ public function testSetBodyId() { - $header = new PMA\libraries\Header(); + $header = new Header(); $header->setBodyId('PMA_header_id'); $this->assertContains( 'PMA_header_id', @@ -86,7 +85,7 @@ class HeaderTest extends PMATestCase */ public function testPrintView() { - $header = new PMA\libraries\Header(); + $header = new Header(); $header->enablePrintView(); $this->assertContains( 'Print view', @@ -101,7 +100,7 @@ class HeaderTest extends PMATestCase */ public function testGetJsParams() { - $header = new PMA\libraries\Header(); + $header = new Header(); $this->assertArrayHasKey( 'common_query', $header->getJsParams() @@ -115,7 +114,7 @@ class HeaderTest extends PMATestCase */ public function testGetJsParamsCode() { - $header = new PMA\libraries\Header(); + $header = new Header(); $this->assertContains( 'PMA_commonParams.setAll', $header->getJsParamsCode() @@ -129,7 +128,7 @@ class HeaderTest extends PMATestCase */ public function testGetMessage() { - $header = new PMA\libraries\Header(); + $header = new Header(); $this->assertContains( 'phpmyadminmessage', $header->getMessage() @@ -144,7 +143,7 @@ class HeaderTest extends PMATestCase */ public function testDisableWarnings() { - $header = new PMA\libraries\Header(); + $header = new Header(); $header->disableWarnings(); $this->assertAttributeEquals( false, @@ -161,12 +160,10 @@ class HeaderTest extends PMATestCase */ public function testGetWarningsWithWarningsDisabled() { - $method = new ReflectionMethod( - 'PMA\libraries\Header', '_getWarnings' - ); + $method = new ReflectionMethod(Header::class, '_getWarnings'); $method->setAccessible(true); - $header = new PMA\libraries\Header(); + $header = new Header(); $header->disableWarnings(); $this->assertEmpty($method->invoke($header)); } diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php index 8ea66cce03..7dcfc1478f 100644 --- a/test/classes/IndexTest.php +++ b/test/classes/IndexTest.php @@ -6,9 +6,8 @@ * @package PhpMyAdmin-test */ -/* - * Include to test. - */ +use PhpMyAdmin\Index; + require_once 'test/PMATestCase.php'; /** @@ -61,7 +60,7 @@ class IndexTest extends PMATestCase */ public function testConstructor() { - $index = new PMA\libraries\Index($this->_params); + $index = new Index($this->_params); $this->assertEquals( 'PMA_Index_comment', $index->getComment() @@ -104,7 +103,7 @@ class IndexTest extends PMATestCase */ public function testGetIndexChoices() { - $index_choices = PMA\libraries\Index::getIndexChoices(); + $index_choices = Index::getIndexChoices(); $this->assertEquals( 5, count($index_choices) @@ -123,7 +122,7 @@ class IndexTest extends PMATestCase public function testIsUniquer() { $this->_params['Non_unique'] = "0"; - $index = new PMA\libraries\Index($this->_params); + $index = new Index($this->_params); $this->assertTrue( $index->isUnique() ); @@ -140,7 +139,7 @@ class IndexTest extends PMATestCase */ public function testAddColumns() { - $index = new PMA\libraries\Index(); + $index = new Index(); $index->addColumns($this->_params['columns']); $this->assertTrue($index->hasColumn("column1")); $this->assertTrue($index->hasColumn("column2")); @@ -158,7 +157,7 @@ class IndexTest extends PMATestCase */ public function testName() { - $index = new PMA\libraries\Index(); + $index = new Index(); $index->setName('PMA_name'); $this->assertEquals( 'PMA_name', @@ -167,13 +166,13 @@ class IndexTest extends PMATestCase } /** - * Test for PMA\libraries\Index_Column + * Test for PhpMyAdmin\Index Column * * @return void */ public function testColumns() { - $index = new PMA\libraries\Index(); + $index = new Index(); $index->addColumns($this->_params['columns']); $index_columns = $index->getColumns(); diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index 025da6db31..f550e56e92 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -10,7 +10,7 @@ * Include to test. */ -use PMA\libraries\LanguageManager; +use PhpMyAdmin\LanguageManager; /** * Tests behaviour of PMA_Advisor class diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php index df4f3be33b..e4f76c0fc8 100644 --- a/test/classes/LinterTest.php +++ b/test/classes/LinterTest.php @@ -9,12 +9,12 @@ /* * Include to test. */ -use PMA\libraries\Linter; +use PhpMyAdmin\Linter; require_once 'test/PMATestCase.php'; /** - * Tests for PMA\libraries\Linter + * Tests for PhpMyAdmin\Linter * * @package PhpMyAdmin-test */ diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php index d10d897d3e..c3d80fe9ce 100644 --- a/test/classes/ListDatabaseTest.php +++ b/test/classes/ListDatabaseTest.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\ListDatabase; +use PhpMyAdmin\ListDatabase; $GLOBALS['server'] = 1; $GLOBALS['cfg']['Server']['DisableIS'] = false; @@ -44,7 +44,7 @@ class ListDatabaseTest extends PMATestCase */ private function _callProtectedFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\ListDatabase'); + $class = new ReflectionClass(ListDatabase::class); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php index c616b1a92a..ffbb48d2b5 100644 --- a/test/classes/MenuTest.php +++ b/test/classes/MenuTest.php @@ -9,7 +9,7 @@ /* * Include to test. */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Menu; use PMA\libraries\Theme; diff --git a/test/classes/PDFTest.php b/test/classes/PDFTest.php index 5d529b0efe..930e7620e0 100644 --- a/test/classes/PDFTest.php +++ b/test/classes/PDFTest.php @@ -27,7 +27,7 @@ class PDFTest extends PMATestCase */ public function setup() { - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); } diff --git a/test/classes/ServerStatusDataTest.php b/test/classes/ServerStatusDataTest.php index 96196d8896..c2c7103c04 100644 --- a/test/classes/ServerStatusDataTest.php +++ b/test/classes/ServerStatusDataTest.php @@ -9,7 +9,7 @@ /* * Include to test. */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ServerStatusData; require_once 'libraries/database_interface.inc.php'; @@ -41,7 +41,7 @@ class ServerStatusDataTest extends PMATestCase $GLOBALS['replication_types'] = array(); //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php index f079e640c5..420fd67044 100644 --- a/test/classes/SystemDatabaseTest.php +++ b/test/classes/SystemDatabaseTest.php @@ -29,7 +29,7 @@ class SystemDatabaseTest extends PMATestCase $GLOBALS['server'] = 1; $GLOBALS['cfg']['Server']['pmadb'] = ''; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index c3473d7ecc..16b7681b14 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -202,7 +202,7 @@ class TableTest extends PMATestCase ), ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -857,7 +857,7 @@ class TableTest extends PMATestCase */ public function testGetColumnsMeta() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -946,7 +946,7 @@ class TableTest extends PMATestCase { $db = "pma_db"; $table = "pma_table"; - $index = new PMA\libraries\Index(); + $index = new PhpMyAdmin\Index(); $error = false; $_REQUEST['old_index'] = "PRIMARY"; @@ -1005,7 +1005,7 @@ class TableTest extends PMATestCase public function testCheckIfMinRecordsExist() { $old_dbi = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) @@ -1213,7 +1213,7 @@ class TableTest extends PMATestCase $tbl_object = new Table($target_db, $target_table); $tbl_object->getStatusInfo(null, true); $extension = new PMA\libraries\dbi\DBIDummy(); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new PhpMyAdmin\DatabaseInterface($extension); $expect = ''; $tbl_storage_engine = $dbi->getTable( $target_db, @@ -1236,7 +1236,7 @@ class TableTest extends PMATestCase $tbl_object = new Table($target_db, $target_table); $tbl_object->getStatusInfo(null, true); $extension = new PMA\libraries\dbi\DBIDummy(); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new PhpMyAdmin\DatabaseInterface($extension); $expect = ''; $show_comment = $dbi->getTable( $target_db, @@ -1259,7 +1259,7 @@ class TableTest extends PMATestCase $tbl_object = new Table($target_db, $target_table); $tbl_object->getStatusInfo(null, true); $extension = new PMA\libraries\dbi\DBIDummy(); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new PhpMyAdmin\DatabaseInterface($extension); $expect = ''; $tbl_collation = $dbi->getTable( $target_db, @@ -1282,7 +1282,7 @@ class TableTest extends PMATestCase $tbl_object = new Table($target_db, $target_table); $tbl_object->getStatusInfo(null, true); $extension = new PMA\libraries\dbi\DBIDummy(); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new PhpMyAdmin\DatabaseInterface($extension); $expect = ''; $row_format = $dbi->getTable( $target_db, @@ -1305,7 +1305,7 @@ class TableTest extends PMATestCase $tbl_object = new Table($target_db, $target_table); $tbl_object->getStatusInfo(null, true); $extension = new PMA\libraries\dbi\DBIDummy(); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new PhpMyAdmin\DatabaseInterface($extension); $expect = ''; $auto_increment = $dbi->getTable( $target_db, @@ -1328,7 +1328,7 @@ class TableTest extends PMATestCase $tbl_object = new Table($target_db, $target_table); $tbl_object->getStatusInfo(null, true); $extension = new PMA\libraries\dbi\DBIDummy(); - $dbi = new PMA\libraries\DatabaseInterface($extension); + $dbi = new PhpMyAdmin\DatabaseInterface($extension); $expect = array('pack_keys' => 'DEFAULT'); $create_options = $dbi->getTable( $target_db, diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php index 6e845c70db..d0b0c7e599 100644 --- a/test/classes/ThemeManagerTest.php +++ b/test/classes/ThemeManagerTest.php @@ -31,10 +31,10 @@ class ThemeManagerTest extends PMATestCase $GLOBALS['cfg']['ThemeDefault'] = 'pmahomme'; $GLOBALS['cfg']['ServerDefault'] = 0; $GLOBALS['server'] = 99; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['collation_connection'] = 'utf8_general_ci'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 774060c57e..eb9a02a0d0 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -37,7 +37,7 @@ class ThemeTest extends PMATestCase $this->object = new Theme(); $this->backup = $_SESSION['PMA_Theme']; $_SESSION['PMA_Theme'] = $this->object; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['text_dir'] = 'ltr'; include 'themes/pmahomme/layout.inc.php'; diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index ba75c2fe99..600a25fd65 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -48,7 +48,7 @@ class TrackerTest extends PMATestCase 'tracking' => 'tracking' ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -221,7 +221,7 @@ class TrackerTest extends PMATestCase $GLOBALS['cfg']['Server']['tracking_add_drop_view'] = true; $GLOBALS['cfg']['Server']['user'] = "pma_test_user"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -346,7 +346,7 @@ class TrackerTest extends PMATestCase */ public function testDeleteTracking() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -385,7 +385,7 @@ class TrackerTest extends PMATestCase $GLOBALS['cfg']['Server']['tracking_add_drop_view'] = true; $GLOBALS['cfg']['Server']['user'] = "pma_test_user"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -443,7 +443,7 @@ class TrackerTest extends PMATestCase public function testChangeTracking($dbname = 'pma_db', $tablename = 'pma_tbl', $version = '0.1', $new_state = '1', $type = null ) { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -505,7 +505,7 @@ class TrackerTest extends PMATestCase $GLOBALS['controllink'] = null; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -611,7 +611,7 @@ class TrackerTest extends PMATestCase { $GLOBALS['controllink'] = null; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index bf033a6fad..9f687b27de 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -214,7 +214,7 @@ class TransformationsTest extends PHPUnit_Framework_TestCase public function testClear() { // Mock dbi - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) diff --git a/test/classes/config/FormDisplayTest.php b/test/classes/config/FormDisplayTest.php index 96a703e421..654072409b 100644 --- a/test/classes/config/FormDisplayTest.php +++ b/test/classes/config/FormDisplayTest.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Config; +use PhpMyAdmin\Config; use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; use PMA\libraries\Theme; diff --git a/test/classes/config/FormTest.php b/test/classes/config/FormTest.php index 81c448bb3e..36d944b2f9 100644 --- a/test/classes/config/FormTest.php +++ b/test/classes/config/FormTest.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Config; +use PhpMyAdmin\Config; use PMA\libraries\config\ConfigFile; use PMA\libraries\config\Form; use PMA\libraries\Theme; diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php index aa39555b63..c9cc85f59b 100644 --- a/test/classes/controllers/DatabaseStructureControllerTest.php +++ b/test/classes/controllers/DatabaseStructureControllerTest.php @@ -66,7 +66,7 @@ class DatabaseStructureControllerTest extends PMATestCase $table->expects($this->any())->method('countRecords') ->will($this->returnValue(6)); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('getTable') diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php index a43df3a6a8..9e2eb3416f 100644 --- a/test/classes/controllers/ServerBinlogControllerTest.php +++ b/test/classes/controllers/ServerBinlogControllerTest.php @@ -55,7 +55,7 @@ class ServerBinlogControllerTest extends PMATestCase $binary_log_file_names[] = array("Log_name"=>"index2", "File_size"=>200); //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once())->method('fetchResult') diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php index d5d5d7a66b..b28f56ef48 100644 --- a/test/classes/controllers/ServerCollationsControllerTest.php +++ b/test/classes/controllers/ServerCollationsControllerTest.php @@ -7,7 +7,7 @@ */ use PMA\libraries\controllers\server\ServerCollationsController; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Theme; /* diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php index b5f86a8c46..c6d78fcaca 100644 --- a/test/classes/controllers/ServerDatabasesControllerTest.php +++ b/test/classes/controllers/ServerDatabasesControllerTest.php @@ -8,7 +8,7 @@ use PMA\libraries\di\Container; use PMA\libraries\Theme; -use PMA\libraries\Charsets; +use PhpMyAdmin\Charsets; require_once 'libraries/database_interface.inc.php'; @@ -35,7 +35,7 @@ class ServerDatabasesControllerTest extends PMATestCase $_REQUEST['pos'] = 3; //$GLOBALS - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['is_superuser'] = true; @@ -277,7 +277,7 @@ class ServerDatabasesControllerTest extends PMATestCase 'DEFAULT_COLLATION_NAME' => array( 'disp_name' => __('Collation'), 'description_function' => array( - '\PMA\libraries\Charsets', + Charsets::class, 'getCollationDescr' ), 'format' => 'string', diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php index 3e74ac768d..199a8426ad 100644 --- a/test/classes/controllers/ServerEnginesControllerTest.php +++ b/test/classes/controllers/ServerEnginesControllerTest.php @@ -103,7 +103,7 @@ class ServerEnginesControllerTest extends PMATestCase $_REQUEST['engine'] = "Pbxt"; $_REQUEST['page'] = "page"; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php index 0f045a78ab..c3976727fb 100644 --- a/test/classes/controllers/ServerPluginsControllerTest.php +++ b/test/classes/controllers/ServerPluginsControllerTest.php @@ -60,7 +60,7 @@ class ServerPluginsControllerTest extends PMATestCase $row["is_active"] = true; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php index 9d9f4bb081..571e9de4fe 100644 --- a/test/classes/controllers/ServerVariablesControllerTest.php +++ b/test/classes/controllers/ServerVariablesControllerTest.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\di\Container; use PMA\libraries\Theme; use PMA\libraries\URL; @@ -46,7 +46,7 @@ class ServerVariablesControllerTest extends PMATestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php index e940ec3710..3cc39591b3 100644 --- a/test/classes/controllers/TableIndexesControllerTest.php +++ b/test/classes/controllers/TableIndexesControllerTest.php @@ -46,7 +46,7 @@ class TableIndexesControllerTest extends PMATestCase 'server' => 1 ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -154,7 +154,7 @@ class TableIndexesControllerTest extends PMATestCase $response = new \PMA\Test\Stubs\Response(); $container->set('PMA\libraries\Response', $response); $container->alias('response', 'PMA\libraries\Response'); - $index = new PMA\libraries\Index(); + $index = new PhpMyAdmin\Index(); $ctrl = new TableIndexesController($index); diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php index d380b870ee..c77259cfb2 100644 --- a/test/classes/controllers/TableRelationControllerTest.php +++ b/test/classes/controllers/TableRelationControllerTest.php @@ -45,7 +45,7 @@ class TableRelationControllerTest extends PMATestCase $GLOBALS['dblist'] = new DataBasePMAMockForTblRelation(); $GLOBALS['dblist']->databases = new DataBaseMockForTblRelation(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/controllers/TableSearchControllerTest.php b/test/classes/controllers/TableSearchControllerTest.php index b4500c726b..2e43f38f3d 100644 --- a/test/classes/controllers/TableSearchControllerTest.php +++ b/test/classes/controllers/TableSearchControllerTest.php @@ -48,7 +48,7 @@ class TableSearchControllerTest extends PMATestCase $GLOBALS['PMA_Types'] = new TypesMySQL(); $GLOBALS['cfg']['Server']['DisableIS'] = false; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php index 80ca6b5155..d7b233c606 100644 --- a/test/classes/controllers/TableStructureControllerTest.php +++ b/test/classes/controllers/TableStructureControllerTest.php @@ -55,7 +55,7 @@ class TableStructureControllerTest extends PMATestCase ->disableOriginalConstructor() ->getMock(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('getTable') @@ -238,7 +238,7 @@ class TableStructureControllerTest extends PMATestCase */ public function testPMAGetDataForSubmitMult() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) diff --git a/test/classes/engines/PbxtTest.php b/test/classes/engines/PbxtTest.php index 6a3371510e..60224bd98d 100644 --- a/test/classes/engines/PbxtTest.php +++ b/test/classes/engines/PbxtTest.php @@ -10,7 +10,7 @@ * Include to test. */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\engines\Pbxt; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php index 1bc71f912f..90cf223e92 100644 --- a/test/classes/navigation/NavigationTest.php +++ b/test/classes/navigation/NavigationTest.php @@ -63,7 +63,7 @@ class NavigationTest extends PMATestCase $expectedQuery = "INSERT INTO `pmadb`.`navigationhiding`" . "(`username`, `item_name`, `item_type`, `db_name`, `table_name`)" . " VALUES ('user','itemName','itemType','db','')"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -87,7 +87,7 @@ class NavigationTest extends PMATestCase $expectedQuery = "DELETE FROM `pmadb`.`navigationhiding`" . " WHERE `username`='user' AND `item_name`='itemName'" . " AND `item_type`='itemType' AND `db_name`='db'"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -111,7 +111,7 @@ class NavigationTest extends PMATestCase $expectedQuery = "SELECT `item_name`, `item_type`" . " FROM `pmadb`.`navigationhiding`" . " WHERE `username`='user' AND `db_name`='db' AND `table_name`=''"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php index d8a17278d0..99250fce7a 100644 --- a/test/classes/navigation/NavigationTreeTest.php +++ b/test/classes/navigation/NavigationTreeTest.php @@ -42,7 +42,7 @@ class NavigationTreeTest extends PMATestCase protected function setUp() { $GLOBALS['server'] = 1; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg']['Server']['host'] = 'localhost'; $GLOBALS['cfg']['Server']['user'] = 'root'; diff --git a/test/classes/navigation/NodeTest.php b/test/classes/navigation/NodeTest.php index ad399e70a3..c1886e52b1 100644 --- a/test/classes/navigation/NodeTest.php +++ b/test/classes/navigation/NodeTest.php @@ -366,7 +366,7 @@ class NodeTest extends PMATestCase // but strangely, mocking private methods is not supported in PHPUnit $node = NodeFactory::getInstance(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -403,7 +403,7 @@ class NodeTest extends PMATestCase // but strangely, mocking private methods is not supported in PHPUnit $node = NodeFactory::getInstance(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -435,7 +435,7 @@ class NodeTest extends PMATestCase $node = NodeFactory::getInstance(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -493,7 +493,7 @@ class NodeTest extends PMATestCase // but strangely, mocking private methods is not supported in PHPUnit $node = NodeFactory::getInstance(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -520,7 +520,7 @@ class NodeTest extends PMATestCase $query .= "WHERE TRUE "; $node = NodeFactory::getInstance(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -545,7 +545,7 @@ class NodeTest extends PMATestCase $node = NodeFactory::getInstance(); // test with no search clause - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -558,7 +558,7 @@ class NodeTest extends PMATestCase $node->getPresence(); // test with a search clause - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) diff --git a/test/classes/plugin/auth/AuthenticationConfigTest.php b/test/classes/plugin/auth/AuthenticationConfigTest.php index 9679f4c92d..924bc576ae 100644 --- a/test/classes/plugin/auth/AuthenticationConfigTest.php +++ b/test/classes/plugin/auth/AuthenticationConfigTest.php @@ -27,7 +27,7 @@ class AuthenticationConfigTest extends PMATestCase */ function setup() { - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['server'] = 0; $GLOBALS['token_provided'] = true; @@ -89,7 +89,7 @@ class AuthenticationConfigTest extends PMATestCase public function testAuthFails() { $removeConstant = false; - $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler; + $GLOBALS['error_handler'] = new PhpMyAdmin\ErrorHandler; $GLOBALS['cfg']['Servers'] = array(1); $GLOBALS['allowDeny_forbidden'] = false; $GLOBALS['collation_connection'] = 'utf-8'; @@ -103,7 +103,7 @@ class AuthenticationConfigTest extends PMATestCase } } - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php index fe92be631a..afa7124005 100644 --- a/test/classes/plugin/auth/AuthenticationCookieTest.php +++ b/test/classes/plugin/auth/AuthenticationCookieTest.php @@ -9,7 +9,7 @@ use PMA\libraries\plugins\auth\AuthenticationCookie; use PMA\libraries\Theme; -$GLOBALS['PMA_Config'] = new PMA\libraries\Config(); +$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); require_once 'libraries/config.default.php'; require_once 'libraries/database_interface.inc.php'; @@ -110,7 +110,7 @@ class AuthenticationCookieTest extends PMATestCase $GLOBALS['pma_auth_server'] = 'localhost'; // mock footer - $mockFooter = $this->getMockBuilder('PMA\libraries\Footer') + $mockFooter = $this->getMockBuilder('PhpMyAdmin\Footer') ->disableOriginalConstructor() ->setMethods(array('setMinimal')) ->getMock(); @@ -121,7 +121,7 @@ class AuthenticationCookieTest extends PMATestCase // mock header - $mockHeader = $this->getMockBuilder('PMA\libraries\Header') + $mockHeader = $this->getMockBuilder('PhpMyAdmin\Header') ->disableOriginalConstructor() ->setMethods( array( @@ -176,7 +176,7 @@ class AuthenticationCookieTest extends PMATestCase // mock error handler - $mockErrorHandler = $this->getMockBuilder('PMA\libraries\ErrorHandler') + $mockErrorHandler = $this->getMockBuilder('PhpMyAdmin\ErrorHandler') ->disableOriginalConstructor() ->setMethods(array('hasDisplayErrors', 'dispErrors')) ->getMock(); @@ -275,12 +275,12 @@ class AuthenticationCookieTest extends PMATestCase $mockResponse->expects($this->once()) ->method('getFooter') ->with() - ->will($this->returnValue(new PMA\libraries\Footer())); + ->will($this->returnValue(new PhpMyAdmin\Footer())); $mockResponse->expects($this->once()) ->method('getHeader') ->with() - ->will($this->returnValue(new PMA\libraries\Header())); + ->will($this->returnValue(new PhpMyAdmin\Header())); $_REQUEST['old_usr'] = ''; $GLOBALS['cfg']['LoginCookieRecall'] = false; @@ -293,7 +293,7 @@ class AuthenticationCookieTest extends PMATestCase $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey'; $GLOBALS['server'] = 0; - $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler; + $GLOBALS['error_handler'] = new PhpMyAdmin\ErrorHandler; ob_start(); $this->object->auth(); @@ -834,7 +834,7 @@ class AuthenticationCookieTest extends PMATestCase $GLOBALS['server'] = 2; $_COOKIE['pmaAuth-2'] = 'pass'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -865,7 +865,7 @@ class AuthenticationCookieTest extends PMATestCase ->setMethods(array('auth')) ->getMock(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/auth/AuthenticationHttpTest.php b/test/classes/plugin/auth/AuthenticationHttpTest.php index fbfd1b26ca..e331f54b80 100644 --- a/test/classes/plugin/auth/AuthenticationHttpTest.php +++ b/test/classes/plugin/auth/AuthenticationHttpTest.php @@ -30,7 +30,7 @@ class AuthenticationHttpTest extends PMATestCase */ function setup() { - $GLOBALS['PMA_Config'] = new PMA\libraries\Config; + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config; $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg']['Servers'] = array(); $GLOBALS['server'] = 0; @@ -55,7 +55,7 @@ class AuthenticationHttpTest extends PMATestCase public function doMockResponse($set_minimal, $body_id, $set_title) { // mock footer - $mockFooter = $this->getMockBuilder('PMA\libraries\Footer') + $mockFooter = $this->getMockBuilder('PhpMyAdmin\Footer') ->disableOriginalConstructor() ->setMethods(array('setMinimal')) ->getMock(); @@ -66,7 +66,7 @@ class AuthenticationHttpTest extends PMATestCase // mock header - $mockHeader = $this->getMockBuilder('PMA\libraries\Header') + $mockHeader = $this->getMockBuilder('PhpMyAdmin\Header') ->disableOriginalConstructor() ->setMethods( array('setBodyId', 'setTitle', 'disableMenuAndConsole', 'addHTML') @@ -387,7 +387,7 @@ class AuthenticationHttpTest extends PMATestCase public function testAuthFails() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/plugin/auth/AuthenticationSignonTest.php index 0549ad335c..921c291778 100644 --- a/test/classes/plugin/auth/AuthenticationSignonTest.php +++ b/test/classes/plugin/auth/AuthenticationSignonTest.php @@ -27,7 +27,7 @@ class AuthenticationSignonTest extends PMATestCase */ function setup() { - $GLOBALS['PMA_Config'] = new PMA\libraries\Config; + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config; $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['server'] = 0; $this->object = new AuthenticationSignon(); @@ -370,7 +370,7 @@ class AuthenticationSignonTest extends PMATestCase $this->object->expects($this->exactly(1)) ->method('auth'); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -407,7 +407,7 @@ class AuthenticationSignonTest extends PMATestCase $this->object->expects($this->exactly(1)) ->method('auth'); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportCodegenTest.php b/test/classes/plugin/export/ExportCodegenTest.php index 8ef73e2a50..87a51ef212 100644 --- a/test/classes/plugin/export/ExportCodegenTest.php +++ b/test/classes/plugin/export/ExportCodegenTest.php @@ -243,7 +243,7 @@ class ExportCodegenTest extends PMATestCase $GLOBALS['buffer_needed'] = false; $GLOBALS['asfile'] = true; $GLOBALS['save_on_server'] = false; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -316,7 +316,7 @@ class ExportCodegenTest extends PMATestCase */ public function testHandleNHibernateCSBody() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -381,7 +381,7 @@ class ExportCodegenTest extends PMATestCase */ public function testHandleNHibernateXMLBody() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportCsvTest.php b/test/classes/plugin/export/ExportCsvTest.php index 01020061ff..cb07536007 100644 --- a/test/classes/plugin/export/ExportCsvTest.php +++ b/test/classes/plugin/export/ExportCsvTest.php @@ -475,7 +475,7 @@ class ExportCsvTest extends PMATestCase public function testExportData() { // case 1 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; @@ -499,13 +499,13 @@ class ExportCsvTest extends PMATestCase $result = ob_get_clean(); // case 2 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -552,13 +552,13 @@ class ExportCsvTest extends PMATestCase // case 3 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -599,13 +599,13 @@ class ExportCsvTest extends PMATestCase // case 4 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -649,13 +649,13 @@ class ExportCsvTest extends PMATestCase // case 5 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -698,13 +698,13 @@ class ExportCsvTest extends PMATestCase // case 6 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) diff --git a/test/classes/plugin/export/ExportHtmlwordTest.php b/test/classes/plugin/export/ExportHtmlwordTest.php index f8d30f6f58..320ba463aa 100644 --- a/test/classes/plugin/export/ExportHtmlwordTest.php +++ b/test/classes/plugin/export/ExportHtmlwordTest.php @@ -332,13 +332,13 @@ class ExportHtmlwordTest extends PMATestCase { // case 1 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -417,7 +417,7 @@ class ExportHtmlwordTest extends PMATestCase ) ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -473,7 +473,7 @@ class ExportHtmlwordTest extends PMATestCase // case 1 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -564,7 +564,7 @@ class ExportHtmlwordTest extends PMATestCase // case 2 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -653,7 +653,7 @@ class ExportHtmlwordTest extends PMATestCase // case 3 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -729,7 +729,7 @@ class ExportHtmlwordTest extends PMATestCase */ public function testGetTriggers() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -770,7 +770,7 @@ class ExportHtmlwordTest extends PMATestCase public function testExportStructure() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportJsonTest.php b/test/classes/plugin/export/ExportJsonTest.php index e9b377f68a..8150456539 100644 --- a/test/classes/plugin/export/ExportJsonTest.php +++ b/test/classes/plugin/export/ExportJsonTest.php @@ -214,7 +214,7 @@ class ExportJsonTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportLatexTest.php b/test/classes/plugin/export/ExportLatexTest.php index 1a0bcb0400..d9cea2b9ad 100644 --- a/test/classes/plugin/export/ExportLatexTest.php +++ b/test/classes/plugin/export/ExportLatexTest.php @@ -559,7 +559,7 @@ class ExportLatexTest extends PMATestCase $GLOBALS['latex_null'] = 'null'; $GLOBALS['cfg']['Server']['host'] = 'localhost'; $GLOBALS['cfg']['Server']['verbose'] = 'verb'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -615,7 +615,7 @@ class ExportLatexTest extends PMATestCase // case 2 unset($GLOBALS['latex_columns']); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -682,7 +682,7 @@ class ExportLatexTest extends PMATestCase // case 1 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -800,7 +800,7 @@ class ExportLatexTest extends PMATestCase // case 2 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -888,7 +888,7 @@ class ExportLatexTest extends PMATestCase // case 3 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportMediawikiTest.php b/test/classes/plugin/export/ExportMediawikiTest.php index 23afd611f0..7cc415bde4 100644 --- a/test/classes/plugin/export/ExportMediawikiTest.php +++ b/test/classes/plugin/export/ExportMediawikiTest.php @@ -259,7 +259,7 @@ class ExportMediawikiTest extends PMATestCase */ public function testExportStructure() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -349,7 +349,7 @@ class ExportMediawikiTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -360,7 +360,7 @@ class ExportMediawikiTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) diff --git a/test/classes/plugin/export/ExportOdsTest.php b/test/classes/plugin/export/ExportOdsTest.php index 443c7da562..3ce45b9a0d 100644 --- a/test/classes/plugin/export/ExportOdsTest.php +++ b/test/classes/plugin/export/ExportOdsTest.php @@ -264,7 +264,7 @@ class ExportOdsTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -329,7 +329,7 @@ class ExportOdsTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -389,7 +389,7 @@ class ExportOdsTest extends PMATestCase */ public function testExportDataWithFieldNames() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -406,7 +406,7 @@ class ExportOdsTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -454,7 +454,7 @@ class ExportOdsTest extends PMATestCase ); // with no row count - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -467,7 +467,7 @@ class ExportOdsTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) diff --git a/test/classes/plugin/export/ExportOdtTest.php b/test/classes/plugin/export/ExportOdtTest.php index 5ebaacadea..1aa201d635 100644 --- a/test/classes/plugin/export/ExportOdtTest.php +++ b/test/classes/plugin/export/ExportOdtTest.php @@ -408,7 +408,7 @@ class ExportOdtTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -447,7 +447,7 @@ class ExportOdtTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -504,7 +504,7 @@ class ExportOdtTest extends PMATestCase */ public function testExportDataWithFieldNames() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -521,7 +521,7 @@ class ExportOdtTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -569,7 +569,7 @@ class ExportOdtTest extends PMATestCase ); // with no row count - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -582,7 +582,7 @@ class ExportOdtTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -629,7 +629,7 @@ class ExportOdtTest extends PMATestCase */ public function testGetTableDefStandIn() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -684,7 +684,7 @@ class ExportOdtTest extends PMATestCase // case 1 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -785,7 +785,7 @@ class ExportOdtTest extends PMATestCase // case 2 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -872,7 +872,7 @@ class ExportOdtTest extends PMATestCase */ public function testGetTriggers() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -934,7 +934,7 @@ class ExportOdtTest extends PMATestCase public function testExportStructure() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportPhparrayTest.php b/test/classes/plugin/export/ExportPhparrayTest.php index 935210184c..2c603c59c8 100644 --- a/test/classes/plugin/export/ExportPhparrayTest.php +++ b/test/classes/plugin/export/ExportPhparrayTest.php @@ -207,13 +207,13 @@ class ExportPhparrayTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -260,13 +260,13 @@ class ExportPhparrayTest extends PMATestCase ); // case 2: test invalid variable name fix - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php index c8ce669111..46f58d381c 100644 --- a/test/classes/plugin/export/ExportSqlTest.php +++ b/test/classes/plugin/export/ExportSqlTest.php @@ -80,7 +80,7 @@ class ExportSqlTest extends PMATestCase ); // test with hide structure and hide sql as false - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -325,7 +325,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['crlf'] = '##'; $GLOBALS['sql_drop_table'] = true; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -456,7 +456,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['asfile'] = 'yes'; $GLOBALS['output_charset_conversion'] = 'utf-8'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -501,7 +501,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_include_comments'] = true; $GLOBALS['charset'] = 'utf-8'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -571,7 +571,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_create_view'] = true; $GLOBALS['crlf'] = "\n"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -611,7 +611,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['cfg']['Server']['DisableIS'] = true; unset($GLOBALS['sql_backquotes']); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -697,7 +697,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_structure_or_data'] = 'structure'; $GLOBALS['sql_procedure_function'] = true; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -763,7 +763,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_structure_or_data'] = 'structure'; $GLOBALS['sql_procedure_function'] = true; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -793,7 +793,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_drop_table'] = true; $GLOBALS['sql_if_not_exists'] = true; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -833,7 +833,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_drop_table'] = true; $GLOBALS['sql_if_not_exists'] = true; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -876,7 +876,7 @@ class ExportSqlTest extends PMATestCase // case 2 unset($GLOBALS['sql_compatibility']); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -936,7 +936,7 @@ class ExportSqlTest extends PMATestCase unset($GLOBALS['no_constraints_comments']); } - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1104,7 +1104,7 @@ class ExportSqlTest extends PMATestCase unset($GLOBALS['no_constraints_comments']); } - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1184,7 +1184,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['sql_include_comments'] = true; $GLOBALS['crlf'] = "\n"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1241,7 +1241,7 @@ class ExportSqlTest extends PMATestCase public function testExportStructure() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -1355,7 +1355,7 @@ class ExportSqlTest extends PMATestCase ); // case 4 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -1413,7 +1413,7 @@ class ExportSqlTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1472,7 +1472,7 @@ class ExportSqlTest extends PMATestCase ->with( "SELECT a FROM b WHERE 1", null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED ) ->will($this->returnValue('res')); @@ -1561,7 +1561,7 @@ class ExportSqlTest extends PMATestCase */ public function testExportDataWithUpdate() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1603,7 +1603,7 @@ class ExportSqlTest extends PMATestCase ->with( "SELECT a FROM b WHERE 1", null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED ) ->will($this->returnValue('res')); @@ -1669,7 +1669,7 @@ class ExportSqlTest extends PMATestCase */ public function testExportDataWithIsView() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1725,7 +1725,7 @@ class ExportSqlTest extends PMATestCase */ public function testExportDataWithError() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportTexytextTest.php b/test/classes/plugin/export/ExportTexytextTest.php index b5095f473a..61aafb9f3c 100644 --- a/test/classes/plugin/export/ExportTexytextTest.php +++ b/test/classes/plugin/export/ExportTexytextTest.php @@ -235,13 +235,13 @@ class ExportTexytextTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) @@ -298,7 +298,7 @@ class ExportTexytextTest extends PMATestCase */ public function testGetTableDefStandIn() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -366,7 +366,7 @@ class ExportTexytextTest extends PMATestCase // case 1 - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -463,7 +463,7 @@ class ExportTexytextTest extends PMATestCase */ public function testGetTriggers() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -505,7 +505,7 @@ class ExportTexytextTest extends PMATestCase public function testExportStructure() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php index 6f6ad567c4..1f40757e45 100644 --- a/test/classes/plugin/export/ExportXmlTest.php +++ b/test/classes/plugin/export/ExportXmlTest.php @@ -229,7 +229,7 @@ class ExportXmlTest extends PMATestCase ), 'table' => array(null, '"tbl"') ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -326,7 +326,7 @@ class ExportXmlTest extends PMATestCase unset($GLOBALS['xml_export_procedures']); $GLOBALS['output_charset_conversion'] = 0; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -472,7 +472,7 @@ class ExportXmlTest extends PMATestCase $GLOBALS['asfile'] = true; $GLOBALS['output_charset_conversion'] = false; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -493,7 +493,7 @@ class ExportXmlTest extends PMATestCase $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) diff --git a/test/classes/plugin/export/ExportYamlTest.php b/test/classes/plugin/export/ExportYamlTest.php index 1f2045ed8d..b681a5d974 100644 --- a/test/classes/plugin/export/ExportYamlTest.php +++ b/test/classes/plugin/export/ExportYamlTest.php @@ -197,13 +197,13 @@ class ExportYamlTest extends PMATestCase */ public function testExportData() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) ->method('query') - ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED) + ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED) ->will($this->returnValue(true)); $dbi->expects($this->once()) diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/plugin/import/ImportCsvTest.php index 0a7c711c6e..2e55486bb8 100644 --- a/test/classes/plugin/import/ImportCsvTest.php +++ b/test/classes/plugin/import/ImportCsvTest.php @@ -11,7 +11,7 @@ */ use PMA\libraries\plugins\import\ImportCsv; use PMA\libraries\Theme; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; @@ -72,7 +72,7 @@ class ImportCsvTest extends PMATestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/plugin/import/ImportLdiTest.php b/test/classes/plugin/import/ImportLdiTest.php index e682c3e6f6..ee1c083264 100644 --- a/test/classes/plugin/import/ImportLdiTest.php +++ b/test/classes/plugin/import/ImportLdiTest.php @@ -10,7 +10,7 @@ * since 'check_user_privileges.lib.php' will use it globally */ use PMA\libraries\plugins\import\ImportLdi; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; $GLOBALS['plugin_param'] = "table"; @@ -68,7 +68,7 @@ class ImportLdiTest extends PMATestCase $GLOBALS['table'] = "phpmyadmintest"; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/import/ImportMediawikiTest.php b/test/classes/plugin/import/ImportMediawikiTest.php index 801596701b..404dcf2dda 100644 --- a/test/classes/plugin/import/ImportMediawikiTest.php +++ b/test/classes/plugin/import/ImportMediawikiTest.php @@ -9,7 +9,7 @@ * since 'check_user_privileges.lib.php' will use it globally */ use PMA\libraries\plugins\import\ImportMediawiki; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; @@ -116,7 +116,7 @@ class ImportMediawikiTest extends PMATestCase global $import_notice; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/plugin/import/ImportOdsTest.php b/test/classes/plugin/import/ImportOdsTest.php index 86ac7a6a53..ec8ee66c1a 100644 --- a/test/classes/plugin/import/ImportOdsTest.php +++ b/test/classes/plugin/import/ImportOdsTest.php @@ -10,7 +10,7 @@ * since 'check_user_privileges.lib.php' will use it globally */ use PMA\libraries\plugins\import\ImportOds; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; @@ -120,7 +120,7 @@ class ImportOdsTest extends PMATestCase $sql_query_disabled = false; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') diff --git a/test/classes/plugin/import/ImportShpTest.php b/test/classes/plugin/import/ImportShpTest.php index 0f4f98503d..87c3a95dcd 100644 --- a/test/classes/plugin/import/ImportShpTest.php +++ b/test/classes/plugin/import/ImportShpTest.php @@ -10,7 +10,7 @@ * since 'check_user_privileges.lib.php' will use it globally */ use PMA\libraries\plugins\import\ImportShp; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; @@ -48,7 +48,7 @@ class ImportShpTest extends PMATestCase $GLOBALS['cfg']['Server']['DisableIS'] = false; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/plugin/import/ImportSqlTest.php b/test/classes/plugin/import/ImportSqlTest.php index 229c87f287..077983fbee 100644 --- a/test/classes/plugin/import/ImportSqlTest.php +++ b/test/classes/plugin/import/ImportSqlTest.php @@ -10,7 +10,7 @@ * since 'check_user_privileges.lib.php' will use it globally */ use PMA\libraries\plugins\import\ImportSql; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; @@ -85,7 +85,7 @@ class ImportSqlTest extends PMATestCase $sql_query_disabled = false; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/plugin/import/ImportXmlTest.php b/test/classes/plugin/import/ImportXmlTest.php index e55d906001..d9b1d2c104 100644 --- a/test/classes/plugin/import/ImportXmlTest.php +++ b/test/classes/plugin/import/ImportXmlTest.php @@ -10,7 +10,7 @@ * since 'check_user_privileges.lib.php' will use it globally */ use PMA\libraries\plugins\import\ImportXml; -use PMA\libraries\File; +use PhpMyAdmin\File; $GLOBALS['server'] = 0; @@ -118,7 +118,7 @@ class ImportXmlTest extends PMATestCase global $import_notice; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/plugin/transformations/TransformationPluginsTest.php b/test/classes/plugin/transformations/TransformationPluginsTest.php index 2ef7678d7d..3c9d259cbb 100644 --- a/test/classes/plugin/transformations/TransformationPluginsTest.php +++ b/test/classes/plugin/transformations/TransformationPluginsTest.php @@ -51,7 +51,7 @@ class TransformationPluginsTest extends PMATestCase $row = array("pma"=>"aaa", "pca"=>"bbb"); // For Image_*_Inline plugin - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); // For Date Format plugin diff --git a/test/classes/schema/DiaRelationSchemaTest.php b/test/classes/schema/DiaRelationSchemaTest.php index a7904a6d5e..3e2278ceff 100644 --- a/test/classes/schema/DiaRelationSchemaTest.php +++ b/test/classes/schema/DiaRelationSchemaTest.php @@ -61,7 +61,7 @@ class DiaRelationSchemaTest extends PMATestCase ); PMA_getRelationsParam(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/schema/EpsRelationSchemaTest.php b/test/classes/schema/EpsRelationSchemaTest.php index 428d8d4e54..d1d5474e0b 100644 --- a/test/classes/schema/EpsRelationSchemaTest.php +++ b/test/classes/schema/EpsRelationSchemaTest.php @@ -62,7 +62,7 @@ class EpsRelationSchemaTest extends PMATestCase ); PMA_getRelationsParam(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/schema/PdfRelationSchemaTest.php b/test/classes/schema/PdfRelationSchemaTest.php index 3f8cd0a0df..2b8d2681b0 100644 --- a/test/classes/schema/PdfRelationSchemaTest.php +++ b/test/classes/schema/PdfRelationSchemaTest.php @@ -74,7 +74,7 @@ class PdfRelationSchemaTest extends PMATestCase ); PMA_getRelationsParam(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/schema/SvgRelationSchemaTest.php b/test/classes/schema/SvgRelationSchemaTest.php index ce5f94ecb3..5c690850c8 100644 --- a/test/classes/schema/SvgRelationSchemaTest.php +++ b/test/classes/schema/SvgRelationSchemaTest.php @@ -61,7 +61,7 @@ class SvgRelationSchemaTest extends PMATestCase ); PMA_getRelationsParam(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_PMD_common_test.php b/test/libraries/PMA_PMD_common_test.php index da99ac7f37..b0b8785e55 100644 --- a/test/libraries/PMA_PMD_common_test.php +++ b/test/libraries/PMA_PMD_common_test.php @@ -51,7 +51,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase { $pg = 1; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -71,7 +71,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase 'name', null, 2, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $GLOBALS['dbi'] = $dbi; @@ -88,7 +88,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase $pg = 1; $pageName = 'pageName'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') @@ -102,7 +102,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase null, null, 2, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ) ->will($this->returnValue(array($pageName))); $GLOBALS['dbi'] = $dbi; @@ -121,7 +121,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase { $pg = 1; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -151,7 +151,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase $db = 'db'; $default_pg = '2'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -164,7 +164,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase null, null, 2, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ) ->will($this->returnValue(array($default_pg))); $dbi->expects($this->any())->method('escapeString') @@ -185,7 +185,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase { $db = 'db'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -198,7 +198,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase null, null, 2, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ) ->will($this->returnValue(array())); $dbi->expects($this->any())->method('escapeString') @@ -220,7 +220,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase $db = 'db'; $default_pg = '2'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -233,7 +233,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase null, null, 2, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ) ->will($this->returnValue(array($default_pg))); $dbi->expects($this->any())->method('escapeString') @@ -255,7 +255,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase $db = 'db'; $first_pg = '1'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php index 25d7787993..a677b24aab 100644 --- a/test/libraries/PMA_central_columns_test.php +++ b/test/libraries/PMA_central_columns_test.php @@ -95,7 +95,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase ); // mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/libraries/PMA_designer_test.php b/test/libraries/PMA_designer_test.php index e3488918ad..d4000983e7 100644 --- a/test/libraries/PMA_designer_test.php +++ b/test/libraries/PMA_designer_test.php @@ -56,7 +56,7 @@ class PMA_DesignerTest extends PHPUnit_Framework_TestCase */ private function _mockDatabaseInteraction($db) { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -66,7 +66,7 @@ class PMA_DesignerTest extends PHPUnit_Framework_TestCase "SELECT `page_nr`, `page_descr` FROM `pmadb`.`pdf_pages`" . " WHERE db_name = '" . $db . "' ORDER BY `page_descr`", 2, - PMA\libraries\DatabaseInterface::QUERY_STORE, + PhpMyAdmin\DatabaseInterface::QUERY_STORE, false ) ->will($this->returnValue('dummyRS')); diff --git a/test/libraries/PMA_display_change_password_test.php b/test/libraries/PMA_display_change_password_test.php index ba71b75fb0..ef1a9065c6 100644 --- a/test/libraries/PMA_display_change_password_test.php +++ b/test/libraries/PMA_display_change_password_test.php @@ -36,7 +36,7 @@ class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase public function setUp() { //$GLOBALS - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg']['MaxRows'] = 10; $GLOBALS['cfg']['ServerDefault'] = "PMA_server"; diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php index 0a31c2f2dd..71953d6a4b 100644 --- a/test/libraries/PMA_display_export_test.php +++ b/test/libraries/PMA_display_export_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Theme; use PMA\libraries\URL; @@ -58,7 +58,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase //$_SESSION $_SESSION['relation'][$GLOBALS['server']] = ""; - $pmaconfig = $this->getMockBuilder('PMA\libraries\Config') + $pmaconfig = $this->getMockBuilder('PhpMyAdmin\Config') ->disableOriginalConstructor() ->getMock(); @@ -136,7 +136,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase 'COLUMN_NAME' => 'test_column2' ) ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -273,7 +273,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase ) ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php index c6d843520d..bf245e7046 100644 --- a/test/libraries/PMA_import_test.php +++ b/test/libraries/PMA_import_test.php @@ -336,7 +336,7 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase { $GLOBALS['db'] = 'PMA'; //mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -422,7 +422,7 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase { $GLOBALS['db'] = 'PMA'; //mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 92d92e7ba6..4ff4a6f6a5 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -61,7 +61,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = ''; $GLOBALS['cfg']['Confirm'] = true; $GLOBALS['cfg']['LoginCookieValidity'] = 1440; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); } /** @@ -127,7 +127,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase { $clauses = array('a=1', 'b="fo\o"'); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -176,7 +176,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $temp->primary_key = 1; $meta_arr = array($temp); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -225,7 +225,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase { $GLOBALS['cfg']['InsertRows'] = 2; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -234,7 +234,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase ->with( 'SELECT * FROM `db`.`table` LIMIT 1;', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ) ->will($this->returnValue('result1')); @@ -1671,7 +1671,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase ); // Case 3 (bit) - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1843,7 +1843,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $scriptsMock->expects($this->once()) ->method('addFile'); - $headerMock = $this->getMockBuilder('PMA\libraries\Header') + $headerMock = $this->getMockBuilder('PhpMyAdmin\Header') ->disableOriginalConstructor() ->setMethods(array('getScripts')) ->getMock(); @@ -1890,7 +1890,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $row = array('1' => 1); $res = 'foobar'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2015,7 +2015,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = false; $_REQUEST['submit_type'] = ''; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2101,7 +2101,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = true; $_REQUEST['submit_type'] = ''; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2187,7 +2187,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase array('Level' => 2, 'Code' => 43, 'Message' => 'msg2'), ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2220,7 +2220,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $map['f']['foreign_table'] = 'TABLES'; $map['f']['foreign_field'] = 'f'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2230,7 +2230,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase 'SELECT `TABLE_COMMENT` FROM `information_schema`.`TABLES` WHERE ' . '`f`=1', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ) ->will($this->returnValue('r1')); @@ -2391,7 +2391,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase // case 2 $multi_edit_funcs = array('UUID'); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2445,7 +2445,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $prow = array(); $prow['a'] = b'101'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2585,7 +2585,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $meta = new stdClass(); $_REQUEST['where_clause'][0] = 1; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2669,7 +2669,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testGetTableColumns() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2699,7 +2699,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testDetermineInsertOrEdit() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -2772,7 +2772,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase { $GLOBALS['cfg']['ShowPropertyComments'] = false; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_ip_allow_deny_test.php b/test/libraries/PMA_ip_allow_deny_test.php index 988079602e..5af8a18dfd 100644 --- a/test/libraries/PMA_ip_allow_deny_test.php +++ b/test/libraries/PMA_ip_allow_deny_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/ip_allow_deny.lib.php'; diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php index 97919a3a9f..4dc51589ba 100644 --- a/test/libraries/PMA_mult_submits_test.php +++ b/test/libraries/PMA_mult_submits_test.php @@ -63,7 +63,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_normalization_test.php b/test/libraries/PMA_normalization_test.php index 2a94193736..be2246f159 100644 --- a/test/libraries/PMA_normalization_test.php +++ b/test/libraries/PMA_normalization_test.php @@ -48,7 +48,7 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase //$_SESSION //mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $GLOBALS['dbi'] = $dbi; diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php index 73cc3fa564..0ce99e8918 100644 --- a/test/libraries/PMA_relation_cleanup_test.php +++ b/test/libraries/PMA_relation_cleanup_test.php @@ -16,7 +16,7 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/relation_cleanup.lib.php'; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; /** * PMA_Relation_Cleanup_Test class diff --git a/test/libraries/PMA_relation_test.php b/test/libraries/PMA_relation_test.php index fe60a4f5e3..7c3e8c5178 100644 --- a/test/libraries/PMA_relation_test.php +++ b/test/libraries/PMA_relation_test.php @@ -56,7 +56,7 @@ class PMA_Relation_Test extends PHPUnit_Framework_TestCase */ public function testPMAQueryAsControlUser() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -212,7 +212,7 @@ class PMA_Relation_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ServerDefault'] = 0; $_SESSION['relation'] = array(); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -257,7 +257,7 @@ class PMA_Relation_Test extends PHPUnit_Framework_TestCase */ public function testPMATryUpgradeTransformations() { - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index 2640a7c369..1b79460d71 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Theme; use PMA\libraries\URL; @@ -90,14 +90,14 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase 'menuswork' => true ); - $pmaconfig = $this->getMockBuilder('PMA\libraries\Config') + $pmaconfig = $this->getMockBuilder('PhpMyAdmin\Config') ->disableOriginalConstructor() ->getMock(); $GLOBALS['PMA_Config'] = $pmaconfig; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -538,7 +538,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase /* Assertion 2 */ $oldDbi = $GLOBALS['dbi']; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1021,7 +1021,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['username'] = "username"; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -1304,7 +1304,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['username'] = 'pma_username'; $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $fields_info = array( @@ -1412,7 +1412,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase public function testPMAGetHtmlForAddUser() { $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $fields_info = array( @@ -1487,7 +1487,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase public function testPMAGetHtmlForSpecificDbPrivileges() { $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $fields_info = array( @@ -1565,7 +1565,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase public function testPMAGetHtmlForSpecificTablePrivileges() { $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $fields_info = array( @@ -1874,7 +1874,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfgRelation']['menuswork'] = true; $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $fields_info = array( @@ -1946,7 +1946,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfgRelation']['menuswork'] = true; $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $expected_userGroup = "pma_usergroup"; @@ -2443,7 +2443,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase function testPMAGetDbRightsForUserOverview() { //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) @@ -2491,7 +2491,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $oldDbi = $GLOBALS['dbi']; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) @@ -2599,7 +2599,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase function testPMADeleteUser() { //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php index fcf79c163d..79d19f14a6 100644 --- a/test/libraries/PMA_server_replication_test.php +++ b/test/libraries/PMA_server_replication_test.php @@ -72,7 +72,7 @@ class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase ), ); - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php index 31172c1922..6b6f41b6e5 100644 --- a/test/libraries/PMA_server_status_advisor_test.php +++ b/test/libraries/PMA_server_status_advisor_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ServerStatusData; use PMA\libraries\Theme; @@ -62,7 +62,7 @@ class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php index 9270105f84..39427ab558 100644 --- a/test/libraries/PMA_server_status_monitor_test.php +++ b/test/libraries/PMA_server_status_monitor_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ServerStatusData; use PMA\libraries\Theme; @@ -59,7 +59,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -229,7 +229,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase public function testPMAGetJsonForLogDataTypeSlow() { //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -286,7 +286,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $_REQUEST['limitTypes'] = true; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -346,7 +346,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $_REQUEST['varName'] = "varName"; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -385,7 +385,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $_SESSION['cache']['server_server']['profiling_supported'] = true; //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php index 56408bb191..51ecf601f0 100644 --- a/test/libraries/PMA_server_status_processes_test.php +++ b/test/libraries/PMA_server_status_processes_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Theme; use PMA\libraries\URL; @@ -41,7 +41,7 @@ class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php index d051973ecd..1926a21f83 100644 --- a/test/libraries/PMA_server_status_queries_test.php +++ b/test/libraries/PMA_server_status_queries_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ServerStatusData; use PMA\libraries\Theme; @@ -56,7 +56,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php index 8bd9bfe7e4..6d0447365f 100644 --- a/test/libraries/PMA_server_status_test.php +++ b/test/libraries/PMA_server_status_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ServerStatusData; use PMA\libraries\Theme; @@ -49,7 +49,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php index b7dd84aea2..8b49d05157 100644 --- a/test/libraries/PMA_server_status_variables_test.php +++ b/test/libraries/PMA_server_status_variables_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ServerStatusData; use PMA\libraries\Theme; @@ -60,7 +60,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php index 69a4cbba10..6c0f53e60c 100644 --- a/test/libraries/PMA_server_user_groups_test.php +++ b/test/libraries/PMA_server_user_groups_test.php @@ -56,7 +56,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`" . " ORDER BY `usergroup` ASC"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -94,7 +94,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`" . " ORDER BY `usergroup` ASC"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) @@ -176,7 +176,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase $userGrpDelQuery = "DELETE FROM `pmadb`.`usergroups`" . " WHERE `usergroup`='ug'"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->at(1)) @@ -214,7 +214,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`" . " WHERE `usergroup`='ug'"; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->once()) diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php index 2af4bc2a8d..2fa7b34410 100644 --- a/test/libraries/PMA_sql_query_form_test.php +++ b/test/libraries/PMA_sql_query_form_test.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin-test */ -use PMA\libraries\Core; -use PMA\libraries\Encoding; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; use PMA\libraries\Theme; use PMA\libraries\URL; @@ -78,7 +78,7 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase //$_SESSION //Mock DBI - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php index 09a4058ea4..b4f9272b2c 100644 --- a/test/libraries/PMA_tbl_tracking_test.php +++ b/test/libraries/PMA_tbl_tracking_test.php @@ -58,7 +58,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['tracking_default_statements'] = 'DELETE'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -437,7 +437,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase $text_dir = "ltr"; $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -535,7 +535,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase $url_query = "select * from PMA"; $dbi_old = $GLOBALS['dbi']; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index 535fabaebf..9dd52fe65f 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -112,7 +112,7 @@ class PMA_User_Preferences_Test extends PMATestCase $_SESSION['relation'][$GLOBALS['server']]['user'] = "user"; $GLOBALS['controllink'] = null; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -207,7 +207,7 @@ class PMA_User_Preferences_Test extends PMATestCase $query2 = 'UPDATE `pmadb`.`testconf` SET `timevalue` = NOW(), `config_data` = \'' . json_encode(array(1)) . '\' WHERE `username` = \'user\''; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); @@ -238,7 +238,7 @@ class PMA_User_Preferences_Test extends PMATestCase $query2 = 'INSERT INTO `pmadb`.`testconf` (`username`, `timevalue`,`config_data`) ' . 'VALUES (\'user\', NOW(), \'' . json_encode(array(1)) . '\')'; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index 0530e7644b..ae3d36e108 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -10,7 +10,7 @@ /* * Include to test. */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Theme; /** @@ -28,7 +28,7 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase */ function setup() { - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['cfg'] = array('ServerDefault' => 1); $GLOBALS['text_dir'] = 'ltr'; } diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 4039b839d2..7e8d6764dd 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -28,7 +28,7 @@ class PMA_ExpandUserString_Test extends PHPUnit_Framework_TestCase */ public function setup() { - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg'] = array( 'Server' => array( diff --git a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php index af1fe7626e..53746e5129 100644 --- a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php @@ -48,7 +48,7 @@ class PMA_EVN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase unset($_REQUEST); $_REQUEST = $request; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php index a12394445c..85e374c07b 100644 --- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php @@ -49,7 +49,7 @@ class PMA_RTN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase PMA_RTN_setGlobals(); $old_dbi = isset($GLOBALS['dbi']) ? $GLOBALS['dbi'] : null; - $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') + $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) diff --git a/test/libraries/stubs/ResponseStub.php b/test/libraries/stubs/ResponseStub.php index 94775ef53e..5a8885ffb1 100644 --- a/test/libraries/stubs/ResponseStub.php +++ b/test/libraries/stubs/ResponseStub.php @@ -12,7 +12,7 @@ */ namespace PMA\Test\Stubs; -use PMA\libraries\Header; +use PhpMyAdmin\Header; use PMA\libraries\Message; @@ -26,7 +26,7 @@ use PMA\libraries\Message; class Response { /** - * PMA\libraries\Header instance + * PhpMyAdmin\Header instance * * @access private * @var Header @@ -148,8 +148,8 @@ class Response } /** - * Current I choose to return PMA\libraries\Header object directly because - * our test has nothing about the Scripts and PMA\libraries\Header class. + * Current I choose to return PhpMyAdmin\Header object directly because + * our test has nothing about the Scripts and PhpMyAdmin\Header class. * * @return Header */ diff --git a/themes.php b/themes.php index e159deedb8..729644cf5a 100644 --- a/themes.php +++ b/themes.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\ThemeManager; use PMA\libraries\Response; diff --git a/transformation_wrapper.php b/transformation_wrapper.php index cd80b36620..e41f4a5b67 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use PMA\libraries\Transformations; @@ -65,14 +65,14 @@ if (isset($where_clause)) { 'SELECT * FROM ' . PMA\libraries\Util::backquote($table) . ' WHERE ' . $where_clause . ';', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $row = $GLOBALS['dbi']->fetchAssoc($result); } else { $result = $GLOBALS['dbi']->query( 'SELECT * FROM ' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $row = $GLOBALS['dbi']->fetchAssoc($result); } @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Sanitize; use PMA\libraries\Response; diff --git a/user_password.php b/user_password.php index 5d7323ceaf..0f052108a6 100644 --- a/user_password.php +++ b/user_password.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/version_check.php b/version_check.php index ac06b80cd5..de055ba269 100644 --- a/version_check.php +++ b/version_check.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\VersionInformation; use PMA\libraries\Response; diff --git a/view_create.php b/view_create.php index 2b865b450a..9db88626fc 100644 --- a/view_create.php +++ b/view_create.php @@ -8,7 +8,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; |