From 004701c1f653f899ce4b51ab92ff64b2d617af6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Mon, 9 Oct 2017 16:36:19 -0300
Subject: [PATCH] Port columns_definitions/move_column to Twig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 .../columns_definitions/column_attributes.phtml   |  4 ++--
 templates/columns_definitions/move_column.phtml   | 15 ---------------
 templates/columns_definitions/move_column.twig    | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 templates/columns_definitions/move_column.phtml
 create mode 100644 templates/columns_definitions/move_column.twig

diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml
index 2cfa67dd12..624076dc2e 100644
--- a/templates/columns_definitions/column_attributes.phtml
+++ b/templates/columns_definitions/column_attributes.phtml
@@ -155,10 +155,10 @@ $ci_offset = -1;
     <td class="center">
         <?= PhpMyAdmin\Template::get('columns_definitions/move_column')
             ->render(array(
-                'columnNumber' => $columnNumber,
+                'column_number' => $columnNumber,
                 'ci' => $ci++,
                 'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta,
+                'column_meta' => $columnMeta,
                 'move_columns' => $move_columns,
                 'current_index' => $current_index
             )); ?>
diff --git a/templates/columns_definitions/move_column.phtml b/templates/columns_definitions/move_column.phtml
deleted file mode 100644
index 3b3d54e170..0000000000
--- a/templates/columns_definitions/move_column.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<select id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-        name="field_move_to[<?= $columnNumber; ?>]"
-        size="1"
-        width="5em">
-    <option value="" selected="selected">&nbsp;</option>
-    <option value="-first" <?= ($current_index == 0 ? ' disabled="disabled"' : ''); ?>>
-        <?= __('first'); ?>
-    </option>
-    <?php for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++): ?>
-        <option value="<?= htmlspecialchars($move_columns[$mi]->name); ?>"
-                <?= (($current_index == $mi || $current_index == $mi + 1) ? ' disabled="disabled"' : '');?>>
-            <?= sprintf(__('after %s'), PhpMyAdmin\Util::backquote(htmlspecialchars($move_columns[$mi]->name))); ?>
-        </option>
-    <?php endfor; ?>
-</select>
\ No newline at end of file
diff --git a/templates/columns_definitions/move_column.twig b/templates/columns_definitions/move_column.twig
new file mode 100644
index 0000000000..de2a2a5f3b
--- /dev/null
+++ b/templates/columns_definitions/move_column.twig
@@ -0,0 +1,15 @@
+<select id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    name="field_move_to[{{ column_number }}]"
+    size="1"
+    width="5em">
+    <option value="" selected="selected">&nbsp;</option>
+    <option value="-first"{{ current_index == 0 ? ' disabled="disabled"' }}>
+        {% trans 'first' %}
+    </option>
+    {% for mi in 0..move_columns|length - 1 %}
+        <option value="{{ move_columns[mi].name }}"
+            {{- current_index == mi or current_index == mi + 1 ? ' disabled="disabled"' }}>
+            {{ 'after %s'|trans|format(Util_backquote(move_columns[mi].name|e)) }}
+        </option>
+    {% endfor %}
+</select>