gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18867 from MauricioFauth/text_dir-global-removal

Browse Source 
Replace text_dir global var with LanguageManager::$textDir static
This commit is contained in:
Maurício Meneghini Fauth 2023-12-27 22:36:01 -03:00 committed by GitHub
commit 21d962dec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
107 changed files with 61 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
phpstan-baseline.neon
View File

@ -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

13
psalm-baseline.xml
View File

@ -934,9 +934,6 @@
<code>$columnDefault</code>
<code>$columnDefault</code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$GLOBALS['text_dir']]]></code>
</PossiblyNullArgument>
<PossiblyUnusedMethod>
<code>__construct</code>
</PossiblyUnusedMethod>
@ -1687,9 +1684,6 @@
<code>$selectedTable</code>
<code>$table</code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$GLOBALS['text_dir']]]></code>
</PossiblyNullArgument>
<PossiblyUnusedMethod>
<code>__construct</code>
</PossiblyUnusedMethod>
@ -2841,9 +2835,6 @@
<code><![CDATA[$GLOBALS['message']]]></code>
<code>$dbName</code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$GLOBALS['text_dir']]]></code>
</PossiblyNullArgument>
<UnusedVariable>
<code>$key</code>
</UnusedVariable>
@ -3308,7 +3299,6 @@
<code><![CDATA[$GLOBALS['current_result']]]></code>
</PossiblyInvalidArgument>
<PossiblyNullArgument>
<code><![CDATA[$GLOBALS['text_dir']]]></code>
<code>$isUpload</code>
</PossiblyNullArgument>
</file>
@ -4153,9 +4143,6 @@
<code>$toggleActivation</code>
<code>$version</code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$GLOBALS['text_dir']]]></code>
</PossiblyNullArgument>
</file>
<file src="src/Controllers/Table/ZoomSearchController.php">
<DeprecatedMethod>

1
psalm.xml
View File

@ -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,

5
src/Controllers/Database/CentralColumnsController.php
View File

@ -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);

6
src/Controllers/Database/DesignerController.php
View File

@ -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,

4
src/Controllers/Database/EventsController.php
View File

@ -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']),
]);
}

3
src/Controllers/Database/PrivilegesController.php
View File

@ -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,

3
src/Controllers/Database/StructureController.php
View File

@ -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,

4
src/Controllers/Database/TrackingController.php
View File

@ -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

4
src/Controllers/Server/DatabasesController.php
View File

@ -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,
]);
}

4
src/Controllers/Server/PrivilegesController.php
View File

@ -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'),
),
);

3
src/Controllers/Setup/FormController.php
View File

@ -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!'),
]);
}

3
src/Controllers/Setup/MainController.php
View File

@ -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!'),
]));
}

4
src/Controllers/Table/ChangeController.php
View File

@ -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,
);

3
src/Controllers/Table/PrivilegesController.php
View File

@ -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,

3
src/Controllers/Table/StructureController.php
View File

@ -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),

4
src/Controllers/Table/TrackingController.php
View File

@ -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', [

4
src/Controllers/View/CreateController.php
View File

@ -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,

4
src/Header.php
View File

@ -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(),

3
src/Http/Middleware/Authentication.php
View File

@ -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(),
]));
}

3
src/Http/Middleware/ConfigErrorAndPermissionChecking.php
View File

@ -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(),
]));
}

3
src/Http/Middleware/DatabaseServerVersionChecking.php
View File

@ -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',

3
src/Http/Middleware/RequestProblemChecking.php
View File

@ -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(),
]));
}

3
src/Http/Middleware/SessionHandling.php
View File

@ -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(),
]));
}

6
src/Language.php
View File

@ -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();
}
}

3
src/LanguageManager.php
View File

@ -722,6 +722,9 @@ class LanguageManager
private static LanguageManager|null $instance = null;
/** @psalm-var 'ltr'|'rtl' */
public static string $textDir = 'ltr';
/**
* Returns LanguageManager singleton
*/

2
src/Plugins/Auth/AuthenticationCookie.php
View File

@ -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(),
]));

3
src/Plugins/Auth/AuthenticationHttp.php
View File

@ -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,
]);

5
src/Plugins/Auth/AuthenticationSignon.php
View File

@ -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,
]);

3
src/Plugins/AuthenticationPlugin.php
View File

@ -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(),
]));

3
src/Routing/Routing.php
View File

@ -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]',

4
src/Sql.php
View File

@ -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,

1
tests/classes/AbstractTestCase.php
View File

@ -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();

