Skip to content

Commit 6e6beb6

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19227 from MauricioFauth/twig-pma-global-variable
Create the 'pma' global variable for Twig templates
2 parents 8f332a2 + 90ee00e commit 6e6beb6

85 files changed

Lines changed: 187 additions & 250 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: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,11 +1465,6 @@ parameters:
14651465
count: 1
14661466
path: src/Controllers/Database/CentralColumnsController.php
14671467

1468-
-
1469-
message: "#^Parameter \\#2 \\$templateData of method PhpMyAdmin\\\\ResponseRenderer\\:\\:render\\(\\) expects array\\<string, mixed\\>, array given\\.$#"
1470-
count: 1
1471-
path: src/Controllers/Database/CentralColumnsController.php
1472-
14731468
-
14741469
message: "#^Parameter \\#3 \\$colDefault of method PhpMyAdmin\\\\Controllers\\\\Database\\\\CentralColumnsController\\:\\:editSave\\(\\) expects string, mixed given\\.$#"
14751470
count: 1
@@ -3270,6 +3265,11 @@ parameters:
32703265
count: 2
32713266
path: src/Controllers/Server/PrivilegesController.php
32723267

3268+
-
3269+
message: "#^Parameter \\#2 \\$initial of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getHtmlForUserOverview\\(\\) expects string\\|null, mixed given\\.$#"
3270+
count: 1
3271+
path: src/Controllers/Server/PrivilegesController.php
3272+
32733273
-
32743274
message: "#^Parameter \\#2 \\$oldHostname of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getDataForChangeOrCopyUser\\(\\) expects string, mixed given\\.$#"
32753275
count: 1
@@ -3320,11 +3320,6 @@ parameters:
33203320
count: 1
33213321
path: src/Controllers/Server/PrivilegesController.php
33223322

3323-
-
3324-
message: "#^Parameter \\#3 \\$initial of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getHtmlForUserOverview\\(\\) expects string\\|null, mixed given\\.$#"
3325-
count: 1
3326-
path: src/Controllers/Server/PrivilegesController.php
3327-
33283323
-
33293324
message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, mixed given\\.$#"
33303325
count: 1
@@ -3896,7 +3891,7 @@ parameters:
38963891
path: src/Controllers/Table/ChangeController.php
38973892

38983893
-
3899-
message: "#^Parameter \\#13 \\$repopulate of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditRow\\(\\) expects array, mixed given\\.$#"
3894+
message: "#^Parameter \\#12 \\$repopulate of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditRow\\(\\) expects array, mixed given\\.$#"
39003895
count: 1
39013896
path: src/Controllers/Table/ChangeController.php
39023897

@@ -8516,7 +8511,7 @@ parameters:
85168511
path: src/InsertEdit.php
85178512

85188513
-
8519-
message: "#^Parameter \\#17 \\$whereClause of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditFormColumn\\(\\) expects string, mixed given\\.$#"
8514+
message: "#^Parameter \\#16 \\$whereClause of method PhpMyAdmin\\\\InsertEdit\\:\\:getHtmlForInsertEditFormColumn\\(\\) expects string, mixed given\\.$#"
85208515
count: 1
85218516
path: src/InsertEdit.php
85228517

‎psalm-baseline.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,6 @@
905905
<code><![CDATA[$request->getParsedBodyParam('total_rows', '')]]></code>
906906
</MixedArgument>
907907
<MixedArgumentTypeCoercion>
908-
<code><![CDATA[$variables]]></code>
909908
<code><![CDATA[[$request->getParsedBodyParam('column-select')]]]></code>
910909
</MixedArgumentTypeCoercion>
911910
<MixedAssignment>
@@ -11601,6 +11600,11 @@
1160111600
<code><![CDATA[empty($_POST['item_timing'])]]></code>
1160211601
</RiskyTruthyFalsyComparison>
1160311602
</file>
11603+
<file src="src/Twig/PmaGlobalVariable.php">
11604+
<UnusedParam>
11605+
<code><![CDATA[$arguments]]></code>
11606+
</UnusedParam>
11607+
</file>
1160411608
<file src="src/TwoFactor.php">
1160511609
<DeprecatedMethod>
1160611610
<code><![CDATA[Config::getInstance()]]></code>

‎resources/templates/base.twig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="{{ header.lang }}" dir="{{ header.text_dir }}" data-bs-theme="{{ header.theme_color_mode }}">
2+
<html lang="{{ header.lang }}" dir="{{ pma.text_dir }}" data-bs-theme="{{ header.theme_color_mode }}">
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -14,10 +14,10 @@
1414
<link rel="icon" href="favicon.ico" type="image/x-icon">
1515
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
1616
<link rel="stylesheet" type="text/css" href="{{ header.theme_path }}/jquery/jquery-ui.css">
17-
<link rel="stylesheet" type="text/css" href="{{ header.base_dir }}js/vendor/codemirror/lib/codemirror.css?{{ header.version }}">
18-
<link rel="stylesheet" type="text/css" href="{{ header.base_dir }}js/vendor/codemirror/addon/hint/show-hint.css?{{ header.version }}">
19-
<link rel="stylesheet" type="text/css" href="{{ header.base_dir }}js/vendor/codemirror/addon/lint/lint.css?{{ header.version }}">
20-
<link rel="stylesheet" type="text/css" href="{{ header.theme_path }}/css/theme{{ header.text_dir == 'rtl' ? '.rtl' }}.css?{{ header.version }}">
17+
<link rel="stylesheet" type="text/css" href="{{ header.base_dir }}js/vendor/codemirror/lib/codemirror.css?v={{ pma.version|url_encode }}">
18+
<link rel="stylesheet" type="text/css" href="{{ header.base_dir }}js/vendor/codemirror/addon/hint/show-hint.css?v={{ pma.version|url_encode }}">
19+
<link rel="stylesheet" type="text/css" href="{{ header.base_dir }}js/vendor/codemirror/addon/lint/lint.css?v={{ pma.version|url_encode }}">
20+
<link rel="stylesheet" type="text/css" href="{{ header.theme_path }}/css/theme{{ pma.text_dir == 'rtl' ? '.rtl' }}.css?v={{ pma.version|url_encode }}">
2121
<title>{{ header.title }}</title>
2222
{{ header.scripts|raw }}
2323
<noscript><style>html{display:block}</style></noscript>

