Visitar URL original
Merge pull request #18867 from MauricioFauth/text_dir-global-removal · phpmyadmin/phpmyadmin@21d962d · GitHub
Skip to content

Commit 21d962d

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18867 from MauricioFauth/text_dir-global-removal
Replace text_dir global var with LanguageManager::$textDir static
2 parents 0dbb5d7 + 0307bab commit 21d962d

107 files changed

Lines changed: 61 additions & 194 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,11 +1560,6 @@ parameters:
15601560
count: 2
15611561
path: src/Controllers/Database/CentralColumnsController.php
15621562

1563-
-
1564-
message: "#^Parameter \\#4 \\$textDir of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:getTemplateVariablesForMain\\(\\) expects string, mixed given\\.$#"
1565-
count: 1
1566-
path: src/Controllers/Database/CentralColumnsController.php
1567-
15681563
-
15691564
message: "#^Parameter \\#5 \\$colAttribute of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:updateOneColumn\\(\\) expects string, mixed given\\.$#"
15701565
count: 2
@@ -2550,11 +2545,6 @@ parameters:
25502545
count: 1
25512546
path: src/Controllers/Database/TrackingController.php
25522547

2553-
-
2554-
message: "#^Parameter \\#3 \\$textDir of method PhpMyAdmin\\\\Tracking\\\\Tracking\\:\\:getHtmlForDbTrackingTables\\(\\) expects string, mixed given\\.$#"
2555-
count: 1
2556-
path: src/Controllers/Database/TrackingController.php
2557-
25582548
-
25592549
message: "#^Parameter \\#3 \\$version of method PhpMyAdmin\\\\Tracking\\\\Tracking\\:\\:createTrackingForMultipleTables\\(\\) expects string, mixed given\\.$#"
25602550
count: 1
@@ -3835,11 +3825,6 @@ parameters:
38353825
count: 1
38363826
path: src/Controllers/Server/PrivilegesController.php
38373827

3838-
-
3839-
message: "#^Parameter \\#1 \\$textDir of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getHtmlForUserOverview\\(\\) expects string, mixed given\\.$#"
3840-
count: 1
3841-
path: src/Controllers/Server/PrivilegesController.php
3842-
38433828
-
38443829
message: "#^Parameter \\#1 \\$username of method PhpMyAdmin\\\\Controllers\\\\Server\\\\PrivilegesController\\:\\:getExportPageTitle\\(\\) expects string, mixed given\\.$#"
38453830
count: 1
@@ -4545,11 +4530,6 @@ parameters:
45454530
count: 1
45464531
path: src/Controllers/Table/ChangeController.php
45474532

4548-
-
4549-
message: "#^Parameter \\#12 \\$textDir of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditRow\\(\\) expects string, mixed given\\.$#"
4550-
count: 1
4551-
path: src/Controllers/Table/ChangeController.php
4552-
45534533
-
45544534
message: "#^Parameter \\#13 \\$repopulate of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditRow\\(\\) expects array, mixed given\\.$#"
45554535
count: 1
@@ -6030,11 +6010,6 @@ parameters:
60306010
count: 1
60316011
path: src/Controllers/Table/TrackingController.php
60326012

6033-
-
6034-
message: "#^Parameter \\#4 \\$textDir of method PhpMyAdmin\\\\Tracking\\\\Tracking\\:\\:getHtmlForMainPage\\(\\) expects string, mixed given\\.$#"
6035-
count: 1
6036-
path: src/Controllers/Table/TrackingController.php
6037-
60386013
-
60396014
message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
60406015
count: 2
@@ -15050,11 +15025,6 @@ parameters:
1505015025
count: 2
1505115026
path: src/Sql.php
1505215027

15053-
-
15054-
message: "#^Parameter \\#9 \\$textDirection of method PhpMyAdmin\\\\Display\\\\Results\\:\\:setProperties\\(\\) expects string, mixed given\\.$#"
15055-
count: 2
15056-
path: src/Sql.php
15057-
1505815028
-
1505915029
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
1506015030
count: 5

