[5.3] Keep files in the $data array after hydration #16104
Closed
Conversation
This file contains 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
themsaid
referenced
this pull request
Oct 25, 2016
… array (#15663) * Update Validator.php If this value is an instance of the Array, failed when remove files from the data
nhowell
reviewed
Oct 25, 2016
| } elseif (is_array($value) && ! empty($value) && | ||
| empty($this->hydrateFiles($value, $newKey))) { | ||
| unset($data[$key]); |
There was a problem hiding this comment.
The elseif block is empty now. Should be removed, yeah?
There was a problem hiding this comment.
Actually, it's still calling $this->hydrateFiles($value, $newKey) inside the conditional. So I'm not sure how that should be handled.
|
Honestly since this itself is a small breaking change because the content of $data will be different, maybe the answer is to just backport the 5.4 change. validator->getFiles() is not documented and I'm not sure what it would ever be used for. It's probably used to make our own testing easier more than anything. |
|
Will open a new PR with a backport for the changes we made in the 5.4 branch. |
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.
Let's say we have this validator instance:
When
hydrateFiles()is called$validator->datawill be empty, and$validator->fileswill look like:So when the required rule runs, it expects a
fileskey to be present, but that key was removed during hydration so the rule will fail although there are files present in the Validator instance.This PR prevents removing the files from
$validator->datawhich will make such rule pass.In 5.4 we removed the hydration step entirely.