fix: match batch response parts to requests by Content-ID - #2726
Open
sadiqk2 wants to merge 1 commit into
Open
Conversation
Batch::parseResponse() paired each response part with a request by position ($requests[$i-1]), and silently ignored the $classes map that execute() builds keyed by Content-ID. The batch API does not guarantee that parts come back in the order they were sent — that is why each part carries a Content-ID — so a reordered response was decoded into the wrong model class (or into a raw Response), and alt=media detection used the wrong request. This was a regression from the Guzzle 6 rewrite, which replaced the Content-ID lookup (`if (isset($classes[$key]))`) with positional matching and left $classes as an unused parameter. Resolve both the originating request and the expected class from the part's Content-ID, falling back to the previous positional behaviour when the Content-ID is not one we sent.
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Batch::parseResponse() paired each response part with a request by position ($requests[$i-1]), and silently ignored the $classes map that execute() builds keyed by Content-ID. The batch API does not guarantee that parts come back in the order they were sent — that is why each part carries a Content-ID — so a reordered response was decoded into the wrong model class (or into a raw Response), and alt=media detection used the wrong request.
This was a regression from the Guzzle 6 rewrite, which replaced the Content-ID lookup (
if (isset($classes[$key]))) with positional matching and left $classes as an unused parameter.Resolve both the originating request and the expected class from the part's Content-ID, falling back to the previous positional behaviour when the Content-ID is not one we sent.