1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge pull request #6496 from marc1706/ticket/17151

[ticket/17151] Adjust form macros to adhere to coding guidelines
This commit is contained in:
Marc Alexander
2023-07-30 08:50:33 +02:00
committed by GitHub
4 changed files with 21 additions and 17 deletions

View File

@@ -118,7 +118,9 @@ class forms extends AbstractExtension
try
{
return $environment->render('macros/forms/input.twig', [
'CLASS' => (string) ($form_data['class'] ?? ''),
'ID' => (string) ($form_data['id'] ?? ''),
'DATA' => $form_data['data'] ?? [],
'TYPE' => (string) $form_data['type'],
'NAME' => (string) $form_data['name'],
'SIZE' => (int) ($form_data['size'] ?? 0),
@@ -127,9 +129,7 @@ class forms extends AbstractExtension
'MAX' => (int) ($form_data['max'] ?? 0),
'STEP' => (int) ($form_data['step'] ?? 0),
'CHECKED' => (bool) ($form_data['checked'] ?? false),
'CLASS' => (string) ($form_data['class'] ?? ''),
'VALUE' => (string) ($form_data['value']),
'DATA' => $form_data['data'] ?? [],
]);
}
catch (\Twig\Error\Error $e)
@@ -176,13 +176,13 @@ class forms extends AbstractExtension
try
{
return $environment->render('macros/forms/select.twig', [
'ID' => (string) ($form_data['id'] ?? ''),
'CLASS' => (string) ($form_data['class'] ?? ''),
'ID' => (string) ($form_data['id'] ?? ''),
'DATA' => $form_data['data'] ?? [],
'NAME' => (string) $form_data['name'],
'TOGGLEABLE' => (bool) ($form_data['toggleable'] ?? false),
'OPTIONS' => $form_data['options'] ?? [],
'GROUP_ONLY' => (bool) ($form_data['group_only'] ?? false),
'DATA' => $form_data['data'] ?? [],
'SIZE' => (int) ($form_data['size'] ?? 0),
'MULTIPLE' => (bool) ($form_data['multiple'] ?? false),
]);
@@ -206,7 +206,9 @@ class forms extends AbstractExtension
try
{
return $environment->render('macros/forms/textarea.twig', [
'CLASS' => (string) ($form_data['class'] ?? ''),
'ID' => (string) $form_data['id'],
'DATA' => $form_data['data'] ?? [],
'NAME' => (string) $form_data['name'],
'ROWS' => (int) $form_data['rows'],
'COLS' => (int) $form_data['cols'],