[TwigBridge] Add html_entities filter

symfony · ro0NL · Mar 24, 2018 · Mar 27, 2018 · Mar 27, 2018 · Mar 27, 2018
commit 0a9438369a868e963ddcaa2c13f856bc432acb4f
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -88,6 +88,7 @@ public function getFilters()
    {
        return array(
            new TwigFilter('humanize', array($this, 'humanize')),
+            new TwigFilter('form_html_entities', array($this, 'htmlEntities'), array('is_safe' => array('html'), 'needs_environment' => true)),
        );
    }

@@ -126,6 +127,13 @@ public function humanize($text)
        return $this->renderer->humanize($text);
    }

+    public function htmlEntities(Environment $environment, $text)
+    {
+        $text = htmlentities($text, ENT_QUOTES | (defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8');
+
+        return iconv('UTF-8', $environment->getCharset(), $text);
+    }
+
    /**
     * Returns whether a choice is selected for a given form value.
     *

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -25,11 +25,11 @@
    {% if prepend or append %}
        <div class="input-group">
            {% if prepend %}
-                <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                <span class="input-group-addon">{{ money_pattern|form_html_entities|replace({ '{{ widget }}':''})|raw }}</span>
            {% endif %}
            {{- block('form_widget_simple') -}}
            {% if append %}
-                <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                <span class="input-group-addon">{{ money_pattern|form_html_entities|replace({ '{{ widget }}':''})|raw }}</span>
            {% endif %}
        </div>
    {% else %}

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -142,7 +142,7 @@
 {%- endblock integer_widget -%}

 {%- block money_widget -%}
-    {{ money_pattern|replace({ '{{ widget }}': block('form_widget_simple') })|raw }}
+    {{ money_pattern|html_entities|replace({ '{{ widget }}': block('form_widget_simple') })|raw }}
 {%- endblock money_widget -%}

 {%- block url_widget -%}

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
@@ -1 +1 @@
-<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern) ?>
+<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), htmlentities($money_pattern, ENT_QUOTES | (defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8')) ?>
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -83,7 +83,7 @@ public function getName()
    }

    /**
-     * Returns the pattern for this locale.
+     * Returns the pattern for this locale in UTF-8.
     *
     * The pattern contains the placeholder "{{ widget }}" where the HTML tag should
     * be inserted
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern) ?>
		<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), htmlentities($money_pattern, ENT_QUOTES \| (defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8')) ?>