diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 96bcb5feec..af6952c611 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1560,11 +1560,6 @@ parameters: count: 2 path: src/Controllers/Database/CentralColumnsController.php - - - message: "#^Parameter \\#4 \\$textDir of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:getTemplateVariablesForMain\\(\\) expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Database/CentralColumnsController.php - - message: "#^Parameter \\#5 \\$colAttribute of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:updateOneColumn\\(\\) expects string, mixed given\\.$#" count: 2 @@ -2550,11 +2545,6 @@ parameters: count: 1 path: src/Controllers/Database/TrackingController.php - - - message: "#^Parameter \\#3 \\$textDir of method PhpMyAdmin\\\\Tracking\\\\Tracking\\:\\:getHtmlForDbTrackingTables\\(\\) expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Database/TrackingController.php - - message: "#^Parameter \\#3 \\$version of method PhpMyAdmin\\\\Tracking\\\\Tracking\\:\\:createTrackingForMultipleTables\\(\\) expects string, mixed given\\.$#" count: 1 @@ -3835,11 +3825,6 @@ parameters: count: 1 path: src/Controllers/Server/PrivilegesController.php - - - message: "#^Parameter \\#1 \\$textDir of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getHtmlForUserOverview\\(\\) expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Server/PrivilegesController.php - - message: "#^Parameter \\#1 \\$username of method PhpMyAdmin\\\\Controllers\\\\Server\\\\PrivilegesController\\:\\:getExportPageTitle\\(\\) expects string, mixed given\\.$#" count: 1 @@ -4545,11 +4530,6 @@ parameters: count: 1 path: src/Controllers/Table/ChangeController.php - - - message: "#^Parameter \\#12 \\$textDir of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditRow\\(\\) expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Table/ChangeController.php - - message: "#^Parameter \\#13 \\$repopulate of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditRow\\(\\) expects array, mixed given\\.$#" count: 1 @@ -6030,11 +6010,6 @@ parameters: count: 1 path: src/Controllers/Table/TrackingController.php - - - message: "#^Parameter \\#4 \\$textDir of method PhpMyAdmin\\\\Tracking\\\\Tracking\\:\\:getHtmlForMainPage\\(\\) expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Table/TrackingController.php - - message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#" count: 2 @@ -15050,11 +15025,6 @@ parameters: count: 2 path: src/Sql.php - - - message: "#^Parameter \\#9 \\$textDirection of method PhpMyAdmin\\\\Display\\\\Results\\:\\:setProperties\\(\\) expects string, mixed given\\.$#" - count: 2 - path: src/Sql.php - - message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" count: 5 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 90349ebde5..cbad0b6158 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -934,9 +934,6 @@ $columnDefault $columnDefault - - - __construct @@ -1687,9 +1684,6 @@ $selectedTable $table - - - __construct @@ -2841,9 +2835,6 @@ $dbName - - - $key @@ -3308,7 +3299,6 @@ - $isUpload @@ -4153,9 +4143,6 @@ $toggleActivation $version - - - diff --git a/psalm.xml b/psalm.xml index 0149782172..85b905fe1a 100644 --- a/psalm.xml +++ b/psalm.xml @@ -116,7 +116,6 @@ sql_type: 'INSERT'|'UPDATE'|'REPLACE', table_priv: bool, tbl_storage_engine: string, - text_dir: string, token_mismatch: bool, token_provided: bool, unparsed_sql?: string, diff --git a/src/Controllers/Database/CentralColumnsController.php b/src/Controllers/Database/CentralColumnsController.php index eef48e0082..29d26aa3af 100644 --- a/src/Controllers/Database/CentralColumnsController.php +++ b/src/Controllers/Database/CentralColumnsController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\CentralColumns; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -155,8 +156,6 @@ class CentralColumnsController extends AbstractController public function main(string $totalRows, string $position, DatabaseName $db): void { - $GLOBALS['text_dir'] ??= null; - if ($totalRows !== '' && $totalRows !== '0' && is_numeric($totalRows)) { $totalRows = (int) $totalRows; } else { @@ -172,7 +171,7 @@ class CentralColumnsController extends AbstractController $db->getName(), $totalRows, $pos, - $GLOBALS['text_dir'], + LanguageManager::$textDir, ); $this->render('database/central_columns/main', $variables); diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php index 541430f35c..e66a7eb04a 100644 --- a/src/Controllers/Database/DesignerController.php +++ b/src/Controllers/Database/DesignerController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Database\Designer\Common as DesignerCommon; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -40,7 +41,6 @@ class DesignerController extends AbstractController { $GLOBALS['message'] ??= null; $GLOBALS['errorUrl'] ??= null; - $GLOBALS['text_dir'] ??= null; $db = $request->getParsedBodyParam('db'); $table = $request->getParsedBodyParam('table'); @@ -68,7 +68,7 @@ class DesignerController extends AbstractController $html = $this->template->render('database/designer/database_tables', [ 'db' => Current::$database, - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'has_query' => isset($_REQUEST['query']), 'tab_pos' => [], 'display_page' => -1, @@ -236,7 +236,7 @@ class DesignerController extends AbstractController $mainHtml = $this->template->render('database/designer/main', [ 'db' => Current::$database, - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'hidden_input_fields' => Url::getHiddenInputs($request->getQueryParam('db')), 'designer_config' => json_encode($designerConfig), 'display_page' => $displayPage, diff --git a/src/Controllers/Database/EventsController.php b/src/Controllers/Database/EventsController.php index ae1c20ba27..2818fd01ef 100644 --- a/src/Controllers/Database/EventsController.php +++ b/src/Controllers/Database/EventsController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -40,7 +41,6 @@ final class EventsController extends AbstractController public function __invoke(ServerRequest $request): void { $GLOBALS['errors'] ??= null; - $GLOBALS['text_dir'] ??= null; $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['database/events.js']); @@ -264,7 +264,7 @@ final class EventsController extends AbstractController 'items' => $items, 'has_privilege' => Util::currentUserHasPrivilege('EVENT', Current::$database), 'scheduler_state' => $this->events->getEventSchedulerStatus(), - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'is_ajax' => $request->isAjax() && empty($_REQUEST['ajax_page_request']), ]); } diff --git a/src/Controllers/Database/PrivilegesController.php b/src/Controllers/Database/PrivilegesController.php index 93d9b51396..074d4c0da9 100644 --- a/src/Controllers/Database/PrivilegesController.php +++ b/src/Controllers/Database/PrivilegesController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\InvalidDatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; @@ -88,7 +89,7 @@ class PrivilegesController extends AbstractController 'is_superuser' => $this->dbi->isSuperUser(), 'db' => $db->getName(), 'database_url' => $scriptName, - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'is_createuser' => $this->dbi->isCreateUser(), 'is_grantuser' => $this->dbi->isGrantUser(), 'privileges' => $privileges, diff --git a/src/Controllers/Database/StructureController.php b/src/Controllers/Database/StructureController.php index 749ec4cf9c..fbb10c2dba 100644 --- a/src/Controllers/Database/StructureController.php +++ b/src/Controllers/Database/StructureController.php @@ -20,6 +20,7 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Replication\Replication; @@ -515,7 +516,7 @@ final class StructureController extends AbstractController 'show_last_check' => $config->settings['ShowDbStructureLastCheck'], ], 'check_all_tables' => [ - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'overhead_check' => $overheadCheck, 'db_is_system_schema' => $this->dbIsSystemSchema, 'hidden_fields' => $hiddenFields, diff --git a/src/Controllers/Database/TrackingController.php b/src/Controllers/Database/TrackingController.php index ed301aea09..fe09baea37 100644 --- a/src/Controllers/Database/TrackingController.php +++ b/src/Controllers/Database/TrackingController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ResponseRenderer; @@ -43,7 +44,6 @@ class TrackingController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['text_dir'] ??= null; $GLOBALS['urlParams'] ??= null; $GLOBALS['errorUrl'] ??= null; @@ -147,7 +147,7 @@ class TrackingController extends AbstractController $this->response->addHTML($this->tracking->getHtmlForDbTrackingTables( Current::$database, $GLOBALS['urlParams'], - $GLOBALS['text_dir'], + LanguageManager::$textDir, )); // If available print out database log diff --git a/src/Controllers/Server/DatabasesController.php b/src/Controllers/Server/DatabasesController.php index cf4ff0f7ec..676a0ad978 100644 --- a/src/Controllers/Server/DatabasesController.php +++ b/src/Controllers/Server/DatabasesController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\Connection; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Replication\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; @@ -62,7 +63,6 @@ class DatabasesController extends AbstractController { $GLOBALS['is_create_db_priv'] ??= null; $GLOBALS['db_to_create'] ??= null; - $GLOBALS['text_dir'] ??= null; $GLOBALS['errorUrl'] ??= null; $params = [ @@ -156,7 +156,7 @@ class DatabasesController extends AbstractController 'has_primary_replication' => $primaryInfo['status'], 'has_replica_replication' => $replicaInfo['status'], 'is_drop_allowed' => $this->dbi->isSuperUser() || $config->settings['AllowUserDropDatabase'], - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, ]); } diff --git a/src/Controllers/Server/PrivilegesController.php b/src/Controllers/Server/PrivilegesController.php index 5f1a28363c..e928277ca0 100644 --- a/src/Controllers/Server/PrivilegesController.php +++ b/src/Controllers/Server/PrivilegesController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Plugins; @@ -45,7 +46,6 @@ class PrivilegesController extends AbstractController { $GLOBALS['errorUrl'] ??= null; $GLOBALS['message'] ??= null; - $GLOBALS['text_dir'] ??= null; $GLOBALS['username'] ??= null; $GLOBALS['hostname'] ??= null; $GLOBALS['dbname'] ??= null; @@ -364,7 +364,7 @@ class PrivilegesController extends AbstractController // No username is given --> display the overview $this->response->addHTML( $serverPrivileges->getHtmlForUserOverview( - $GLOBALS['text_dir'], + LanguageManager::$textDir, $request->getQueryParam('initial'), ), ); diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php index e307f0f0f9..e21314805e 100644 --- a/src/Controllers/Setup/FormController.php +++ b/src/Controllers/Setup/FormController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Setup; use PhpMyAdmin\Config\Forms\Setup\SetupFormList; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Setup\FormProcessing; use function __; @@ -29,7 +30,7 @@ class FormController extends AbstractController if ($formClass === null) { return $this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => __('Incorrect form specified!'), ]); } diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php index 28ac62361f..66596d50ce 100644 --- a/src/Controllers/Setup/MainController.php +++ b/src/Controllers/Setup/MainController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Header; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -36,7 +37,7 @@ final class MainController return $response->write($this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => __('Configuration already exists, setup is disabled!'), ])); } diff --git a/src/Controllers/Table/ChangeController.php b/src/Controllers/Table/ChangeController.php index ef8507bcc7..a6cc4a0df2 100644 --- a/src/Controllers/Table/ChangeController.php +++ b/src/Controllers/Table/ChangeController.php @@ -16,6 +16,7 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\InsertEdit; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -50,7 +51,6 @@ class ChangeController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['text_dir'] ??= null; $GLOBALS['disp_message'] ??= null; $GLOBALS['urlParams'] ??= null; $GLOBALS['errorUrl'] ??= null; @@ -256,7 +256,7 @@ class ChangeController extends AbstractController Current::$table, Current::$database, $rowId, - $GLOBALS['text_dir'], + LanguageManager::$textDir, $repopulate, $whereClauseArray, ); diff --git a/src/Controllers/Table/PrivilegesController.php b/src/Controllers/Table/PrivilegesController.php index 4e089bf6ec..68ede64058 100644 --- a/src/Controllers/Table/PrivilegesController.php +++ b/src/Controllers/Table/PrivilegesController.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\InvalidIdentifier; use PhpMyAdmin\Identifiers\TableName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; @@ -92,7 +93,7 @@ class PrivilegesController extends AbstractController 'table' => $table->getName(), 'is_superuser' => $this->dbi->isSuperUser(), 'table_url' => $scriptName, - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'is_createuser' => $this->dbi->isCreateUser(), 'is_grantuser' => $this->dbi->isGrantUser(), 'privileges' => $privileges, diff --git a/src/Controllers/Table/StructureController.php b/src/Controllers/Table/StructureController.php index 0e4279e89f..1c1ffe875a 100644 --- a/src/Controllers/Table/StructureController.php +++ b/src/Controllers/Table/StructureController.php @@ -22,6 +22,7 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Index; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Partition; use PhpMyAdmin\Query\Utilities; @@ -276,7 +277,7 @@ class StructureController extends AbstractController 'show_stats' => $config->settings['ShowStats'], 'mysql_int_version' => $this->dbi->getVersion(), 'is_mariadb' => $this->dbi->isMariaDB(), - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'is_active' => Tracker::isActive(), 'have_partitioning' => Partition::havePartitioning(), 'partitions' => Partition::getPartitions(Current::$database, Current::$table), diff --git a/src/Controllers/Table/TrackingController.php b/src/Controllers/Table/TrackingController.php index 456d4b4085..dc6a8be2e6 100644 --- a/src/Controllers/Table/TrackingController.php +++ b/src/Controllers/Table/TrackingController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -48,7 +49,6 @@ final class TrackingController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['text_dir'] ??= null; $GLOBALS['urlParams'] ??= null; $GLOBALS['errorUrl'] ??= null; @@ -253,7 +253,7 @@ final class TrackingController extends AbstractController Current::$database, Current::$table, $GLOBALS['urlParams'], - $GLOBALS['text_dir'], + LanguageManager::$textDir, ); $this->render('table/tracking/index', [ diff --git a/src/Controllers/View/CreateController.php b/src/Controllers/View/CreateController.php index 8e766a15d8..03efa99b78 100644 --- a/src/Controllers/View/CreateController.php +++ b/src/Controllers/View/CreateController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlParser\Parser; @@ -59,7 +60,6 @@ class CreateController extends AbstractController return; } - $GLOBALS['text_dir'] ??= null; $GLOBALS['urlParams'] ??= null; $GLOBALS['message'] ??= null; @@ -192,7 +192,7 @@ class CreateController extends AbstractController $this->render('view_create', [ 'ajax_dialog' => $ajaxdialog, - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'url_params' => $GLOBALS['urlParams'], 'view' => $viewData, 'view_algorithm_options' => self::VIEW_ALGORITHM_OPTIONS, diff --git a/src/Header.php b/src/Header.php index c9e286bdef..bac0cc038d 100644 --- a/src/Header.php +++ b/src/Header.php @@ -141,7 +141,7 @@ class Header 'table' => Current::$table, 'db' => Current::$database, 'token' => $_SESSION[' PMA_token '], - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'LimitChars' => $config->settings['LimitChars'], 'pftext' => $pftext, 'confirm' => $config->settings['Confirm'], @@ -356,7 +356,7 @@ class Header 'base_dir' => $baseDir, 'theme_path' => $theme->getPath(), 'version' => $version, - 'text_dir' => $GLOBALS['text_dir'], + 'text_dir' => LanguageManager::$textDir, 'server' => Current::$server, 'title' => $this->getPageTitle(), 'scripts' => $this->scripts->getDisplay(), diff --git a/src/Http/Middleware/Authentication.php b/src/Http/Middleware/Authentication.php index a701cdf57e..a708d1f6d2 100644 --- a/src/Http/Middleware/Authentication.php +++ b/src/Http/Middleware/Authentication.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Exceptions\AuthenticationPluginException; use PhpMyAdmin\Exceptions\ExitException; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Logging; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Plugins\AuthenticationPluginFactory; @@ -51,7 +52,7 @@ final class Authentication implements MiddlewareInterface return $response->write($this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $exception->getMessage(), ])); } diff --git a/src/Http/Middleware/ConfigErrorAndPermissionChecking.php b/src/Http/Middleware/ConfigErrorAndPermissionChecking.php index ff06e20c75..0b90046e30 100644 --- a/src/Http/Middleware/ConfigErrorAndPermissionChecking.php +++ b/src/Http/Middleware/ConfigErrorAndPermissionChecking.php @@ -8,6 +8,7 @@ use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\Exceptions\ConfigException; use PhpMyAdmin\Http\Factory\ResponseFactory; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Template; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -36,7 +37,7 @@ final class ConfigErrorAndPermissionChecking implements MiddlewareInterface return $response->write($this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $exception->getMessage(), ])); } diff --git a/src/Http/Middleware/DatabaseServerVersionChecking.php b/src/Http/Middleware/DatabaseServerVersionChecking.php index 106a50087b..9d92eb6999 100644 --- a/src/Http/Middleware/DatabaseServerVersionChecking.php +++ b/src/Http/Middleware/DatabaseServerVersionChecking.php @@ -8,6 +8,7 @@ use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Template; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -37,7 +38,7 @@ final class DatabaseServerVersionChecking implements MiddlewareInterface return $response->write($this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => sprintf( __('You should upgrade to %s %s or later.'), 'MySQL', diff --git a/src/Http/Middleware/RequestProblemChecking.php b/src/Http/Middleware/RequestProblemChecking.php index 5c739a8678..cde52950b3 100644 --- a/src/Http/Middleware/RequestProblemChecking.php +++ b/src/Http/Middleware/RequestProblemChecking.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Http\Middleware; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Template; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -43,7 +44,7 @@ final class RequestProblemChecking implements MiddlewareInterface return $response->write($this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $exception->getMessage(), ])); } diff --git a/src/Http/Middleware/SessionHandling.php b/src/Http/Middleware/SessionHandling.php index ca5e147d3f..ea5dc2d300 100644 --- a/src/Http/Middleware/SessionHandling.php +++ b/src/Http/Middleware/SessionHandling.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ErrorHandler; use PhpMyAdmin\Exceptions\SessionHandlerException; use PhpMyAdmin\Http\Factory\ResponseFactory; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Session; use PhpMyAdmin\Template; use Psr\Http\Message\ResponseInterface; @@ -40,7 +41,7 @@ final class SessionHandling implements MiddlewareInterface return $response->write($this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $exception->getMessage(), ])); } diff --git a/src/Language.php b/src/Language.php index 2906146dd1..30c40bbb6b 100644 --- a/src/Language.php +++ b/src/Language.php @@ -164,20 +164,20 @@ class Language } /* Text direction for language */ - $GLOBALS['text_dir'] = $this->isRTL() ? 'rtl' : 'ltr'; + LanguageManager::$textDir = $this->isRTL() ? 'rtl' : 'ltr'; /* TCPDF */ $GLOBALS['l'] = []; /* TCPDF settings */ $GLOBALS['l']['a_meta_charset'] = 'UTF-8'; - $GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir']; + $GLOBALS['l']['a_meta_dir'] = LanguageManager::$textDir; $GLOBALS['l']['a_meta_language'] = $this->code; /* TCPDF translations */ $GLOBALS['l']['w_page'] = __('Page number:'); - /* Show possible warnings from langauge selection */ + /* Show possible warnings from language selection */ LanguageManager::getInstance()->showWarnings(); } } diff --git a/src/LanguageManager.php b/src/LanguageManager.php index 9f65b1c638..62bfd4f193 100644 --- a/src/LanguageManager.php +++ b/src/LanguageManager.php @@ -722,6 +722,9 @@ class LanguageManager private static LanguageManager|null $instance = null; + /** @psalm-var 'ltr'|'rtl' */ + public static string $textDir = 'ltr'; + /** * Returns LanguageManager singleton */ diff --git a/src/Plugins/Auth/AuthenticationCookie.php b/src/Plugins/Auth/AuthenticationCookie.php index 227dcd81b2..67fc790686 100644 --- a/src/Plugins/Auth/AuthenticationCookie.php +++ b/src/Plugins/Auth/AuthenticationCookie.php @@ -317,7 +317,7 @@ class AuthenticationCookie extends AuthenticationPlugin $responseRenderer = ResponseRenderer::getInstance(); $responseRenderer->addHTML((new Template())->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $exception->getMessage(), ])); diff --git a/src/Plugins/Auth/AuthenticationHttp.php b/src/Plugins/Auth/AuthenticationHttp.php index 06d0772a16..9707ffe426 100644 --- a/src/Plugins/Auth/AuthenticationHttp.php +++ b/src/Plugins/Auth/AuthenticationHttp.php @@ -12,6 +12,7 @@ use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\ResponseRenderer; @@ -188,7 +189,7 @@ class AuthenticationHttp extends AuthenticationPlugin if ($error && $GLOBALS['errno'] != 1045) { echo $this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $error, ]); diff --git a/src/Plugins/Auth/AuthenticationSignon.php b/src/Plugins/Auth/AuthenticationSignon.php index 2def1e4df1..a720a7f474 100644 --- a/src/Plugins/Auth/AuthenticationSignon.php +++ b/src/Plugins/Auth/AuthenticationSignon.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Config; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Util; @@ -41,7 +42,7 @@ class AuthenticationSignon extends AuthenticationPlugin if (empty($config->selectedServer['SignonURL'])) { echo $this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => 'You must set SignonURL!', ]); @@ -119,7 +120,7 @@ class AuthenticationSignon extends AuthenticationPlugin if (! @file_exists($scriptName)) { echo $this->template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => __('Can not find signon authentication script:') . ' ' . $scriptName, ]); diff --git a/src/Plugins/AuthenticationPlugin.php b/src/Plugins/AuthenticationPlugin.php index 88a9a280a3..46f840a8a0 100644 --- a/src/Plugins/AuthenticationPlugin.php +++ b/src/Plugins/AuthenticationPlugin.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Exceptions\ExitException; use PhpMyAdmin\Exceptions\SessionHandlerException; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\IpAllowDeny; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Logging; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; @@ -249,7 +250,7 @@ abstract class AuthenticationPlugin $responseRenderer = ResponseRenderer::getInstance(); $responseRenderer->addHTML((new Template())->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => $exception->getMessage(), ])); diff --git a/src/Routing/Routing.php b/src/Routing/Routing.php index 18e7b90521..ab36408634 100644 --- a/src/Routing/Routing.php +++ b/src/Routing/Routing.php @@ -23,6 +23,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Template; @@ -208,7 +209,7 @@ class Routing return $response->write($template->render('error/generic', [ 'lang' => $GLOBALS['lang'] ?? 'en', - 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'dir' => LanguageManager::$textDir, 'error_message' => Sanitize::convertBBCode(sprintf( __('Error 404! The page %s was not found.'), '[code]' . htmlspecialchars($route) . '[/code]', diff --git a/src/Sql.php b/src/Sql.php index 103a1ef246..da79eaaa15 100644 --- a/src/Sql.php +++ b/src/Sql.php @@ -1098,7 +1098,7 @@ class Sql $statementInfo->isAnalyse, $numRows, $GLOBALS['querytime'], - $GLOBALS['text_dir'], + LanguageManager::$textDir, $statementInfo->isMaint, $statementInfo->isExplain, $statementInfo->isShow, @@ -1134,7 +1134,7 @@ class Sql $statementInfo->isAnalyse, $numRows, $GLOBALS['querytime'], - $GLOBALS['text_dir'], + LanguageManager::$textDir, $statementInfo->isMaint, $statementInfo->isExplain, $statementInfo->isShow, diff --git a/tests/classes/AbstractTestCase.php b/tests/classes/AbstractTestCase.php index cd194c0c35..ee52319c10 100644 --- a/tests/classes/AbstractTestCase.php +++ b/tests/classes/AbstractTestCase.php @@ -76,7 +76,6 @@ abstract class AbstractTestCase extends TestCase Current::$database = ''; Current::$table = ''; $GLOBALS['sql_query'] = ''; - $GLOBALS['text_dir'] = 'ltr'; // Config before DBI $this->setGlobalConfig(); diff --git a/tests/classes/Controllers/CheckRelationsControllerTest.php b/tests/classes/Controllers/CheckRelationsControllerTest.php index 6af3d75510..735f393293 100644 --- a/tests/classes/Controllers/CheckRelationsControllerTest.php +++ b/tests/classes/Controllers/CheckRelationsControllerTest.php @@ -37,7 +37,6 @@ class CheckRelationsControllerTest extends AbstractTestCase { Current::$database = ''; Current::$table = ''; - $GLOBALS['text_dir'] = 'ltr'; $request = $this->createStub(ServerRequest::class); $request->method('getParsedBodyParam')->willReturnMap([ diff --git a/tests/classes/Controllers/Database/EventsControllerTest.php b/tests/classes/Controllers/Database/EventsControllerTest.php index 260503f08b..ffc0a6f16e 100644 --- a/tests/classes/Controllers/Database/EventsControllerTest.php +++ b/tests/classes/Controllers/Database/EventsControllerTest.php @@ -23,7 +23,6 @@ final class EventsControllerTest extends AbstractTestCase public function testWithEvents(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'test_db'; Config::getInstance()->selectedServer['DisableIS'] = true; @@ -194,7 +193,6 @@ HTML; public function testWithoutEvents(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'test_db'; Config::getInstance()->selectedServer['DisableIS'] = true; diff --git a/tests/classes/Controllers/Database/RoutinesControllerTest.php b/tests/classes/Controllers/Database/RoutinesControllerTest.php index 1bdfb0ab62..f06a6ce1b4 100644 --- a/tests/classes/Controllers/Database/RoutinesControllerTest.php +++ b/tests/classes/Controllers/Database/RoutinesControllerTest.php @@ -24,7 +24,6 @@ final class RoutinesControllerTest extends AbstractTestCase public function testWithRoutines(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'test_db'; Config::getInstance()->selectedServer['DisableIS'] = true; @@ -247,7 +246,6 @@ HTML; public function testWithoutRoutines(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'test_db'; Config::getInstance()->selectedServer['DisableIS'] = true; diff --git a/tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php b/tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php index 12da018d55..30e400e824 100644 --- a/tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php +++ b/tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php @@ -20,7 +20,6 @@ class RealRowCountControllerTest extends AbstractTestCase { public function testRealRowCount(): void { - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = true; Current::$database = 'world'; $_REQUEST['table'] = 'City'; diff --git a/tests/classes/Controllers/Database/StructureControllerTest.php b/tests/classes/Controllers/Database/StructureControllerTest.php index 3b08c82245..6f19e32795 100644 --- a/tests/classes/Controllers/Database/StructureControllerTest.php +++ b/tests/classes/Controllers/Database/StructureControllerTest.php @@ -40,7 +40,6 @@ class StructureControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = false; Current::$table = 'table'; Current::$database = 'db'; diff --git a/tests/classes/Controllers/Export/ExportControllerTest.php b/tests/classes/Controllers/Export/ExportControllerTest.php index 7a86aea91a..c8feef6645 100644 --- a/tests/classes/Controllers/Export/ExportControllerTest.php +++ b/tests/classes/Controllers/Export/ExportControllerTest.php @@ -50,7 +50,6 @@ class ExportControllerTest extends AbstractTestCase public function testExportController(): void { - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['lang'] = 'en'; $GLOBALS['sql_indexes'] = null; $GLOBALS['sql_auto_increments'] = null; diff --git a/tests/classes/Controllers/Export/Template/CreateControllerTest.php b/tests/classes/Controllers/Export/Template/CreateControllerTest.php index 48e5a126c3..97dcd9cbfd 100644 --- a/tests/classes/Controllers/Export/Template/CreateControllerTest.php +++ b/tests/classes/Controllers/Export/Template/CreateControllerTest.php @@ -37,8 +37,6 @@ class CreateControllerTest extends AbstractTestCase public function testCreate(): void { - $GLOBALS['text_dir'] = 'ltr'; - $relationParameters = RelationParameters::fromArray([ 'exporttemplateswork' => true, 'db' => 'db', diff --git a/tests/classes/Controllers/Export/Template/DeleteControllerTest.php b/tests/classes/Controllers/Export/Template/DeleteControllerTest.php index 591329aedd..ed288028bf 100644 --- a/tests/classes/Controllers/Export/Template/DeleteControllerTest.php +++ b/tests/classes/Controllers/Export/Template/DeleteControllerTest.php @@ -34,8 +34,6 @@ class DeleteControllerTest extends AbstractTestCase public function testDelete(): void { - $GLOBALS['text_dir'] = 'ltr'; - Config::getInstance()->selectedServer['user'] = 'user'; $response = new ResponseRenderer(); diff --git a/tests/classes/Controllers/Export/Template/LoadControllerTest.php b/tests/classes/Controllers/Export/Template/LoadControllerTest.php index 081d32de9f..214828a6f0 100644 --- a/tests/classes/Controllers/Export/Template/LoadControllerTest.php +++ b/tests/classes/Controllers/Export/Template/LoadControllerTest.php @@ -36,8 +36,6 @@ class LoadControllerTest extends AbstractTestCase public function testLoad(): void { - $GLOBALS['text_dir'] = 'ltr'; - $relationParameters = RelationParameters::fromArray([ 'exporttemplateswork' => true, 'db' => 'db', diff --git a/tests/classes/Controllers/Export/Template/UpdateControllerTest.php b/tests/classes/Controllers/Export/Template/UpdateControllerTest.php index a432b91be4..bd897d8519 100644 --- a/tests/classes/Controllers/Export/Template/UpdateControllerTest.php +++ b/tests/classes/Controllers/Export/Template/UpdateControllerTest.php @@ -34,8 +34,6 @@ class UpdateControllerTest extends AbstractTestCase public function testUpdate(): void { - $GLOBALS['text_dir'] = 'ltr'; - Config::getInstance()->selectedServer['user'] = 'user'; $response = new ResponseRenderer(); diff --git a/tests/classes/Controllers/GisDataEditorControllerTest.php b/tests/classes/Controllers/GisDataEditorControllerTest.php index 5595296d73..fbc363dd0f 100644 --- a/tests/classes/Controllers/GisDataEditorControllerTest.php +++ b/tests/classes/Controllers/GisDataEditorControllerTest.php @@ -23,7 +23,6 @@ class GisDataEditorControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'db'; Current::$table = 'table'; diff --git a/tests/classes/Controllers/Operations/TableControllerTest.php b/tests/classes/Controllers/Operations/TableControllerTest.php index 39f6939494..673b9c878f 100644 --- a/tests/classes/Controllers/Operations/TableControllerTest.php +++ b/tests/classes/Controllers/Operations/TableControllerTest.php @@ -39,7 +39,6 @@ class TableControllerTest extends AbstractTestCase public function testOperationsController(): void { - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['lang'] = 'en'; Current::$database = 'test_db'; Current::$table = 'test_table'; diff --git a/tests/classes/Controllers/Server/BinlogControllerTest.php b/tests/classes/Controllers/Server/BinlogControllerTest.php index bc1f9d22d8..2dd126f4f1 100644 --- a/tests/classes/Controllers/Server/BinlogControllerTest.php +++ b/tests/classes/Controllers/Server/BinlogControllerTest.php @@ -28,8 +28,6 @@ class BinlogControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/CollationsControllerTest.php b/tests/classes/Controllers/Server/CollationsControllerTest.php index 404b0bea13..b9bea819e0 100644 --- a/tests/classes/Controllers/Server/CollationsControllerTest.php +++ b/tests/classes/Controllers/Server/CollationsControllerTest.php @@ -29,8 +29,6 @@ class CollationsControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Databases/CreateControllerTest.php b/tests/classes/Controllers/Server/Databases/CreateControllerTest.php index 7bced780a1..8893312b3c 100644 --- a/tests/classes/Controllers/Server/Databases/CreateControllerTest.php +++ b/tests/classes/Controllers/Server/Databases/CreateControllerTest.php @@ -36,7 +36,6 @@ final class CreateControllerTest extends AbstractTestCase public function testCreateDatabase(): void { - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = false; Current::$database = 'pma_test'; Current::$table = ''; diff --git a/tests/classes/Controllers/Server/Databases/DestroyControllerTest.php b/tests/classes/Controllers/Server/Databases/DestroyControllerTest.php index 244d675b07..e7b13408fa 100644 --- a/tests/classes/Controllers/Server/Databases/DestroyControllerTest.php +++ b/tests/classes/Controllers/Server/Databases/DestroyControllerTest.php @@ -30,8 +30,6 @@ class DestroyControllerTest extends AbstractTestCase public function testDropDatabases(): void { - $GLOBALS['text_dir'] = 'ltr'; - $dbi = $this->getMockBuilder(DatabaseInterface::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/classes/Controllers/Server/DatabasesControllerTest.php b/tests/classes/Controllers/Server/DatabasesControllerTest.php index 7b15accf2f..026c97b230 100644 --- a/tests/classes/Controllers/Server/DatabasesControllerTest.php +++ b/tests/classes/Controllers/Server/DatabasesControllerTest.php @@ -37,7 +37,6 @@ class DatabasesControllerTest extends AbstractTestCase Current::$database = 'pma_test'; Current::$table = ''; Config::getInstance()->selectedServer['DisableIS'] = false; - $GLOBALS['text_dir'] = 'text_dir'; } public function testIndexAction(): void diff --git a/tests/classes/Controllers/Server/EnginesControllerTest.php b/tests/classes/Controllers/Server/EnginesControllerTest.php index d734ded36c..ced92aac0f 100644 --- a/tests/classes/Controllers/Server/EnginesControllerTest.php +++ b/tests/classes/Controllers/Server/EnginesControllerTest.php @@ -29,8 +29,6 @@ class EnginesControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/PluginsControllerTest.php b/tests/classes/Controllers/Server/PluginsControllerTest.php index 9dd1ae85fe..e9929adf18 100644 --- a/tests/classes/Controllers/Server/PluginsControllerTest.php +++ b/tests/classes/Controllers/Server/PluginsControllerTest.php @@ -31,8 +31,6 @@ class PluginsControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php b/tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php index aadf2a80d6..3aaa452dab 100644 --- a/tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php +++ b/tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php @@ -35,8 +35,6 @@ class AccountLockControllerTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); - $GLOBALS['text_dir'] = 'ltr'; - $this->dbiStub = $this->createStub(DatabaseInterface::class); $this->dbiStub->method('isMariaDB')->willReturn(true); diff --git a/tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php b/tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php index 5ad643a1aa..126d944fa0 100644 --- a/tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php +++ b/tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php @@ -35,8 +35,6 @@ class AccountUnlockControllerTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); - $GLOBALS['text_dir'] = 'ltr'; - $this->dbiStub = $this->createStub(DatabaseInterface::class); $this->dbiStub->method('isMariaDB')->willReturn(true); diff --git a/tests/classes/Controllers/Server/PrivilegesControllerTest.php b/tests/classes/Controllers/Server/PrivilegesControllerTest.php index 8e9ea4e58e..31aa7ea4c5 100644 --- a/tests/classes/Controllers/Server/PrivilegesControllerTest.php +++ b/tests/classes/Controllers/Server/PrivilegesControllerTest.php @@ -34,7 +34,6 @@ class PrivilegesControllerTest extends AbstractTestCase public function testPrivilegesController(): void { - $GLOBALS['text_dir'] = 'ltr'; Current::$database = ''; Current::$table = ''; Config::getInstance()->selectedServer['DisableIS'] = false; diff --git a/tests/classes/Controllers/Server/ShowEngineControllerTest.php b/tests/classes/Controllers/Server/ShowEngineControllerTest.php index c2ffa1dd8a..6b6d6cc614 100644 --- a/tests/classes/Controllers/Server/ShowEngineControllerTest.php +++ b/tests/classes/Controllers/Server/ShowEngineControllerTest.php @@ -31,8 +31,6 @@ class ShowEngineControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/AdvisorControllerTest.php b/tests/classes/Controllers/Server/Status/AdvisorControllerTest.php index 0e70e02729..3a2897237e 100644 --- a/tests/classes/Controllers/Server/Status/AdvisorControllerTest.php +++ b/tests/classes/Controllers/Server/Status/AdvisorControllerTest.php @@ -29,8 +29,6 @@ class AdvisorControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); DatabaseInterface::$instance = $this->createDatabaseInterface(); diff --git a/tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php b/tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php index 9121bf4665..502bbc2a4a 100644 --- a/tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php +++ b/tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php @@ -30,8 +30,6 @@ class GeneralLogControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php b/tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php index 76baa756e9..0e1c481600 100644 --- a/tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php +++ b/tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php @@ -30,8 +30,6 @@ class LogVarsControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php b/tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php index 63f9cea561..571a74eb13 100644 --- a/tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php +++ b/tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php @@ -30,8 +30,6 @@ class SlowLogControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/MonitorControllerTest.php b/tests/classes/Controllers/Server/Status/MonitorControllerTest.php index 6a0c601b69..905b49fd1f 100644 --- a/tests/classes/Controllers/Server/Status/MonitorControllerTest.php +++ b/tests/classes/Controllers/Server/Status/MonitorControllerTest.php @@ -31,8 +31,6 @@ class MonitorControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php b/tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php index 73760f6ec9..ee92e28b86 100644 --- a/tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php +++ b/tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php @@ -30,7 +30,6 @@ class RefreshControllerTest extends AbstractTestCase parent::setUp(); DatabaseInterface::$instance = $this->createDatabaseInterface(); - $GLOBALS['text_dir'] = 'ltr'; parent::setGlobalConfig(); diff --git a/tests/classes/Controllers/Server/Status/ProcessesControllerTest.php b/tests/classes/Controllers/Server/Status/ProcessesControllerTest.php index 4d7b97590b..4aeb2336cb 100644 --- a/tests/classes/Controllers/Server/Status/ProcessesControllerTest.php +++ b/tests/classes/Controllers/Server/Status/ProcessesControllerTest.php @@ -30,8 +30,6 @@ class ProcessesControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/QueriesControllerTest.php b/tests/classes/Controllers/Server/Status/QueriesControllerTest.php index f0a31b47a8..edbf0da808 100644 --- a/tests/classes/Controllers/Server/Status/QueriesControllerTest.php +++ b/tests/classes/Controllers/Server/Status/QueriesControllerTest.php @@ -34,8 +34,6 @@ class QueriesControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/StatusControllerTest.php b/tests/classes/Controllers/Server/Status/StatusControllerTest.php index 9574ba7402..2b189639ce 100644 --- a/tests/classes/Controllers/Server/Status/StatusControllerTest.php +++ b/tests/classes/Controllers/Server/Status/StatusControllerTest.php @@ -29,8 +29,6 @@ class StatusControllerTest extends AbstractTestCase { parent::setUp(); - $GLOBALS['text_dir'] = 'ltr'; - parent::setGlobalConfig(); $this->dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Server/Status/VariablesControllerTest.php b/tests/classes/Controllers/Server/Status/VariablesControllerTest.php index 4f36355cf0..a5cc63e9aa 100644 --- a/tests/classes/Controllers/Server/Status/VariablesControllerTest.php +++ b/tests/classes/Controllers/Server/Status/VariablesControllerTest.php @@ -35,7 +35,6 @@ class VariablesControllerTest extends AbstractTestCase $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; $config = Config::getInstance(); diff --git a/tests/classes/Controllers/Server/VariablesControllerTest.php b/tests/classes/Controllers/Server/VariablesControllerTest.php index 6a6de92885..ce8b28f5aa 100644 --- a/tests/classes/Controllers/Server/VariablesControllerTest.php +++ b/tests/classes/Controllers/Server/VariablesControllerTest.php @@ -37,7 +37,6 @@ class VariablesControllerTest extends AbstractTestCase parent::setLanguage(); - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; Config::getInstance()->selectedServer['DisableIS'] = false; diff --git a/tests/classes/Controllers/Sql/EnumValuesControllerTest.php b/tests/classes/Controllers/Sql/EnumValuesControllerTest.php index 91cb41eec4..6c2b470283 100644 --- a/tests/classes/Controllers/Sql/EnumValuesControllerTest.php +++ b/tests/classes/Controllers/Sql/EnumValuesControllerTest.php @@ -35,8 +35,6 @@ class EnumValuesControllerTest extends AbstractTestCase $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; - - $GLOBALS['text_dir'] = 'ltr'; } public function testGetEnumValuesError(): void diff --git a/tests/classes/Controllers/Sql/SetValuesControllerTest.php b/tests/classes/Controllers/Sql/SetValuesControllerTest.php index 5f54e501dc..921eaa29c4 100644 --- a/tests/classes/Controllers/Sql/SetValuesControllerTest.php +++ b/tests/classes/Controllers/Sql/SetValuesControllerTest.php @@ -35,8 +35,6 @@ class SetValuesControllerTest extends AbstractTestCase $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; - - $GLOBALS['text_dir'] = 'ltr'; } public function testError(): void diff --git a/tests/classes/Controllers/Table/ImportControllerTest.php b/tests/classes/Controllers/Table/ImportControllerTest.php index c38500a6db..241c092fdc 100644 --- a/tests/classes/Controllers/Table/ImportControllerTest.php +++ b/tests/classes/Controllers/Table/ImportControllerTest.php @@ -32,7 +32,6 @@ class ImportControllerTest extends AbstractTestCase { Current::$database = 'test_db'; Current::$table = 'test_table'; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['lang'] = 'en'; $config = Config::getInstance(); $config->selectedServer = $config->getSettings()->Servers[1]->asArray(); diff --git a/tests/classes/Controllers/Table/IndexRenameControllerTest.php b/tests/classes/Controllers/Table/IndexRenameControllerTest.php index 0eafe78537..4323dcf421 100644 --- a/tests/classes/Controllers/Table/IndexRenameControllerTest.php +++ b/tests/classes/Controllers/Table/IndexRenameControllerTest.php @@ -23,7 +23,6 @@ class IndexRenameControllerTest extends AbstractTestCase { Current::$database = 'test_db'; Current::$table = 'test_table'; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['lang'] = 'en'; $dummyDbi = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Table/IndexesControllerTest.php b/tests/classes/Controllers/Table/IndexesControllerTest.php index c14128d983..bcb3f4a02c 100644 --- a/tests/classes/Controllers/Table/IndexesControllerTest.php +++ b/tests/classes/Controllers/Table/IndexesControllerTest.php @@ -40,7 +40,6 @@ class IndexesControllerTest extends AbstractTestCase */ Current::$database = 'db'; Current::$table = 'table'; - $GLOBALS['text_dir'] = 'ltr'; $config = Config::getInstance(); $config->selectedServer['pmadb'] = ''; $config->selectedServer['DisableIS'] = false; diff --git a/tests/classes/Controllers/Table/RecentFavoriteControllerTest.php b/tests/classes/Controllers/Table/RecentFavoriteControllerTest.php index 2c3fbcb70a..1e7ddaf13a 100644 --- a/tests/classes/Controllers/Table/RecentFavoriteControllerTest.php +++ b/tests/classes/Controllers/Table/RecentFavoriteControllerTest.php @@ -30,7 +30,6 @@ class RecentFavoriteControllerTest extends AbstractTestCase public function testRecentFavoriteControllerWithValidDbAndTable(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; (new ReflectionProperty(Relation::class, 'cache'))->setValue(null, null); $_SESSION['tmpval'] = [ @@ -70,7 +69,6 @@ class RecentFavoriteControllerTest extends AbstractTestCase public function testRecentFavoriteControllerWithInvalidDbAndTable(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; (new ReflectionProperty(Relation::class, 'cache'))->setValue(null, null); $_SESSION['tmpval'] = [ @@ -111,7 +109,6 @@ class RecentFavoriteControllerTest extends AbstractTestCase public function testRecentFavoriteControllerWithInvalidDbAndTableName(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') ->withQueryParams(['db' => '', 'table' => '']); diff --git a/tests/classes/Controllers/Table/RelationControllerTest.php b/tests/classes/Controllers/Table/RelationControllerTest.php index ca95877e41..46b657538f 100644 --- a/tests/classes/Controllers/Table/RelationControllerTest.php +++ b/tests/classes/Controllers/Table/RelationControllerTest.php @@ -33,7 +33,6 @@ class RelationControllerTest extends AbstractTestCase Current::$database = 'db'; Current::$table = 'table'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = false; //$_SESSION diff --git a/tests/classes/Controllers/Table/SearchControllerTest.php b/tests/classes/Controllers/Table/SearchControllerTest.php index c589f5ce9c..6afb4381d3 100644 --- a/tests/classes/Controllers/Table/SearchControllerTest.php +++ b/tests/classes/Controllers/Table/SearchControllerTest.php @@ -54,7 +54,6 @@ class SearchControllerTest extends AbstractTestCase Current::$database = 'PMA'; Current::$table = 'PMA_BookMark'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = false; $dbi = $this->getMockBuilder(DatabaseInterface::class) diff --git a/tests/classes/Controllers/Table/SqlControllerTest.php b/tests/classes/Controllers/Table/SqlControllerTest.php index dc83a66670..3fdf412b21 100644 --- a/tests/classes/Controllers/Table/SqlControllerTest.php +++ b/tests/classes/Controllers/Table/SqlControllerTest.php @@ -45,7 +45,6 @@ class SqlControllerTest extends AbstractTestCase Current::$database = 'test_db'; Current::$table = 'test_table'; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; $config = Config::getInstance(); $config->selectedServer = $config->getSettings()->Servers[1]->asArray(); diff --git a/tests/classes/Controllers/Table/Structure/ChangeControllerTest.php b/tests/classes/Controllers/Table/Structure/ChangeControllerTest.php index efcda76e7f..40a2667916 100644 --- a/tests/classes/Controllers/Table/Structure/ChangeControllerTest.php +++ b/tests/classes/Controllers/Table/Structure/ChangeControllerTest.php @@ -36,7 +36,6 @@ class ChangeControllerTest extends AbstractTestCase public function testChangeController(): void { - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = false; Current::$database = 'testdb'; Current::$table = 'mytable'; diff --git a/tests/classes/Controllers/Table/Structure/SaveControllerTest.php b/tests/classes/Controllers/Table/Structure/SaveControllerTest.php index e72a266366..77c7e89fcb 100644 --- a/tests/classes/Controllers/Table/Structure/SaveControllerTest.php +++ b/tests/classes/Controllers/Table/Structure/SaveControllerTest.php @@ -104,7 +104,6 @@ class SaveControllerTest extends AbstractTestCase public function testAdjustColumnPrivileges(): void { - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; diff --git a/tests/classes/Controllers/Table/StructureControllerTest.php b/tests/classes/Controllers/Table/StructureControllerTest.php index 96f0abec98..1ff9bf4051 100644 --- a/tests/classes/Controllers/Table/StructureControllerTest.php +++ b/tests/classes/Controllers/Table/StructureControllerTest.php @@ -44,7 +44,6 @@ class StructureControllerTest extends AbstractTestCase { Current::$database = 'test_db'; Current::$table = 'test_table'; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['lang'] = 'en'; $config = Config::getInstance(); $config->selectedServer = $config->getSettings()->Servers[1]->asArray(); diff --git a/tests/classes/Controllers/Table/TrackingControllerTest.php b/tests/classes/Controllers/Table/TrackingControllerTest.php index 6e320ef0b3..884790dd01 100644 --- a/tests/classes/Controllers/Table/TrackingControllerTest.php +++ b/tests/classes/Controllers/Table/TrackingControllerTest.php @@ -42,7 +42,6 @@ class TrackingControllerTest extends AbstractTestCase Current::$server = 2; Current::$database = 'test_db'; Current::$table = 'test_table'; - $GLOBALS['text_dir'] = 'ltr'; $config = Config::getInstance(); $config->selectedServer['DisableIS'] = true; $config->selectedServer['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,DROP TABLE'; diff --git a/tests/classes/Controllers/Table/ZoomSearchControllerTest.php b/tests/classes/Controllers/Table/ZoomSearchControllerTest.php index 6685cbb627..ac1bc09975 100644 --- a/tests/classes/Controllers/Table/ZoomSearchControllerTest.php +++ b/tests/classes/Controllers/Table/ZoomSearchControllerTest.php @@ -24,7 +24,6 @@ final class ZoomSearchControllerTest extends AbstractTestCase Current::$server = 2; Current::$database = 'test_db'; Current::$table = 'test_table'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = true; $dbiDummy = $this->createDbiDummy(); diff --git a/tests/classes/Controllers/Transformation/OverviewControllerTest.php b/tests/classes/Controllers/Transformation/OverviewControllerTest.php index 48f03162c9..d8af7b13ee 100644 --- a/tests/classes/Controllers/Transformation/OverviewControllerTest.php +++ b/tests/classes/Controllers/Transformation/OverviewControllerTest.php @@ -29,7 +29,6 @@ class OverviewControllerTest extends AbstractTestCase parent::setGlobalConfig(); DatabaseInterface::$instance = $this->createDatabaseInterface(); - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; diff --git a/tests/classes/Controllers/Triggers/IndexControllerTest.php b/tests/classes/Controllers/Triggers/IndexControllerTest.php index 3ce916f20d..b3c81500cf 100644 --- a/tests/classes/Controllers/Triggers/IndexControllerTest.php +++ b/tests/classes/Controllers/Triggers/IndexControllerTest.php @@ -26,7 +26,6 @@ final class IndexControllerTest extends AbstractTestCase public function testWithTriggers(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'test_db'; Config::getInstance()->selectedServer['DisableIS'] = true; @@ -162,7 +161,6 @@ HTML; public function testWithoutTriggers(): void { Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; Current::$database = 'test_db'; Config::getInstance()->selectedServer['DisableIS'] = true; diff --git a/tests/classes/Database/EventsTest.php b/tests/classes/Database/EventsTest.php index b79cc59b8d..7d5b75940a 100644 --- a/tests/classes/Database/EventsTest.php +++ b/tests/classes/Database/EventsTest.php @@ -29,7 +29,6 @@ class EventsTest extends AbstractTestCase parent::setLanguage(); DatabaseInterface::$instance = $this->createDatabaseInterface(); - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; Config::getInstance()->selectedServer['DisableIS'] = false; diff --git a/tests/classes/Database/RoutinesTest.php b/tests/classes/Database/RoutinesTest.php index 954c5cb1cb..79a18cd9a3 100644 --- a/tests/classes/Database/RoutinesTest.php +++ b/tests/classes/Database/RoutinesTest.php @@ -36,7 +36,6 @@ class RoutinesTest extends AbstractTestCase $config->settings['ActionLinksMode'] = 'icons'; Current::$database = 'db'; Current::$table = 'table'; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['proc_priv'] = false; $GLOBALS['is_reload_priv'] = false; $GLOBALS['errors'] = []; diff --git a/tests/classes/Display/ResultsTest.php b/tests/classes/Display/ResultsTest.php index c9c1d2b4d3..e820f2139e 100644 --- a/tests/classes/Display/ResultsTest.php +++ b/tests/classes/Display/ResultsTest.php @@ -76,7 +76,6 @@ class ResultsTest extends AbstractTestCase Current::$database = 'db'; Current::$table = 'table'; $this->object = new DisplayResults($this->dbi, 'as', '', 2, '', ''); - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = false; $_SESSION[' HMAC_secret '] = 'test'; } diff --git a/tests/classes/ErrorHandlerTest.php b/tests/classes/ErrorHandlerTest.php index fb3f4be5f2..12e780672e 100644 --- a/tests/classes/ErrorHandlerTest.php +++ b/tests/classes/ErrorHandlerTest.php @@ -304,7 +304,6 @@ class ErrorHandlerTest extends AbstractTestCase public function testHandleExceptionForDevEnv(): void { $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->set('environment', 'development'); $errorHandler = new ErrorHandler(); $this->assertSame([], $errorHandler->getCurrentErrors()); @@ -329,7 +328,6 @@ class ErrorHandlerTest extends AbstractTestCase public function testHandleExceptionForProdEnv(): void { $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->set('environment', 'production'); $errorHandler = new ErrorHandler(); $this->assertSame([], $errorHandler->getCurrentErrors()); @@ -353,7 +351,6 @@ class ErrorHandlerTest extends AbstractTestCase public function testAddErrorWithFatalError(): void { $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->set('environment', 'production'); $errorHandler = new ErrorHandler(); try { diff --git a/tests/classes/FooterTest.php b/tests/classes/FooterTest.php index 75b500fc02..41c25cf640 100644 --- a/tests/classes/FooterTest.php +++ b/tests/classes/FooterTest.php @@ -40,7 +40,6 @@ class FooterTest extends AbstractTestCase $_SERVER['SCRIPT_NAME'] = 'index.php'; Current::$database = ''; Current::$table = ''; - $GLOBALS['text_dir'] = 'ltr'; $config = Config::getInstance(); $config->selectedServer['DisableIS'] = false; $config->selectedServer['verbose'] = 'verbose host'; diff --git a/tests/classes/InsertEditTest.php b/tests/classes/InsertEditTest.php index bc819fbf8a..6261e0bb72 100644 --- a/tests/classes/InsertEditTest.php +++ b/tests/classes/InsertEditTest.php @@ -67,7 +67,6 @@ class InsertEditTest extends AbstractTestCase DatabaseInterface::$instance = $this->dbi; $config = Config::getInstance(); $config->settings['ServerDefault'] = 1; - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; $config->settings['LimitChars'] = 50; diff --git a/tests/classes/Plugins/Auth/AuthenticationCookieTest.php b/tests/classes/Plugins/Auth/AuthenticationCookieTest.php index fad3bd7c13..5d7493416f 100644 --- a/tests/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/tests/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -56,7 +56,6 @@ class AuthenticationCookieTest extends AbstractTestCase parent::setGlobalConfig(); DatabaseInterface::$instance = $this->createDatabaseInterface(); - $GLOBALS['text_dir'] = 'ltr'; Current::$database = 'db'; Current::$table = 'table'; $_POST['pma_password'] = ''; diff --git a/tests/classes/Plugins/Auth/AuthenticationHttpTest.php b/tests/classes/Plugins/Auth/AuthenticationHttpTest.php index 72191030cd..932b624e00 100644 --- a/tests/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/tests/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -45,7 +45,6 @@ class AuthenticationHttpTest extends AbstractTestCase Current::$database = 'db'; Current::$table = 'table'; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['token_provided'] = true; $GLOBALS['token_mismatch'] = false; $this->object = new AuthenticationHttp(); diff --git a/tests/classes/Plugins/Export/ExportCsvTest.php b/tests/classes/Plugins/Export/ExportCsvTest.php index 560b60593b..8721a0afd2 100644 --- a/tests/classes/Plugins/Export/ExportCsvTest.php +++ b/tests/classes/Plugins/Export/ExportCsvTest.php @@ -43,7 +43,6 @@ class ExportCsvTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = ''; - $GLOBALS['text_dir'] = ''; $GLOBALS['csv_enclosed'] = null; $GLOBALS['csv_separator'] = null; $GLOBALS['save_filename'] = null; diff --git a/tests/classes/Plugins/Export/ExportHtmlwordTest.php b/tests/classes/Plugins/Export/ExportHtmlwordTest.php index 5839484f4d..97f7311523 100644 --- a/tests/classes/Plugins/Export/ExportHtmlwordTest.php +++ b/tests/classes/Plugins/Export/ExportHtmlwordTest.php @@ -69,7 +69,6 @@ class ExportHtmlwordTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = ''; - $GLOBALS['text_dir'] = ''; Config::getInstance()->selectedServer['DisableIS'] = true; } diff --git a/tests/classes/Plugins/Export/ExportMediawikiTest.php b/tests/classes/Plugins/Export/ExportMediawikiTest.php index 3c50bd992f..f264007b79 100644 --- a/tests/classes/Plugins/Export/ExportMediawikiTest.php +++ b/tests/classes/Plugins/Export/ExportMediawikiTest.php @@ -50,7 +50,6 @@ class ExportMediawikiTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; $this->object = new ExportMediawiki( new Relation($dbi), new Export($dbi), diff --git a/tests/classes/Plugins/Export/ExportPhparrayTest.php b/tests/classes/Plugins/Export/ExportPhparrayTest.php index 0a61656cf4..acc0fa946d 100644 --- a/tests/classes/Plugins/Export/ExportPhparrayTest.php +++ b/tests/classes/Plugins/Export/ExportPhparrayTest.php @@ -46,7 +46,6 @@ class ExportPhparrayTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; $this->object = new ExportPhparray( new Relation($dbi), new Export($dbi), diff --git a/tests/classes/Plugins/Export/ExportSqlTest.php b/tests/classes/Plugins/Export/ExportSqlTest.php index c7811bbdaa..aefd2f920c 100644 --- a/tests/classes/Plugins/Export/ExportSqlTest.php +++ b/tests/classes/Plugins/Export/ExportSqlTest.php @@ -62,7 +62,6 @@ class ExportSqlTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = true; $GLOBALS['output_kanji_conversion'] = false; $GLOBALS['buffer_needed'] = false; diff --git a/tests/classes/Plugins/Export/ExportTexytextTest.php b/tests/classes/Plugins/Export/ExportTexytextTest.php index b42dde7686..76b8b0452d 100644 --- a/tests/classes/Plugins/Export/ExportTexytextTest.php +++ b/tests/classes/Plugins/Export/ExportTexytextTest.php @@ -66,7 +66,6 @@ class ExportTexytextTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; Config::getInstance()->selectedServer['DisableIS'] = true; $this->object = new ExportTexytext( new Relation($this->dbi), diff --git a/tests/classes/Plugins/Export/ExportYamlTest.php b/tests/classes/Plugins/Export/ExportYamlTest.php index 7c6504ee36..d85bde2b42 100644 --- a/tests/classes/Plugins/Export/ExportYamlTest.php +++ b/tests/classes/Plugins/Export/ExportYamlTest.php @@ -45,7 +45,6 @@ class ExportYamlTest extends AbstractTestCase Current::$database = ''; Current::$table = ''; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; $this->object = new ExportYaml( new Relation($dbi), new Export($dbi), diff --git a/tests/classes/Plugins/Schema/SvgRelationSchemaTest.php b/tests/classes/Plugins/Schema/SvgRelationSchemaTest.php index a8b1f083c8..814ce5c457 100644 --- a/tests/classes/Plugins/Schema/SvgRelationSchemaTest.php +++ b/tests/classes/Plugins/Schema/SvgRelationSchemaTest.php @@ -46,7 +46,6 @@ class SvgRelationSchemaTest extends AbstractTestCase Current::$database = 'test_db'; Current::$table = ''; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'en'; Config::getInstance()->selectedServer['DisableIS'] = true; $this->object = new SvgRelationSchema(new Relation($dbi), DatabaseName::from('test_db')); diff --git a/tests/classes/Plugins/TwoFactor/WebAuthnTest.php b/tests/classes/Plugins/TwoFactor/WebAuthnTest.php index d1ec8bffa0..adced9e646 100644 --- a/tests/classes/Plugins/TwoFactor/WebAuthnTest.php +++ b/tests/classes/Plugins/TwoFactor/WebAuthnTest.php @@ -43,7 +43,6 @@ class WebAuthnTest extends AbstractTestCase (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null); $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; DatabaseInterface::$instance = $this->createDatabaseInterface(); $uri = $this->createStub(UriInterface::class); @@ -107,7 +106,6 @@ class WebAuthnTest extends AbstractTestCase (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null); $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; DatabaseInterface::$instance = $this->createDatabaseInterface(); $uri = $this->createStub(UriInterface::class); diff --git a/tests/classes/ResponseRendererTest.php b/tests/classes/ResponseRendererTest.php index 1ed5a95797..496c56caf0 100644 --- a/tests/classes/ResponseRendererTest.php +++ b/tests/classes/ResponseRendererTest.php @@ -23,7 +23,6 @@ class ResponseRendererTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; } #[RunInSeparateProcess] diff --git a/tests/classes/SqlQueryFormTest.php b/tests/classes/SqlQueryFormTest.php index 7ce6d7c60b..ed2b63d7b2 100644 --- a/tests/classes/SqlQueryFormTest.php +++ b/tests/classes/SqlQueryFormTest.php @@ -61,7 +61,6 @@ class SqlQueryFormTest extends AbstractTestCase //$GLOBALS Current::$database = 'PMA_db'; Current::$table = 'PMA_table'; - $GLOBALS['text_dir'] = 'text_dir'; $config = Config::getInstance(); $config->settings['GZipDump'] = false; diff --git a/tests/classes/Stubs/ResponseRenderer.php b/tests/classes/Stubs/ResponseRenderer.php index fc2f0d4448..dcdaa6d1f9 100644 --- a/tests/classes/Stubs/ResponseRenderer.php +++ b/tests/classes/Stubs/ResponseRenderer.php @@ -51,7 +51,6 @@ class ResponseRenderer extends \PhpMyAdmin\ResponseRenderer $this->isDisabled = false; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] ??= 'ltr'; $this->template = new Template(); Config::getInstance()->selectedServer['pmadb'] = 'phpmyadmin'; $dummyDbi = new DbiDummy(); diff --git a/tests/classes/Table/IndexesTest.php b/tests/classes/Table/IndexesTest.php index 5f3bcd217f..5f16a220af 100644 --- a/tests/classes/Table/IndexesTest.php +++ b/tests/classes/Table/IndexesTest.php @@ -28,7 +28,6 @@ class IndexesTest extends AbstractTestCase */ Current::$database = 'db'; Current::$table = 'table'; - $GLOBALS['text_dir'] = 'ltr'; $config = Config::getInstance(); $config->selectedServer['pmadb'] = ''; $config->selectedServer['DisableIS'] = false; diff --git a/tests/classes/Theme/ThemeTest.php b/tests/classes/Theme/ThemeTest.php index 38f0b95b56..a2077d39e4 100644 --- a/tests/classes/Theme/ThemeTest.php +++ b/tests/classes/Theme/ThemeTest.php @@ -34,8 +34,6 @@ class ThemeTest extends AbstractTestCase $this->object = new Theme(); parent::setGlobalConfig(); - - $GLOBALS['text_dir'] = 'ltr'; } /** diff --git a/tests/classes/Tracking/TrackingTest.php b/tests/classes/Tracking/TrackingTest.php index c01a0526ab..ca2547af1a 100644 --- a/tests/classes/Tracking/TrackingTest.php +++ b/tests/classes/Tracking/TrackingTest.php @@ -52,7 +52,6 @@ class TrackingTest extends AbstractTestCase Current::$database = 'PMA_db'; Current::$table = 'PMA_table'; $GLOBALS['lang'] = 'en'; - $GLOBALS['text_dir'] = 'ltr'; $config = Config::getInstance(); $config->selectedServer['DisableIS'] = true; $config->selectedServer['tracking_default_statements'] = 'DELETE'; diff --git a/tests/classes/UserPreferencesTest.php b/tests/classes/UserPreferencesTest.php index 9aadd3077f..a1769cf2b4 100644 --- a/tests/classes/UserPreferencesTest.php +++ b/tests/classes/UserPreferencesTest.php @@ -37,7 +37,6 @@ class UserPreferencesTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); Current::$server = 2; - $GLOBALS['text_dir'] = 'ltr'; $_SERVER['PHP_SELF'] = '/phpmyadmin/'; }