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

Bump symfony/process to 2.3 - and raise minimum php to 5.3.3 #5831

Closed
wants to merge 1 commit into from

Conversation

AydinHassan
Copy link

Refs #5828

I've only updated composer.json - let me know if there is something else that should be added.

Copy link
Member

@alcohol alcohol left a comment

Choose a reason for hiding this comment

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

Should probably update the lock file too (composer update --lock)?

Also should be applied to the 1.2 branch and then we will merge it into master from there, since technically this is a bug I believe. Other than that, LGTM.

@alcohol alcohol added this to the 1.2 milestone Oct 31, 2016
@alcohol alcohol added the Bug label Oct 31, 2016
@AydinHassan AydinHassan changed the base branch from master to 1.2 October 31, 2016 10:36
@AydinHassan AydinHassan changed the base branch from 1.2 to master October 31, 2016 10:36
@alcohol
Copy link
Member

alcohol commented Oct 31, 2016

Unable to rebase it? If it is too much work for you, we can probably do it. We just appreciate it if you could do it instead, cause it saves us the hassle.

@AydinHassan
Copy link
Author

@alcohol no it's fine - will do it after work :)

@alcohol
Copy link
Member

alcohol commented Oct 31, 2016

Ok. Was just checking, cause I saw you changed the target but then changed it back :-)

@AydinHassan
Copy link
Author

I thought it was as simple as that, but I have to rebase locally and fix some conflicts, will probably be quicker to just do it again 😄

@alcohol
Copy link
Member

alcohol commented Oct 31, 2016

Yeah, probably will be. You could use the patch. Simply take the 2 commits and apply their patch on a new branch:

git format-patch -2 HEAD --stdout > /tmp/composer.patch
git checkout -b tmp-branch 1.2
git apply - < /tmp/composer.patch
git commit -p # interactively add and commit changes
git push -f origin update-symfony-process

@curry684
Copy link
Contributor

For 2 lines redoing the change on the proper branch is always faster 😆

@AydinHassan AydinHassan changed the base branch from master to 1.2 October 31, 2016 18:37
@AydinHassan
Copy link
Author

@alcohol should be done now - let me know if there's anything else

@alcohol
Copy link
Member

alcohol commented Oct 31, 2016

Thanks

@Seldaek Seldaek closed this in eb40287 Nov 3, 2016
@Seldaek
Copy link
Member

Seldaek commented Nov 3, 2016

Thanks but re 5.3.3 bump I don't think this matters much as of our users don't install composer via composer so this has little impact. But anyway this shouldn't reflect the minimum version required by our deps but by our own code. Composer takes care of enforcing the minimum version required by the deps.

@AydinHassan AydinHassan deleted the update-symfony-process branch November 3, 2016 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants