Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 08966f7

Browse filesBrowse files
fabpotfabpot
committed
bug #45905 [TwigBridge] Fix the build (wouterj)
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
2 parents e6f392a + 6f87f91 commit 08966f7
Copy full SHA for 08966f7

File tree

3 files changed

+3
-5
lines changed
Filter options

3 files changed

+3
-5
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"symfony/http-kernel": "^5.0|^6.0",
3535
"symfony/messenger": "^4.4|^5.0|^6.0",
3636
"symfony/doctrine-messenger": "^5.1|^6.0",
37-
"symfony/phpunit-bridge": "^4.4|^5.4|^6.0",
3837
"symfony/property-access": "^4.4|^5.0|^6.0",
3938
"symfony/property-info": "^5.0|^6.0",
4039
"symfony/proxy-manager-bridge": "^4.4|^5.0|^6.0",

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
{%- endif -%}
102102
{%- endif -%}
103103
<label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
104-
{{- widget|raw }}
105-
{%- if label is not same as(false) -%}
104+
{#- if statement must be kept on the same line, to force the space between widget and label -#}
105+
{{- widget|raw }} {% if label is not same as(false) -%}
106106
{%- if translation_domain is same as(false) -%}
107107
{%- if label_html is same as(false) -%}
108108
{{ label -}}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@
6666
"symfony/property-info": "^4.4|^5.0|^6.0",
6767
"symfony/web-link": "^4.4|^5.0|^6.0",
6868
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
69-
"twig/twig": "^2.10|^3.0",
70-
"symfony/phpunit-bridge": "^5.3|^6.0"
69+
"twig/twig": "^2.10|^3.0"
7170
},
7271
"conflict": {
7372
"doctrine/annotations": "<1.13.1",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.