1
tests/classes/Controllers/CheckRelationsControllerTest.php
View File

@ -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([

2
tests/classes/Controllers/Database/EventsControllerTest.php
View File

@ -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;

2
tests/classes/Controllers/Database/RoutinesControllerTest.php
View File

@ -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;

1
tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php
View File

@ -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';

1
tests/classes/Controllers/Database/StructureControllerTest.php
View File

@ -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';

1
tests/classes/Controllers/Export/ExportControllerTest.php
View File

@ -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;

2
tests/classes/Controllers/Export/Template/CreateControllerTest.php
View File

@ -37,8 +37,6 @@ class CreateControllerTest extends AbstractTestCase
public function testCreate(): void
{
$GLOBALS['text_dir'] = 'ltr';
$relationParameters = RelationParameters::fromArray([
'exporttemplateswork' => true,
'db' => 'db',

2
tests/classes/Controllers/Export/Template/DeleteControllerTest.php
View File

@ -34,8 +34,6 @@ class DeleteControllerTest extends AbstractTestCase
public function testDelete(): void
{
$GLOBALS['text_dir'] = 'ltr';
Config::getInstance()->selectedServer['user'] = 'user';
$response = new ResponseRenderer();

2
tests/classes/Controllers/Export/Template/LoadControllerTest.php
View File

@ -36,8 +36,6 @@ class LoadControllerTest extends AbstractTestCase
public function testLoad(): void
{
$GLOBALS['text_dir'] = 'ltr';
$relationParameters = RelationParameters::fromArray([
'exporttemplateswork' => true,
'db' => 'db',

2
tests/classes/Controllers/Export/Template/UpdateControllerTest.php
View File

@ -34,8 +34,6 @@ class UpdateControllerTest extends AbstractTestCase
public function testUpdate(): void
{
$GLOBALS['text_dir'] = 'ltr';
Config::getInstance()->selectedServer['user'] = 'user';
$response = new ResponseRenderer();

1
tests/classes/Controllers/GisDataEditorControllerTest.php
View File

@ -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';

1
tests/classes/Controllers/Operations/TableControllerTest.php
View File

@ -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';

2
tests/classes/Controllers/Server/BinlogControllerTest.php
View File

@ -28,8 +28,6 @@ class BinlogControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/CollationsControllerTest.php
View File

@ -29,8 +29,6 @@ class CollationsControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

1
tests/classes/Controllers/Server/Databases/CreateControllerTest.php
View File

@ -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 = '';

2
tests/classes/Controllers/Server/Databases/DestroyControllerTest.php
View File

@ -30,8 +30,6 @@ class DestroyControllerTest extends AbstractTestCase
public function testDropDatabases(): void
{
$GLOBALS['text_dir'] = 'ltr';
$dbi = $this->getMockBuilder(DatabaseInterface::class)
->disableOriginalConstructor()
->getMock();

1
tests/classes/Controllers/Server/DatabasesControllerTest.php
View File

@ -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

2
tests/classes/Controllers/Server/EnginesControllerTest.php
View File

@ -29,8 +29,6 @@ class EnginesControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/PluginsControllerTest.php
View File

@ -31,8 +31,6 @@ class PluginsControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php
View File

@ -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);

2
tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php
View File

@ -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);

1
tests/classes/Controllers/Server/PrivilegesControllerTest.php
View File

@ -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;

2
tests/classes/Controllers/Server/ShowEngineControllerTest.php
View File

@ -31,8 +31,6 @@ class ShowEngineControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Status/AdvisorControllerTest.php
View File

@ -29,8 +29,6 @@ class AdvisorControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
DatabaseInterface::$instance = $this->createDatabaseInterface();

2
tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
View File

@ -30,8 +30,6 @@ class GeneralLogControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
View File

@ -30,8 +30,6 @@ class LogVarsControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
View File

@ -30,8 +30,6 @@ class SlowLogControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Status/MonitorControllerTest.php
View File

@ -31,8 +31,6 @@ class MonitorControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

1
tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
View File

@ -30,7 +30,6 @@ class RefreshControllerTest extends AbstractTestCase
parent::setUp();
DatabaseInterface::$instance = $this->createDatabaseInterface();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();

2
tests/classes/Controllers/Server/Status/ProcessesControllerTest.php
View File

@ -30,8 +30,6 @@ class ProcessesControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Status/QueriesControllerTest.php
View File

@ -34,8 +34,6 @@ class QueriesControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

2
tests/classes/Controllers/Server/Status/StatusControllerTest.php
View File

@ -29,8 +29,6 @@ class StatusControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
$this->dummyDbi = $this->createDbiDummy();

1
tests/classes/Controllers/Server/Status/VariablesControllerTest.php
View File

@ -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();

1
tests/classes/Controllers/Server/VariablesControllerTest.php
View File

@ -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;

2
tests/classes/Controllers/Sql/EnumValuesControllerTest.php
View File

@ -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

2
tests/classes/Controllers/Sql/SetValuesControllerTest.php
View File

@ -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

1
tests/classes/Controllers/Table/ImportControllerTest.php
View File

@ -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();

1
tests/classes/Controllers/Table/IndexRenameControllerTest.php
View File

@ -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();

1
tests/classes/Controllers/Table/IndexesControllerTest.php
View File

@ -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;

3
tests/classes/Controllers/Table/RecentFavoriteControllerTest.php
View File

@ -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' => '']);

1
tests/classes/Controllers/Table/RelationControllerTest.php
View File

@ -33,7 +33,6 @@ class RelationControllerTest extends AbstractTestCase
Current::$database = 'db';
Current::$table = 'table';
$GLOBALS['text_dir'] = 'ltr';
Config::getInstance()->selectedServer['DisableIS'] = false;
//$_SESSION

1
tests/classes/Controllers/Table/SearchControllerTest.php
View File

@ -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)

1
tests/classes/Controllers/Table/SqlControllerTest.php
View File

@ -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();

1
tests/classes/Controllers/Table/Structure/ChangeControllerTest.php
View File

@ -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';

1
tests/classes/Controllers/Table/Structure/SaveControllerTest.php
View File

@ -104,7 +104,6 @@ class SaveControllerTest extends AbstractTestCase
public function testAdjustColumnPrivileges(): void
{
$GLOBALS['text_dir'] = 'ltr';
Current::$database = 'db';
Current::$table = 'table';

1
tests/classes/Controllers/Table/StructureControllerTest.php
View File

@ -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();

1
tests/classes/Controllers/Table/TrackingControllerTest.php
View File

@ -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';

1
tests/classes/Controllers/Table/ZoomSearchControllerTest.php
View File

@ -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();

1
tests/classes/Controllers/Transformation/OverviewControllerTest.php
View File

@ -29,7 +29,6 @@ class OverviewControllerTest extends AbstractTestCase
parent::setGlobalConfig();
DatabaseInterface::$instance = $this->createDatabaseInterface();
$GLOBALS['text_dir'] = 'ltr';
Current::$database = 'db';
Current::$table = 'table';

2
tests/classes/Controllers/Triggers/IndexControllerTest.php
View File

@ -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;

1
tests/classes/Database/EventsTest.php
View File

@ -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;

1
tests/classes/Database/RoutinesTest.php
View File

@ -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'] = [];

1
tests/classes/Display/ResultsTest.php
View File

@ -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';
}

3
tests/classes/ErrorHandlerTest.php
View File

@ -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 {

1
tests/classes/FooterTest.php
View File

@ -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';

1
tests/classes/InsertEditTest.php
View File

@ -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;

1
tests/classes/Plugins/Auth/AuthenticationCookieTest.php
View File

@ -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'] = '';

1
tests/classes/Plugins/Auth/AuthenticationHttpTest.php
View File

@ -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();

1
tests/classes/Plugins/Export/ExportCsvTest.php
View File

@ -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;

1
tests/classes/Plugins/Export/ExportHtmlwordTest.php
View File

@ -69,7 +69,6 @@ class ExportHtmlwordTest extends AbstractTestCase
Current::$database = '';
Current::$table = '';
$GLOBALS['lang'] = '';
$GLOBALS['text_dir'] = '';
Config::getInstance()->selectedServer['DisableIS'] = true;
}

1
tests/classes/Plugins/Export/ExportMediawikiTest.php
View File

@ -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),

1
tests/classes/Plugins/Export/ExportPhparrayTest.php
View File

@ -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),

1
tests/classes/Plugins/Export/ExportSqlTest.php
View File

@ -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;

1
tests/classes/Plugins/Export/ExportTexytextTest.php
View File

@ -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),

1
tests/classes/Plugins/Export/ExportYamlTest.php
View File

@ -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),

1
tests/classes/Plugins/Schema/SvgRelationSchemaTest.php
View File

@ -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'));

2
tests/classes/Plugins/TwoFactor/WebAuthnTest.php
View File

@ -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);

Some files were not shown because too many files have changed in this diff Show More