-
-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
Conversation
👍 |
1 similar comment
👍 |
Should the text , but for now in the sentence after Symfony3 structure be removed too? |
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) |
Status: needs work |
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.
👍
@wouterj I've made the changes you asked for. |
@javiereguiluz Thanks for the changes, I didn't know how to apply the suggestion from wouterj. |
But wouldn't this be confusing for people working with the Standard Edition on Symfony 2.7/2.8? |
@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. |
Actually, there is no real difference to what we already have in 3.1 right now. So what should we do here? |
Well, so actually this is just about changing the wording for Symfony 2.x? Was this what we had in the first commit? |
@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? |
@alexislefebvre What I mean is that the changes done in the second commit are not necessary if we decide to merge this into |
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. |
Since Symfony 3 has been released, using "will" is unnecessary
fbe5c11
to
7c25303
Compare
This reverts commit fbe5c11.
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? |
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"
Thank you @alexislefebvre. I have merged your pull request into the |
Since Symfony 3 has been released, using "will" is unnecessary