Skip to content
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

Sync with Symfony Standard v3.4 #224

Merged
merged 1 commit into from
Apr 12, 2018
Merged

Conversation

teohhanhui
Copy link
Contributor

@teohhanhui teohhanhui commented Apr 4, 2018

@teohhanhui teohhanhui force-pushed the sync/symfony-standard branch 3 times, most recently from e318df5 to 9b958f5 Compare April 5, 2018 09:18
@teohhanhui
Copy link
Contributor Author

@pamil Any feedback on this?

@pamil
Copy link
Contributor

pamil commented Apr 10, 2018

I'm on it! :)

@pamil
Copy link
Contributor

pamil commented Apr 11, 2018

Btw. can you rebase it to 1.1 branch (it already requires Symfony 3.4)?

@teohhanhui teohhanhui force-pushed the sync/symfony-standard branch from 9b958f5 to 952658a Compare April 11, 2018 09:02
@teohhanhui teohhanhui changed the base branch from master to 1.1 April 11, 2018 09:02
@teohhanhui
Copy link
Contributor Author

Rebased.

@pamil
Copy link
Contributor

pamil commented Apr 11, 2018

The only thing that might cause issues here is "Remove bin-dir in composer.json", mostly with documentation, this PR will be good to merge after it's extracted to master (1.2) branch. Thanks for the effort and patience 🎉

@teohhanhui teohhanhui force-pushed the sync/symfony-standard branch 2 times, most recently from 8e3c547 to 17588d3 Compare April 11, 2018 14:10
@teohhanhui
Copy link
Contributor Author

Reverted the changes related to removing bin-dir.

Added some more changes to fix some deprecation messages:

@teohhanhui teohhanhui force-pushed the sync/symfony-standard branch 2 times, most recently from 66cb998 to 76cf8b2 Compare April 11, 2018 14:17
@teohhanhui teohhanhui force-pushed the sync/symfony-standard branch from 76cf8b2 to e3ac7be Compare April 11, 2018 14:48
@pamil pamil merged commit 4959e23 into Sylius:1.1 Apr 12, 2018
@pamil
Copy link
Contributor

pamil commented Apr 12, 2018

Thanks Teoh! 🎉

@teohhanhui teohhanhui deleted the sync/symfony-standard branch April 12, 2018 10:11
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.

2 participants