[YAML] Fixed parsing problem with nested DateTime lists #19029
Closed
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
| @@ -398,7 +398,7 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references = | ||
| $value = self::parseScalar($sequence, $flags, array(',', ']'), array('"', "'"), $i, true, $references); | ||
|
|
||
| // the value can be an array if a reference has been resolved to an array var | ||
| if (!is_array($value) && !$isQuoted && false !== strpos($value, ': ')) { | ||
| if (!is_array($value) && !$value instanceof \DateTimeInterface && !$isQuoted && false !== strpos($value, ': ')) { |
There was a problem hiding this comment.
What about using !is_object() here instead? That would also cover the case when an unserialized object was returned before.
There was a problem hiding this comment.
That might also do the job, of course, but I don't really overlook the consequences. Running strpos on an object will most likely fail in most of the situations, so it's probably reasonable, yes. But as I said, I don't overlook every aspect — are there any kinds of serializable objects allowed? — so I wanted to keep it as specific as possible. Feel free to loosen this in case is_object() doesn't break anything I don't see ...
|
Can you please add a test for this to avoid regressions? Status: Needs work |
|
Thank you @jkphl. |
fabpot
added a commit
that referenced
this pull request
Jun 17, 2016
…kphl, xabbuh) This PR was merged into the 3.1 branch. Discussion ---------- [YAML] Fixed parsing problem with nested DateTime lists | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19029 | License | MIT | Doc PR | The new handling for `DateTimeInterface` instances was introduced in Symfony 3.1. Commits ------- 0f47712 parse embedded mappings only if value is a string 4f13a76 [YAML] Fixed parsing problem with nested DateTime lists
Merged
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.
Without this fix, DateTime-aware parsing of a YAML source containing nested lists of dates result in an error. Consider this:
Everything is fine, result is:
But making the
anniversarya list of dateswill result in:
(I didn't capture the error messages with the most recent master branch, so line numbers differ somewhat)