From fd11cc1d0e9383e0aafdd320d35b5df24c73d31b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 2 Apr 2018 15:14:01 +0200
Subject: [PATCH] fix merge

---
 .../Twig/Resources/views/Form/bootstrap_4_layout.html.twig | 4 ++--
 .../Resources/views/Form/bootstrap_base_layout.html.twig   | 4 ++--
 .../Resources/views/Form/foundation_5_layout.html.twig     | 4 ++--
 .../Tests/Extension/FormExtensionBootstrap3LayoutTest.php  | 7 +++++++
 .../Twig/Tests/Extension/FormExtensionDivLayoutTest.php    | 7 +++++++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index 2acd7086b0..df88a00011 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -9,13 +9,13 @@
         <div class="input-group{{ group_class|default('') }}">
             {%- if prepend -%}
                 <div class="input-group-prepend">
-                    <span class="input-group-text">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                    <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
                 </div>
             {%- endif -%}
             {{- block('form_widget_simple') -}}
             {%- if append -%}
                 <div class="input-group-append">
-                    <span class="input-group-text">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                    <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
                 </div>
             {%- endif -%}
         </div>
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
index 801415872a..2630803573 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
@@ -13,11 +13,11 @@
     {% if prepend or append %}
         <div class="input-group{{ group_class|default('') }}">
             {% if prepend %}
-                <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                <span class="input-group-addon">{{ money_pattern|form_encode_currency }}</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_encode_currency }}</span>
             {% endif %}
         </div>
     {% else %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
index 3035689cc9..058bb9714c 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
@@ -27,7 +27,7 @@
         {% set prepend = '{{' == money_pattern[0:2] %}
         {% if not prepend %}
             <div class="small-3 large-2 columns">
-                <span class="prefix">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                <span class="prefix">{{ money_pattern|form_encode_currency }}</span>
             </div>
         {% endif %}
         <div class="small-9 large-10 columns">
@@ -35,7 +35,7 @@
         </div>
         {% if prepend %}
             <div class="small-3 large-2 columns">
-                <span class="postfix">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+                <span class="postfix">{{ money_pattern|form_encode_currency }}</span>
             </div>
         {% endif %}
     </div>
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index 05e0262f1f..d45ac367b1 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -85,6 +85,13 @@ class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
         $environment->addExtension(new FormExtension());
         $environment->setCharset('ISO-8859-1');
 
+        $rendererEngine = new TwigRendererEngine(array(
+            'bootstrap_3_layout.html.twig',
+            'custom_widgets.html.twig',
+        ), $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+
         $view = $this->factory
             ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType')
             ->createView()
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index 951d403606..d2ea4e4a1a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -175,6 +175,13 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
         $environment->addExtension(new FormExtension());
         $environment->setCharset('ISO-8859-1');
 
+        $rendererEngine = new TwigRendererEngine(array(
+            'form_div_layout.html.twig',
+            'custom_widgets.html.twig',
+        ), $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+
         $view = $this->factory
             ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType')
             ->createView()