[Yaml] added ability for substitute aliases when mapping is on single line #25043
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
Member
| Q | A |
|---|---|
| Branch? | 2.7 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #11569 |
| License | MIT |
| Doc PR |
This was referenced Nov 20, 2017
| // But overwriting is allowed when a merge node is used in current block. | ||
| if ('<<' === $key) { | ||
| $output += $value; | ||
| } elseif ($allowOverwrite || !isset($output[$key])) { |
There was a problem hiding this comment.
These conditions are a bit hard to understand because above you have this: if ('<<' === $key) { $allowOverwrite = true; }. So, if('<<' === $key) and if($allowOverwrite) are interchangeable and this if ... elseif is a bit confusing.
There was a problem hiding this comment.
This part is executed several times (for each entry in the mapping). So $allowOverwrite can be true in a subsequent iteration where $key is different from <<.
There was a problem hiding this comment.
@javiereguiluz Is there still anything you would like to see changed?
nicolas-grekas
approved these changes
Nov 23, 2017
fabpot
approved these changes
Nov 23, 2017
|
Thank you @xabbuh. |
fabpot
added a commit
that referenced
this pull request
Nov 23, 2017
…s on single line (Michał Strzelecki, xabbuh) This PR was merged into the 2.7 branch. Discussion ---------- [Yaml] added ability for substitute aliases when mapping is on single line | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #11569 | License | MIT | Doc PR | Commits ------- dd26c80 substitute aliases in inline mappings 675a3fe added ability for substitute aliases when mapping in YAML is on single line
This was referenced Nov 30, 2017
Merged
Merged
Merged
Merged
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.