diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Yaml] Fix legacy support for omitting mapping key

Browse Source
This commit is contained in:
Maxime Steinhausser 2017-03-01 23:34:49 +01:00
parent 8d99d5758a
commit d246f2f7c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Yaml/Inline.php
View File

@ -296,7 +296,7 @@ class Inline
* *
* @internal * @internal
*/ */
public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i = 0, $evaluate = true, $references = array()) public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i = 0, $evaluate = true, $references = array(), $legacyOmittedKeySupport = false)
{ {
if (in_array($scalar[$i], array('"', "'"))) { if (in_array($scalar[$i], array('"', "'"))) {
// quoted scalar // quoted scalar
@ -318,7 +318,7 @@ class Inline
if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) { if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
$output = substr($output, 0, $match[0][1]); $output = substr($output, 0, $match[0][1]);
} }
} elseif (preg_match('/^(.*?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) { } elseif (preg_match('/^(.'.($legacyOmittedKeySupport ? '+' : '*').'?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
$output = $match[1]; $output = $match[1];
$i += strlen($output); $i += strlen($output);
} else { } else {
@ -475,7 +475,7 @@ class Inline
} }
// key // key
$key = self::parseScalar($mapping, $flags, array(':', ' '), $i, false); $key = self::parseScalar($mapping, $flags, array(':', ' '), $i, false, array(), true);
if (':' !== $key && false === $i = strpos($mapping, ':', $i)) { if (':' !== $key && false === $i = strpos($mapping, ':', $i)) {
break; break;