10000 [YAML] fix merge node (<<) by Tobion · Pull Request #11168 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[YAML] fix merge node (<<) #11168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2014
Merged

[YAML] fix merge node (<<) #11168

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02614e0
[Yaml] refactoring of merges for performance
Tobion Jun 18, 2014
8c621ab
[Yaml] fix priority of sequence merges according to spec
Tobion Jun 18, 2014
dee1562
[Yaml] fix overwriting of keys after merged map
Tobion Jun 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[Yaml] refactoring of merges for performance
  • Loading branch information
@Tobion
Tobion committed Jun 18, 2014
commit 02614e064f3d4165f09d7713b2632fb4d5a219f0
19 changes: 9 additions & 10 deletions src/Symfony/Component/Yaml/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,23 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
$parser->refs =& $this->refs;
$parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport);

$merged = array();
if (!is_array($parsed)) {
throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
} elseif (isset($parsed[0])) {
}

$isProcessed = true;
if (isset($parsed[0])) {
// Numeric array, merge individual elements
foreach (array_reverse($parsed) as $parsedItem) {
foreach ($parsed as $parsedItem) {
if (!is_array($parsedItem)) {
throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
}
$merged = array_merge($parsedItem, $merged);
$data = array_merge($data, $parsedItem);
}
} else {
// Associative array, merge
$merged = array_merge($merged, $parsed);
// Associative array
$data = $parsed;
}

$isProcessed = $merged;
}
} elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
$isRef = $matches['ref'];
Expand All @@ -173,9 +173,8 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =

if ($isProcessed) {
// Merge keys
$data = $isProcessed;
// hash
} elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
// hash
// if next line is less indented or equal, then it means that the current value is null
if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
// Spec: Keys MUST be unique; first one wins.
Expand Down
0