‎resources/templates/database/central_columns/main.twig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
375375
</table>
376376

377377
{% include 'select_all.twig' with {
378-
'text_dir': text_dir,
379378
'form_name': 'tableslistcontainer',
380379
} only %}
381380
<button class="btn btn-link mult_submit change_central_columns" type="submit" name="edit_central_columns"

‎resources/templates/database/designer/database_tables.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
cellpadding="0"
1616
cellspacing="0"
1717
class="table table-sm table-striped table-hover w-auto designer_tab"
18-
style="position:absolute; {{ text_dir == 'rtl' ? 'right' : 'left' }}:
18+
style="position:absolute; {{ pma.text_dir == 'rtl' ? 'right' : 'left' }}:
1919
{{- tab_pos[t_n] is defined ? tab_pos[t_n]['X'] : random(range(20, 700)) }}px; top:
2020
{{- tab_pos[t_n] is defined ? tab_pos[t_n]['Y'] : random(range(20, 550)) }}px; display:
2121
{{- tab_pos[t_n] is defined or display_page == -1 ? 'block' : 'none' }}; z-index: 1;"> <!--"-->

‎resources/templates/database/designer/main.twig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ window.designerConfig = {{ designer_config|raw }};
232232
{# end layer_menu #}
233233
{% include 'database/designer/database_tables.twig' with {
234234
'db': db,
235-
'text_dir': text_dir,
236235
'has_query': has_query,
237236
'tab_pos': tab_pos,
238237
'display_page': display_page,

‎resources/templates/database/events/index.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<div class="wrapper toggleAjax hide">
118118
<div class="toggleButton">
119119
<div title="{{ t('Click to toggle') }}" class="toggle-container {{ scheduler_state ? 'on' : 'off' }}">
120-
<img src="{{ image('toggle-' ~ text_dir ~ '.png') }}">
120+
<img src="{{ image('toggle-' ~ pma.text_dir ~ '.png') }}">
121121
<table>
122122
<tbody>
123123
<tr>
@@ -146,7 +146,7 @@
146146
</tbody>
147147
</table>
148148
<span class="hide callback">Functions.slidingMessage(data.sql_query);</span>
149-
<span class="hide text_direction">{{ text_dir }}</span>
149+
<span class="hide text_direction">{{ pma.text_dir }}</span>
150150
</div>
151151
</div>
152152
</div>

‎resources/templates/database/privileges/index.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
</div>
109109

110110
<div>
111-
{{ get_image('select_all_arrow', t('With selected:'), {'dir': text_dir, 'width': '38', 'height': '22'}) }}
111+
{{ get_image('select_all_arrow', t('With selected:'), {'dir': pma.text_dir, 'width': '38', 'height': '22'}) }}
112112
<input type="checkbox" id="usersForm_checkall" class="checkall_box" title="{{ t('Check all') }}">
113113
<label for="usersForm_checkall">{{ t('Check all') }}</label>
114114
<em class="with-selected">{{ t('With selected:') }}</em>

‎resources/templates/database/structure/check_all_tables.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="clearfloat d-print-none">
2-
{{ get_image('select_all_arrow', t('With selected:'), {'dir': text_dir, 'width': '38', 'height': '22'}) }}
2+
{{ get_image('select_all_arrow', t('With selected:'), {'dir': pma.text_dir, 'width': '38', 'height': '22'}) }}
33
<input type="checkbox" id="tablesForm_checkall" class="checkall_box" title="{{ t('Check all') }}">
44
<label for="tablesForm_checkall">{{ t('Check all') }}</label>
55
{% if overhead_check != '' %}

‎resources/templates/database/tracking/tables.twig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<div class="wrapper toggleAjax hide">
4646
<div class="toggleButton">
4747
<div title="{{ t('Click to toggle') }}" class="toggle-container {{ version.tracking_active == 1 ? 'on' : 'off' }}">
48-
<img src="{{ image('toggle-' ~ text_dir ~ '.png') }}">
48+
<img src="{{ image('toggle-' ~ pma.text_dir ~ '.png') }}">
4949
<table>
5050
<tbody>
5151
<tr>
@@ -76,7 +76,7 @@
7676
</tbody>
7777
</table>
7878
<span class="hide callback"></span>
79-
<span class="hide text_direction">{{ text_dir }}</span>
79+
<span class="hide text_direction">{{ pma.text_dir }}</span>
8080
</div>
8181
</div>
8282
</div>
@@ -131,7 +131,6 @@
131131
</tbody>
132132
</table>
133133
{% include 'select_all.twig' with {
134-
'text_dir': text_dir,
135134
'form_name': 'trackedForm'
136135
} only %}
137136
<button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="delete_tracking"
@@ -180,7 +179,6 @@
180179
</tbody>
181180
</table>
182181
{% include 'select_all.twig' with {
183-
'text_dir': text_dir,
184182
'form_name': 'untrackedForm'
185183
} only %}
186184
<button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="track" title="{{ t('Track table') }}">

0 commit comments

Comments
 (0)