Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 31, 2022
Merged

[TwigBridge] fix bootstrap_3_layout ChoiceType's expanded label_html #45897

merged 1 commit into from
Mar 31, 2022

Conversation

ytilotti
Copy link
Contributor

@ytilotti ytilotti commented Mar 30, 2022 •
edited by nicolas-grekas
Loading

Q A
Branch? 5.4
Bug fix? yes
New feature? no
Deprecations? no
Tickets Fix #41189
License MIT

@carsonbot carsonbot added this to the 6.0 milestone Mar 30, 2022
@carsonbot
Copy link

Hey!

I see that this is your first PR. That is great! Welcome!

Symfony has a contribution guide which I suggest you to read.

In short:

  • Always add tests
  • Keep backward compatibility (see https://symfony.com/bc).
  • Bug fixes must be submitted against the lowest maintained branch where they apply (see https://symfony.com/releases)
  • Features and deprecations must be submitted against the 6.1 branch.

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!
If this PR is merged in a lower version branch, it will be merged up to all maintained branches within a few days.

I am going to sit back now and wait for the reviews.

Cheers!

Carsonbot

@carsonbot carsonbot changed the title fix #41189 [TwigBridge] fix #41189 Mar 30, 2022
@derrabus
Copy link
Member

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
Copy link
Contributor Author

I can do a PR for 5.4 too. But the bug is available on 6.x

nicolas-grekas
nicolas-grekas reviewed Mar 31, 2022
View reviewed changes
Copy link
Member

@nicolas-grekas nicolas-grekas left a comment •
edited
Loading

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 PR description 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

@ytilotti
Copy link
Contributor Author

@nicolas-grekas the issue number of the PR title or description? Title I suppose.

@derrabus
Copy link
Member

Title. 🙂

@ytilotti ytilotti changed the base branch from 6.0 to 5.4 March 31, 2022 11:51
@ytilotti ytilotti changed the base branch from 5.4 to 6.0 March 31, 2022 11:51
@ytilotti ytilotti changed the title [TwigBridge] fix #41189 [TwigBridge] fix bootstrap_3_layout ChoiceType's expanded label_html Mar 31, 2022
@ytilotti
Copy link
Contributor Author

ytilotti commented Mar 31, 2022 •
edited
Loading

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

Thank you for the information about the cycle.
@nicolas-grekas, In my case I created the PR on 6.0. I can't change the original branch (maybe a rebase?). Either I recreate the PR or? It's not possible to change the from of PR.

Sorry for the inconvenience but it will be taken care of for the next ones.

@derrabus
Copy link
Member

derrabus commented Mar 31, 2022 •
edited
Loading 

git rebase 6.0 --onto 5.4

If rebase aborts because of conflicts, solve them and run:

git add .
git rebase --continue

Once the rebase completed, run:

git push -f

Afterwards, you should be able to switch the base branch to 5.4.

@ytilotti ytilotti changed the base branch from 6.0 to 5.4 March 31, 2022 13:36
@ytilotti
Copy link
Contributor Author

ytilotti commented Mar 31, 2022 •
edited
Loading

Thanks @derrabus, I was close with my rebase ;) I must have missed a parameter!

@nicolas-grekas nicolas-grekas modified the milestones: 6.0, 5.4 Mar 31, 2022
@nicolas-grekas
Copy link
Member

Thank you @ytilotti.

@nicolas-grekas nicolas-grekas merged commit 3a76820 into symfony:5.4 Mar 31, 2022
wouterj added a commit to wouterj/symfony that referenced this pull request Mar 31, 2022
@wouterj
[TwigBridge] Fix whitespace control in boostrap 3 layout
96a073a 
The changes in symfony#45897 missed the whitespace between widget and label. There is
no other way to force the space than moving the if statement on the same line.
@wouterj wouterj mentioned this pull request Mar 31, 2022
Merged
fabpot added a commit that referenced this pull request Apr 1, 2022
@fabpot
bug #45905 [TwigBridge] Fix the build (wouterj)
08966f7 
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
This was referenced Apr 2, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicolas-grekas nicolas-grekas nicolas-grekas approved these changes

@lyrixx lyrixx Awaiting requested review from lyrixx

@yceruto yceruto Awaiting requested review from yceruto

@wouterj wouterj Awaiting requested review from wouterj

@chalasr chalasr Awaiting requested review from chalasr

@dunglas dunglas Awaiting requested review from dunglas

@OskarStark OskarStark Awaiting requested review from OskarStark

@jderusse jderusse Awaiting requested review from jderusse

@xabbuh xabbuh Awaiting requested review from xabbuh

Assignees
No one assigned
Labels
Bug Status: Reviewed TwigBridge
Projects
None yet
Milestone
5.4
Development

Successfully merging this pull request may close these issues.
4 participants
@ytilotti @carsonbot @derrabus @nicolas-grekas