Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.7k
[TwigBridge] fix bootstrap_3_layout ChoiceType's expanded label_html#45897
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
carsonbot commentedMar 30, 2022
Hey! I see that this is your first PR. That is great! Welcome! Symfony has acontribution guide which I suggest you to read. In short:
Review the GitHub status checks of your pull request and try to solve the reported issues. If some tests are failing, try to see if they are failing because of this change. When two Symfony core team members approve this change, it will be merged and you will become an official Symfony contributor! I am going to sit back now and wait for the reviews. Cheers! Carsonbot |
derrabus commentedMar 30, 2022
The bug ticket says that Symfony 5 is affected by this bug. If that were the case, we would need to target the 5.4 branch. Can you please check? |
ytilotti commentedMar 31, 2022
I can do a PR for 5.4 too. But the bug is available on 6.x |
nicolas-grekas left a comment• edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Please remove the issue number from the PRdescription title and set it to a meaningful line, this will be useful to readers of the changelog.
About the branch, we merge 5.4 into 6.0 periodically so 6.0 will also get the fix even if we merge this on 5.4
src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig OutdatedShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
ytilotti commentedMar 31, 2022
@nicolas-grekas the issue number of the PR title or description? Title I suppose. |
derrabus commentedMar 31, 2022
Title. 🙂 |
ytilotti commentedMar 31, 2022 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Thank you for the information about the cycle. Sorry for the inconvenience but it will be taken care of for the next ones. |
derrabus commentedMar 31, 2022 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
git rebase 6.0 --onto 5.4 If rebase aborts because of conflicts, solve them and run: git add.git rebase --continueOnce the rebase completed, run: git push -f Afterwards, you should be able to switch the base branch to 5.4. |
ytilotti commentedMar 31, 2022 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Thanks@derrabus, I was close with my rebase ;) I must have missed a parameter! |
nicolas-grekas commentedMar 31, 2022
Thank you@ytilotti. |
The changes insymfony#45897 missed the whitespace between widget and label. There isno other way to force the space than moving the if statement on the same line.
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 for8016293 to work. Not sure why, but if it works it works 🏃Commits-------6f87f91 [TwigBridge] Fix the build
Uh oh!
There was an error while loading.Please reload this page.