Skip to content

ordered use statements in code examples #11277

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
Apr 24, 2019
Merged

ordered use statements in code examples #11277

merged 1 commit into from
Apr 24, 2019

Conversation

OskarStark
Copy link
Contributor

@OskarStark OskarStark commented Apr 2, 2019 •
edited
Loading

I know, that this could lead to massive merge conflicts, but if we would not merge it up, I could create a shiny new PullRequest against 4.2 and I am willing to merge it up and fix the conflicts, too!

Or does any thoughts about not to order the use statements exist, which I doesn't know?

There are a lot more todo, but before finishing this PR, I'd like to receive some feedback

@OskarStark OskarStark added this to the 3.4 milestone Apr 2, 2019
@OskarStark OskarStark requested a review from wouterj April 2, 2019 13:48
@OskarStark OskarStark changed the title ordered use statements in code examples [WIP] ordered use statements in code examples Apr 2, 2019
@OskarStark OskarStark requested a review from javiereguiluz April 2, 2019 13:50
@javiereguiluz
Copy link
Member

This would be very nice to have. About the merge conflicts ... if it's only about 10 files, it won't be hard to upmerge to 4.2. In the past we've merged PRs with hundreds of conflicts in more than 100 files.

@OskarStark
Copy link
Contributor Author

Ok cool, I will fix the rest, but there are A LOT more to fix, that’s one of the reasons for WIP 🙊

@OskarStark OskarStark force-pushed the ordered_use_statements branch 11 times, most recently from 0b0b864 to 86ac962 Compare April 3, 2019 07:17
@OskarStark
Copy link
Contributor Author

I am still working on it, but are you fine with this commit @xabbuh @javiereguiluz ?

@OskarStark OskarStark force-pushed the ordered_use_statements branch 3 times, most recently from 91fe7c8 to a5c7434 Compare April 3, 2019 08:19
@javiereguiluz
Copy link
Member

I don't have a strong opinion about that commit. We try to put the namespace always ... except when the code example is tiny or too abstract.

However, I recommend you to not make changes different than sorting the "use" statements because the PR will already be super complex ... and if you add unrelated changes, it will be even more complex.

@OskarStark OskarStark force-pushed the ordered_use_statements branch 4 times, most recently from e164c81 to 4554833 Compare April 3, 2019 11:37
@OskarStark
Copy link
Contributor Author

However, I recommend you to not make changes different than sorting the "use" statements because the PR will already be super complex ... and if you add unrelated changes, it will be even more complex.

I created a separate PR #11283

@OskarStark OskarStark force-pushed the ordered_use_statements branch from 4554833 to d73f160 Compare April 3, 2019 11:39
@OskarStark OskarStark changed the title [WIP] ordered use statements in code examples ordered use statements in code examples Apr 3, 2019
@OskarStark
Copy link
Contributor Author

This one was huge, I removed the [WIP] prefix, ready to review 👍

@OskarStark OskarStark force-pushed the ordered_use_statements branch 3 times, most recently from a5a4fc1 to 30459ce Compare April 4, 2019 06:58
javiereguiluz
javiereguiluz reviewed Apr 4, 2019
View reviewed changes
@OskarStark OskarStark force-pushed the ordered_use_statements branch from 30459ce to 1bdeba2 Compare April 8, 2019 06:01
@OskarStark OskarStark force-pushed the ordered_use_statements branch from 1bdeba2 to 7375efc Compare April 24, 2019 05:54
@OskarStark OskarStark force-pushed the ordered_use_statements branch from 7375efc to 3506a7e Compare April 24, 2019 06:09
OskarStark added a commit to OskarStark/symfony-docs that referenced this pull request Apr 24, 2019
@OskarStark
minor symfony#11277 ordered use statements in code examples (OskarStark)
93be6df 
This PR was merged into the 3.4 branch.

Discussion
----------

ordered use statements in code examples

I know, that this could lead to massive merge conflicts, but if we would not merge it up, I could create a shiny new PullRequest against `4.2` and I am willing to merge it up and fix the conflicts, too!

Or does any thoughts about **not** to order the use statements exist, which I doesn't know?

There are a lot more todo, but before finishing this PR, I'd like to receive some feedback

Commits
-------

3506a7e ordered use statements in code examples
@OskarStark OskarStark merged commit 3506a7e into symfony:3.4 Apr 24, 2019
@OskarStark OskarStark deleted the ordered_use_statements branch April 24, 2019 07:56
@OskarStark OskarStark mentioned this pull request Apr 24, 2019
Merged
OskarStark added a commit that referenced this pull request Apr 24, 2019
@OskarStark
minor #11478 ordered use statements for php code examples (OskarStark)
71cb687 
This PR was merged into the 4.2 branch.

Discussion
----------

ordered use statements for php code examples

This is a follow up of #11277 against `4.2` branch

Commits
-------

99d4670 ordered use statements for php code examples
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@javiereguiluz javiereguiluz javiereguiluz approved these changes

@wouterj wouterj wouterj approved these changes

@xabbuh xabbuh xabbuh approved these changes

Assignees
No one assigned
Labels
Status: Reviewed
Projects
None yet
Milestone
3.4
Development

Successfully merging this pull request may close these issues.
5 participants
@OskarStark @javiereguiluz @wouterj @xabbuh @carsonbot