bug #25233 [TwigBridge][Form] Fix hidden currency element with Bootstrap 3 theme (julienfalque)

fabpot · fabpot · commit 9ac08e87704e · 2017-12-11T13:56:00.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBridge][Form] Fix hidden currency element with Bootstrap 3 theme | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When using a `MoneyType` field, one can pass `currency=false` option to hide the currency symbol. This does not work well when using the Bootstrap 3 theme: the symbol is not displayed but HTML elements that are supposed to contain it are still rendered. Commits ------- c5af7fd Fix hidden currency element with Bootstrap 3 theme
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
@@ -20,16 +20,21 @@
 {%- endblock %}
 
 {% block money_widget -%}
-    <div class="input-group">
-        {% set append = money_pattern starts with '{{' %}
-        {% if not append %}
-            <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
-        {% endif %}
+    {% set prepend = not (money_pattern starts with '{{') %}
+    {% set append = not (money_pattern ends with '}}') %}
+    {% if prepend or append %}
+        <div class="input-group">
+            {% if prepend %}
+                <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+            {% endif %}
+            {{- block('form_widget_simple') -}}
+            {% if append %}
+                <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
+            {% endif %}
+        </div>
+    {% else %}
         {{- block('form_widget_simple') -}}
-        {% if append %}
-            <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}':''}) }}</span>
-        {% endif %}
-    </div>
+    {% endif %}
 {%- endblock money_widget %}
 
 {% block percent_widget -%}
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -1899,6 +1899,25 @@ public function testMoney()
         );
     }
 
+    public function testMoneyWithoutCurrency()
+    {
+        $form = $this->factory->createNamed('name', 'money', 1234.56, array(
+            'currency' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+'/input
+    [@id="my&id"]
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="1234.56"]
+    [not(preceding-sibling::*)]
+    [not(following-sibling::*)]
+'
+        );
+    }
+
     public function testNumber()
     {
         $form = $this->factory->createNamed('name', 'number', 1234.56);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
@@ -43,7 +43,7 @@ public function testMoneyPatternWorksForYen()
         $view = $this->factory->create(static::TESTED_TYPE, null, array('currency' => 'JPY'))
             ->createView();
 
-        $this->assertTrue((bool) strstr($view->vars['money_pattern'], '¥'));
+        $this->assertSame('¥ {{ widget }}', $view->vars['money_pattern']);
     }
 
     // https://github.com/symfony/symfony/issues/5458
@@ -62,4 +62,12 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
         parent::testSubmitNull($expected, $norm, '');
     }
+
+    public function testMoneyPatternWithoutCurrency()
+    {
+        $view = $this->factory->create(static::TESTED_TYPE, null, array('currency' => false))
+            ->createView();
+
+        $this->assertSame('{{ widget }}', $view->vars['money_pattern']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testMoneyPatternWorksForYen()`
`43`	`43`	`$view = $this->factory->create(static::TESTED_TYPE, null, array('currency' => 'JPY'))`
`44`	`44`	`->createView();`
`45`	`45`
`46`		`- $this->assertTrue((bool) strstr($view->vars['money_pattern'], '¥'));`
	`46`	`+ $this->assertSame('¥ {{ widget }}', $view->vars['money_pattern']);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// https://github.com/symfony/symfony/issues/5458`
`@@ -62,4 +62,12 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)`
`62`	`62`	`{`
`63`	`63`	`parent::testSubmitNull($expected, $norm, '');`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ public function testMoneyPatternWithoutCurrency()`
	`67`	`+ {`
	`68`	`+ $view = $this->factory->create(static::TESTED_TYPE, null, array('currency' => false))`
	`69`	`+ ->createView();`
	`70`	`+`
	`71`	`+ $this->assertSame('{{ widget }}', $view->vars['money_pattern']);`
	`72`	`+ }`
`65`	`73`	`}`