bug #45905 [TwigBridge] Fix the build (wouterj)

fabpot · fabpot · commit 08966f7903be · 2022-04-01T08:09:47.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [TwigBridge] Fix the build | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix part of CI | License | MIT | Doc PR | n/a * The changes in #45897 missed the space between widget and label. Afaik, there is no other way to force the space than moving the if statement on the same line. * I've removed PHPunit bridge from `require-dev` in the subtree splits. The PHPunit bridge is installed by the monorepo during local testing. Depending on it in subpackage's composer.json can create conflicts between the version installed by the monorepo and the subtree split package (especially on deps=low builds). The build was broken due to mixing up 4.4.0 and 6.1-dev in deps=low. * Finally, Appveyor seems to need to run a second time on each version branch for 8016293 to work. Not sure why, but if it works it works 🏃 Commits ------- 6f87f91 [TwigBridge] Fix the build
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -34,7 +34,6 @@
         "symfony/http-kernel": "^5.0|^6.0",
         "symfony/messenger": "^4.4|^5.0|^6.0",
         "symfony/doctrine-messenger": "^5.1|^6.0",
-        "symfony/phpunit-bridge": "^4.4|^5.4|^6.0",
         "symfony/property-access": "^4.4|^5.0|^6.0",
         "symfony/property-info": "^5.0|^6.0",
         "symfony/proxy-manager-bridge": "^4.4|^5.0|^6.0",
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
@@ -101,8 +101,8 @@
             {%- endif -%}
         {%- endif -%}
         <label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
-            {{- widget|raw }}
-            {%- if label is not same as(false) -%}
+            {#- if statement must be kept on the same line, to force the space between widget and label -#}
+            {{- widget|raw }} {% if label is not same as(false) -%}
                 {%- if translation_domain is same as(false) -%}
                     {%- if label_html is same as(false) -%}
                         {{ label -}}
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -66,8 +66,7 @@
         "symfony/property-info": "^4.4|^5.0|^6.0",
         "symfony/web-link": "^4.4|^5.0|^6.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "twig/twig": "^2.10|^3.0",
-        "symfony/phpunit-bridge": "^5.3|^6.0"
+        "twig/twig": "^2.10|^3.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13.1",
