10000 Remove "Symfony3 will use" by alexislefebvre · Pull Request #7122 · symfony/symfony-docs · GitHub
[go: up one dir, main page]

Skip to content

Remove "Symfony3 will use" #7122

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Conversation

alexislefebvre
Copy link
Contributor

Since Symfony 3 has been released, using "will" is unnecessary

@javiereguiluz
8000 Copy link
Member

👍

1 similar comment
@wouterj
Copy link
Member
wouterj commented Nov 6, 2016

👍

@alexislefebvre
Copy link
Contributor Author

Should the text , but for now in the sentence after Symfony3 structure be removed too?

@wouterj
Copy link
Member
wouterj commented Nov 10, 2016

Hmm, on second review, I think we should remove all lines from 159 to the end and update the file structure shown above this section with the new Symfony 3 structure.

Can you please make this change? (If it's not possible, please comment and we'll take care of finishing this PR)

@wouterj
Copy link
Member
wouterj commented Nov 10, 2016

Status: needs work

Copy link
Member
@javiereguiluz javiereguiluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@javiereguiluz
Copy link
Member

@wouterj I've made the changes you asked for.

@alexislefebvre
Copy link
Contributor Author

@javiereguiluz Thanks for the changes, I didn't know how to apply the suggestion from wouterj.

@xabbuh
Copy link
Member
xabbuh commented Nov 22, 2016

But wouldn't this be confusing for people working with the Standard Edition on Symfony 2.7/2.8?

@javiereguiluz javiereguiluz changed the base branch from 2.7 to 3.1 November 23, 2016 07:47
@javiereguiluz
Copy link
Member

@xabbuh you are right. I've changed the base branch to 3.1 using GitHub's interface. Now it shows some conflicts. Can those conflicts be solved when merging? Thanks.

@xabbuh
Copy link
Member
xabbuh commented Nov 28, 2016

Actually, there is no real difference to what we already have in 3.1 right now. So what should we do here?

@alexislefebvre
Copy link
Contributor Author

The 2.7 and 2.8 documentation still mention Symfony3 will use. Should I open another PR in order to correct this on the 2.x branch?

@xabbuh
Copy link
Member
xabbuh commented Dec 2, 2016

Well, so actually this is just about changing the wording for Symfony 2.x? Was this what we had in the first commit?

@alexislefebvre
Copy link
Contributor Author

@xabbuh More or less, the first commit lacked the changes you applied after. I'm a little bit lost now. Can the changes be rebased to 2.7 instead of 3.1?

@xabbuh
Copy link
Member
xabbuh commented Dec 6, 2016

@alexislefebvre What I mean is that the changes done in the second commit are not necessary if we decide to merge this into 2.7 which I would prefer.

@alexislefebvre
Copy link
Contributor Author

If I understand correctly, we have to keep the classic directory structure for Symfony 2.* branch because the best practices are not supposed to change before the 3.* branch. So I will revert the last commit and rebase the changes on 2.7.

alexislefebvre and others added 2 commits December 14, 2016 22:46
Since Symfony 3 has been released, using "will" is unnecessary
@alexislefebvre
Copy link
Contributor Author

I reverted the last commit. I tried to rebase on 2.7 but this is ignored in this PR. Can you please rebase it on 2.7?

xabbuh added a commit that referenced this pull request Dec 14, 2016
This PR was submitted for the 3.1 branch but it was merged into the 2.7 branch instead (closes #7122).

Discussion
----------

Remove "Symfony3 will use"

Since Symfony 3 has been released, using "will" is unnecessary

Commits
-------

e00ba0b Revert "Updated the contents for the new Symfony 3 dir structure"
0022165 Updated the contents for the new Symfony 3 dir structure
65127c9 Remove "Symfony3 will use"
@xabbuh
Copy link
Member
xabbuh commented Dec 14, 2016

Thank you @alexislefebvre. I have merged your pull request into the 2.7 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0