Merge branch '3.4' into 4.0

* 3.4: (22 commits)
  fix merge
  [Translation] Fix InvalidArgumentException when using untranslated plural forms from .po files
  Fixed exit code with non-integer throwable code
  [HttpFoundation] Support 0 bit netmask in IPv6 ()
  [DI] Impossible to set an environment variable and then an array as container parameter
  [Process] remove false-positive BC breaking exception on Windows
  Tweaking class not found autowiring error
  [LDAP] added missing dots at the end of some exception messages.
  [TwigBridge] Add missing dev requirement for workflow
  fixed #25440
  empty lines don't count for indent detection
  Set `width: auto` on WebProfiler toolbar's reset.
  [Lock] Fix incorrect phpdoc
  [Process] Dont rely on putenv(), it fails on ZTS PHP
  [HttpKernel] detect deprecations thrown by container initialization during tests
  [HttpKernel] Fix logging of post-terminate errors/exceptions
  [DI] Add context to service-not-found exceptions thrown by service locators
  [Debug] Fix catching fatal errors in case of nested error handlers
  [VarDumper] Fixed file links leave blank pages when ide is configured
  Fix hidden currency element with Bootstrap 3 theme
  ...

Author: nicolas-grekas

Resources/views/Form/bootstrap_base_layout.html.twig

@@ -8,16 +8,21 @@
 {%- endblock textarea_widget %}
 
 {% block money_widget -%}
-    <div class="input-group{{ group_class|default('') }}">
-        {%- 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{{ group_class|default('') }}">
+            {% 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 -%}

Tests/Extension/WorkflowExtensionTest.php

@@ -25,10 +25,6 @@ class WorkflowExtensionTest extends TestCase
 
     protected function setUp()
     {
-        if (!class_exists(Workflow::class)) {
-            $this->markTestSkipped('The Workflow component is needed to run tests for this extension.');
-        }
-
         $places = array('ordered', 'waiting_for_payment', 'processed');
         $transitions = array(
             new Transition('t1', 'ordered', 'waiting_for_payment'),

composer.json

@@ -20,7 +20,6 @@
         "twig/twig": "^1.35|^2.4.4"
     },
     "require-dev": {
-        "fig/link-util": "^1.0",
         "symfony/asset": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
@@ -38,7 +37,8 @@
         "symfony/console": "~3.4|~4.0",
         "symfony/var-dumper": "~3.4|~4.0",
         "symfony/expression-language": "~3.4|~4.0",
-        "symfony/web-link": "~3.4|~4.0"
+        "symfony/web-link": "~3.4|~4.0",
+        "symfony/workflow": "~3.4|~4.0"
     },
     "conflict": {
         "symfony/form": "<3.4",