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

Use get_message_body_summary of PSR7 and require min 1.5 #2227

Merged
merged 6 commits into from Oct 23, 2019

Conversation

gmponos
Copy link
Member

@gmponos gmponos commented Dec 3, 2018

No description provided.

@sagikazarmark
Copy link
Member

Looks like this is in direct conflict with #2272

@gmponos
Copy link
Member Author

gmponos commented Apr 15, 2019

Why? The function on the PSR-7 package has a parameter on how many chars to use

https://github.com/guzzle/psr7/blob/master/src/functions.php#L853

after merging this the author of the other MR has to resolve conflicts... or it could be the other way around...

Copy link
Member

@Nyholm Nyholm left a comment

Choose a reason for hiding this comment

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

Thank you.
I am happy to merge this PR in 6.5. Please rebase and I'll be happy to merge.

composer.json Outdated
@@ -24,7 +24,7 @@
"php": ">=5.5",
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.4"
"guzzlehttp/psr7": "^1.5.2"
Copy link
Member

Choose a reason for hiding this comment

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

This change is not needed.
Please rebase your PR:

@Nyholm Nyholm added this to the 6.5.0 milestone Oct 18, 2019
Copy link
Member

@Nyholm Nyholm left a comment

Choose a reason for hiding this comment

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

I rebased the PR

@Nyholm Nyholm merged commit 7fad786 into guzzle:master Oct 23, 2019
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.

None yet

3 participants