‎psalm-baseline.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -934,9 +934,6 @@
934934
<code>$columnDefault</code>
935935
<code>$columnDefault</code>
936936
</MixedAssignment>
937-
<PossiblyNullArgument>
938-
<code><![CDATA[$GLOBALS['text_dir']]]></code>
939-
</PossiblyNullArgument>
940937
<PossiblyUnusedMethod>
941938
<code>__construct</code>
942939
</PossiblyUnusedMethod>
@@ -1687,9 +1684,6 @@
16871684
<code>$selectedTable</code>
16881685
<code>$table</code>
16891686
</MixedAssignment>
1690-
<PossiblyNullArgument>
1691-
<code><![CDATA[$GLOBALS['text_dir']]]></code>
1692-
</PossiblyNullArgument>
16931687
<PossiblyUnusedMethod>
16941688
<code>__construct</code>
16951689
</PossiblyUnusedMethod>
@@ -2841,9 +2835,6 @@
28412835
<code><![CDATA[$GLOBALS['message']]]></code>
28422836
<code>$dbName</code>
28432837
</MixedAssignment>
2844-
<PossiblyNullArgument>
2845-
<code><![CDATA[$GLOBALS['text_dir']]]></code>
2846-
</PossiblyNullArgument>
28472838
<UnusedVariable>
28482839
<code>$key</code>
28492840
</UnusedVariable>
@@ -3308,7 +3299,6 @@
33083299
<code><![CDATA[$GLOBALS['current_result']]]></code>
33093300
</PossiblyInvalidArgument>
33103301
<PossiblyNullArgument>
3311-
<code><![CDATA[$GLOBALS['text_dir']]]></code>
33123302
<code>$isUpload</code>
33133303
</PossiblyNullArgument>
33143304
</file>
@@ -4153,9 +4143,6 @@
41534143
<code>$toggleActivation</code>
41544144
<code>$version</code>
41554145
</MixedAssignment>
4156-
<PossiblyNullArgument>
4157-
<code><![CDATA[$GLOBALS['text_dir']]]></code>
4158-
</PossiblyNullArgument>
41594146
</file>
41604147
<file src="src/Controllers/Table/ZoomSearchController.php">
41614148
<DeprecatedMethod>

‎psalm.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
sql_type: 'INSERT'|'UPDATE'|'REPLACE',
117117
table_priv: bool,
118118
tbl_storage_engine: string,
119-
text_dir: string,
120119
token_mismatch: bool,
121120
token_provided: bool,
122121
unparsed_sql?: string,

‎src/Controllers/Database/CentralColumnsController.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use PhpMyAdmin\Database\CentralColumns;
1313
use PhpMyAdmin\Http\ServerRequest;
1414
use PhpMyAdmin\Identifiers\DatabaseName;
15+
use PhpMyAdmin\LanguageManager;
1516
use PhpMyAdmin\Message;
1617
use PhpMyAdmin\ResponseRenderer;
1718
use PhpMyAdmin\Template;
@@ -155,8 +156,6 @@ public function __invoke(ServerRequest $request): void
155156

