fix merge

Author: nicolas-grekas

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>

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 %}

Resources/views/Form/foundation_5_layout.html.twig

@@ -27,15 +27,15 @@
         {% 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">
             {{- block('form_widget_simple') -}}
         </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>

Tests/Extension/FormExtensionBootstrap3LayoutTest.php

@@ -85,6 +85,13 @@ public function testMoneyWidgetInIso()
         $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()

Tests/Extension/FormExtensionDivLayoutTest.php

@@ -175,6 +175,13 @@ public function testMoneyWidgetInIso()
         $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()