[BrowserKit] fixed missing post request parameters in file uploads #36181
Conversation
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
| @@ -134,6 +134,17 @@ public function testMultiPartRequestWithInvalidItem() | |||
| ]); | |||
| } | |||
|
|
|||
| public function testMultiPartRequestWithAdditonalParameters() | |||
There was a problem hiding this comment.
Suggested change
| public function testMultiPartRequestWithAdditonalParameters() | |
| public function testMultiPartRequestWithAdditionalParameters() |
fabpot
requested changes
Mar 27, 2020
| @@ -75,7 +75,7 @@ private function getBodyAndExtraHeaders(Request $request): array | |||
| $fields = $request->getParameters(); | |||
|
|
|||
| if ($uploadedFiles = $this->getUploadedFiles($request->getFiles())) { | |||
| $part = new FormDataPart($uploadedFiles); | |||
| $part = new FormDataPart(array_merge($uploadedFiles, $fields)); | |||
There was a problem hiding this comment.
Here, the order looks wrong. We should probably swap $fields and $uploadedFiles (to be consistent with the previous behavior). Also, can you add a test to avoid any regression in the future.
There was a problem hiding this comment.
Good spot, I've fixed this and created a second test as suggested. BTW Enjoyed watching the pull request being reviewed online.
|
Oops sorry rebased branch with master not 4.4 by accident, how do I reverse this? |
|
I would hard reset this branch on 4.4, and then chery-pick the relevant commits for this PR |
|
Thank you for the advice, hopefully all fixed now. |
fabpot
approved these changes
Mar 28, 2020
|
Thank you @codebay. |
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.
Pull Request #35827 "[BrowserKit] Nested file array prevents uploading file" introduced a bug that had not been previously covered by unit tests for the component. Requests that include additional parameters with a file upload are not being included