156157
public function main(string $totalRows, string $position, DatabaseName $db): void
157158
{
158-
$GLOBALS['text_dir'] ??= null;
159-
160159
if ($totalRows !== '' && $totalRows !== '0' && is_numeric($totalRows)) {
161160
$totalRows = (int) $totalRows;
162161
} else {
@@ -172,7 +171,7 @@ public function main(string $totalRows, string $position, DatabaseName $db): voi
172171
$db->getName(),
173172
$totalRows,
174173
$pos,
175-
$GLOBALS['text_dir'],
174+
LanguageManager::$textDir,
176175
);
177176

178177
$this->render('database/central_columns/main', $variables);

‎src/Controllers/Database/DesignerController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use PhpMyAdmin\DbTableExists;
1313
use PhpMyAdmin\Http\ServerRequest;
1414
use PhpMyAdmin\Identifiers\DatabaseName;
15+
use PhpMyAdmin\LanguageManager;
1516
use PhpMyAdmin\Message;
1617
use PhpMyAdmin\ResponseRenderer;
1718
use PhpMyAdmin\Template;
@@ -40,7 +41,6 @@ public function __invoke(ServerRequest $request): void
4041
{
4142
$GLOBALS['message'] ??= null;
4243
$GLOBALS['errorUrl'] ??= null;
43-
$GLOBALS['text_dir'] ??= null;
4444

4545
$db = $request->getParsedBodyParam('db');
4646
$table = $request->getParsedBodyParam('table');
@@ -68,7 +68,7 @@ public function __invoke(ServerRequest $request): void
6868

6969
$html = $this->template->render('database/designer/database_tables', [
7070
'db' => Current::$database,
71-
'text_dir' => $GLOBALS['text_dir'],
71+
'text_dir' => LanguageManager::$textDir,
7272
'has_query' => isset($_REQUEST['query']),
7373
'tab_pos' => [],
7474
'display_page' => -1,
@@ -236,7 +236,7 @@ public function __invoke(ServerRequest $request): void
236236

237237
$mainHtml = $this->template->render('database/designer/main', [
238238
'db' => Current::$database,
239-
'text_dir' => $GLOBALS['text_dir'],
239+
'text_dir' => LanguageManager::$textDir,
240240
'hidden_input_fields' => Url::getHiddenInputs($request->getQueryParam('db')),
241241
'designer_config' => json_encode($designerConfig),
242242
'display_page' => $displayPage,

‎src/Controllers/Database/EventsController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use PhpMyAdmin\DbTableExists;
1313
use PhpMyAdmin\Http\ServerRequest;
1414
use PhpMyAdmin\Identifiers\DatabaseName;
15+
use PhpMyAdmin\LanguageManager;
1516
use PhpMyAdmin\Message;
1617
use PhpMyAdmin\ResponseRenderer;
1718
use PhpMyAdmin\Template;
@@ -40,7 +41,6 @@ public function __construct(
4041
public function __invoke(ServerRequest $request): void
4142
{
4243
$GLOBALS['errors'] ??= null;
43-
$GLOBALS['text_dir'] ??= null;
4444
$GLOBALS['errorUrl'] ??= null;
4545

4646
$this->addScriptFiles(['database/events.js']);
@@ -264,7 +264,7 @@ public function __invoke(ServerRequest $request): void
264264
'items' => $items,
265265
'has_privilege' => Util::currentUserHasPrivilege('EVENT', Current::$database),
266266
'scheduler_state' => $this->events->getEventSchedulerStatus(),
267-
'text_dir' => $GLOBALS['text_dir'],
267+
'text_dir' => LanguageManager::$textDir,
268268
'is_ajax' => $request->isAjax() && empty($_REQUEST['ajax_page_request']),
269269
]);
270270
}

‎src/Controllers/Database/PrivilegesController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PhpMyAdmin\Http\ServerRequest;
1515
use PhpMyAdmin\Identifiers\DatabaseName;
1616
use PhpMyAdmin\Identifiers\InvalidDatabaseName;
17+
use PhpMyAdmin\LanguageManager;
1718
use PhpMyAdmin\Message;
1819
use PhpMyAdmin\ResponseRenderer;
1920
use PhpMyAdmin\Server\Privileges;
@@ -88,7 +89,7 @@ public function __invoke(ServerRequest $request): void
8889
'is_superuser' => $this->dbi->isSuperUser(),
8990
'db' => $db->getName(),
9091
'database_url' => $scriptName,
91-
'text_dir' => $GLOBALS['text_dir'],
92+
'text_dir' => LanguageManager::$textDir,
9293
'is_createuser' => $this->dbi->isCreateUser(),
9394
'is_grantuser' => $this->dbi->isGrantUser(),
9495
'privileges' => $privileges,

‎src/Controllers/Database/StructureController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use PhpMyAdmin\Http\ServerRequest;
2121
use PhpMyAdmin\Identifiers\DatabaseName;
2222
use PhpMyAdmin\Identifiers\TableName;
23+
use PhpMyAdmin\LanguageManager;
2324
use PhpMyAdmin\Message;
2425
use PhpMyAdmin\Query\Utilities;
2526
use PhpMyAdmin\Replication\Replication;
@@ -515,7 +516,7 @@ private function displayTableList(array $replicaInfo): string
515516
'show_last_check' => $config->settings['ShowDbStructureLastCheck'],
516517
],
517518
'check_all_tables' => [
518-
'text_dir' => $GLOBALS['text_dir'],
519+
'text_dir' => LanguageManager::$textDir,
519520
'overhead_check' => $overheadCheck,
520521
'db_is_system_schema' => $this->dbIsSystemSchema,
521522
'hidden_fields' => $hiddenFields,

‎src/Controllers/Database/TrackingController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use PhpMyAdmin\Html\Generator;
1414
use PhpMyAdmin\Http\ServerRequest;
1515
use PhpMyAdmin\Identifiers\DatabaseName;
16+
use PhpMyAdmin\LanguageManager;
1617
use PhpMyAdmin\Message;
1718
use PhpMyAdmin\Query\Utilities;
1819
use PhpMyAdmin\ResponseRenderer;
@@ -43,7 +44,6 @@ public function __construct(
4344

4445
public function __invoke(ServerRequest $request): void
4546
{
46-
$GLOBALS['text_dir'] ??= null;
4747
$GLOBALS['urlParams'] ??= null;
4848
$GLOBALS['errorUrl'] ??= null;
4949

@@ -147,7 +147,7 @@ public function __invoke(ServerRequest $request): void
147147
$this->response->addHTML($this->tracking->getHtmlForDbTrackingTables(
148148
Current::$database,
149149
$GLOBALS['urlParams'],
150-
$GLOBALS['text_dir'],
150+
LanguageManager::$textDir,
151151
));
152152

153153
// If available print out database log

‎src/Controllers/Server/DatabasesController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use PhpMyAdmin\DatabaseInterface;
1313
use PhpMyAdmin\Dbal\Connection;
1414
use PhpMyAdmin\Http\ServerRequest;
15+
use PhpMyAdmin\LanguageManager;
1516
use PhpMyAdmin\Query\Utilities;
1617
use PhpMyAdmin\Replication\ReplicationInfo;
1718
use PhpMyAdmin\ResponseRenderer;
@@ -62,7 +63,6 @@ public function __invoke(ServerRequest $request): void
6263
{
6364
$GLOBALS['is_create_db_priv'] ??= null;
6465
$GLOBALS['db_to_create'] ??= null;
65-
$GLOBALS['text_dir'] ??= null;
6666
$GLOBALS['errorUrl'] ??= null;
6767

6868
$params = [
@@ -156,7 +156,7 @@ public function __invoke(ServerRequest $request): void
156156
'has_primary_replication' => $primaryInfo['status'],
157157
'has_replica_replication' => $replicaInfo['status'],
158158
'is_drop_allowed' => $this->dbi->isSuperUser() || $config->settings['AllowUserDropDatabase'],
159-
'text_dir' => $GLOBALS['text_dir'],
159+
'text_dir' => LanguageManager::$textDir,
160160
]);
161161
}
162162

0 commit comments

Comments
 (0)