[TwigBridge] Handle form label attributes like others

Author: ro0NL

Resources/views/Form/attributes.html.php

@@ -1 +1,9 @@
-<?php echo $view['form']->block($form, 'widget_attributes') ?>
+<?php foreach ($attr as $k => $v): ?>
+<?php if ('placeholder' === $k || 'title' === $k): ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
+<?php elseif (true === $v): ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
+<?php elseif (false !== $v): ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape($v)) ?>
+<?php endif ?>
+<?php endforeach ?>

Resources/views/Form/button_attributes.html.php

@@ -1,10 +1,2 @@
-id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>" <?php if ($disabled): ?>disabled="disabled" <?php endif ?>
-<?php foreach ($attr as $k => $v): ?>
-<?php if (in_array($k, array('placeholder', 'title'), true)): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
-<?php elseif ($v === true): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
-<?php elseif ($v !== false): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($v)) ?>
-<?php endif ?>
-<?php endforeach ?>
+id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"<?php if ($disabled): ?> disabled="disabled"<?php endif ?>
+<?php echo $attr ? ' '.$view['form']->block($form, 'attributes') : '' ?>

Resources/views/Form/form_label.html.php

@@ -4,5 +4,5 @@
 <?php if (!$label) { $label = isset($label_format)
     ? strtr($label_format, array('%name%' => $name, '%id%' => $id))
     : $view['form']->humanize($name); } ?>
-<label <?php foreach ($label_attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
+<label<?php if ($label_attr) { echo ' '.$view['form']->block($form, 'attributes', array('attr' => $label_attr)); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
 <?php endif ?>

Resources/views/Form/widget_attributes.html.php

@@ -1,11 +1,3 @@
 id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"<?php if ($disabled): ?> disabled="disabled"<?php endif ?>
 <?php if ($required): ?> required="required"<?php endif ?>
-<?php foreach ($attr as $k => $v): ?>
-<?php if (in_array($k, array('placeholder', 'title'), true)): ?>
-<?php printf(' %s="%s"', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
-<?php elseif ($v === true): ?>
-<?php printf(' %s="%s"', $view->escape($k), $view->escape($k)) ?>
-<?php elseif ($v !== false): ?>
-<?php printf(' %s="%s"', $view->escape($k), $view->escape($v)) ?>
-<?php endif ?>
-<?php endforeach ?>
+<?php echo $attr ? ' '.$view['form']->block($form, 'attributes') : '' ?>

Resources/views/Form/widget_container_attributes.html.php

@@ -1,10 +1,2 @@
-<?php if (!empty($id)): ?>id="<?php echo $view->escape($id) ?>" <?php endif ?>
-<?php foreach ($attr as $k => $v): ?>
-<?php if (in_array($k, array('placeholder', 'title'), true)): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
-<?php elseif ($v === true): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
-<?php elseif ($v !== false): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($v)) ?>
-<?php endif ?>
-<?php endforeach ?>
+<?php if (!empty($id)): ?>id="<?php echo $view->escape($id) ?>"<?php endif ?>
+<?php echo $attr ? ' '.$view['form']->block($form, 'attributes') : '' ?>