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

[2.0] Restrict conflict with php-http/client-common #681

Merged
merged 1 commit into from
Nov 2, 2018

Conversation

Jean85
Copy link
Collaborator

@Jean85 Jean85 commented Oct 29, 2018

In #658 I did found an issue with php-http/client-common 1.8.0, precisely php-http/client-common#109. The problematic code is now reverted, so we can reduce the conflict constraint to the only bugged version.

@Jean85 Jean85 added this to the Release 2.0 milestone Oct 29, 2018
@Jean85 Jean85 self-assigned this Oct 29, 2018
@Jean85
Copy link
Collaborator Author

Jean85 commented Oct 29, 2018

Damn, build is now failing due to php-http/message#100

@HazAT HazAT mentioned this pull request Oct 29, 2018
@ste93cry ste93cry self-requested a review October 30, 2018 08:43
@ste93cry
Copy link
Collaborator

ste93cry commented Nov 1, 2018

They fixed the BC of php-http/message#100 in php-http/message 1.7.2. If you can force the CI to run again when all is green I will review the PR and merge it

EDIT: I have forced the build to run again and all is green, so LGTM

@ste93cry ste93cry merged commit 3c75bc0 into 2.0 Nov 2, 2018
@ste93cry ste93cry deleted the httplug-reduce-conflict branch November 2, 2018 10:01
@Jean85 Jean85 mentioned this pull request Nov 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants