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

[Yaml] fixed handling an empty value

This commit is contained in:
Pavel Volokitin 2013-04-12 15:29:40 +06:00
parent 12b7073607
commit 047212a439
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class Parser
$parser->refs =& $this->refs;
$block = $values['value'];
if (!$this->isNextLineIndented()) {
if ($this->isNextLineIndented()) {
$block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
}
@ -174,7 +174,7 @@ class Parser
// hash
} elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
// if next line is less indented or equal, then it means that the current value is null
if ($this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
$data[$key] = null;
} else {
$c = $this->getRealCurrentLineNb() + 1;
@ -493,7 +493,7 @@ class Parser
}
$ret = false;
if ($this->getCurrentLineIndentation() <= $currentIndentation) {
if ($this->getCurrentLineIndentation() > $currentIndentation) {
$ret = true;
}

9
src/Symfony/Component/Yaml/Tests/ParserTest.php
View File

@ -492,6 +492,15 @@ yaml:
EOF
);
}
public function testEmptyValue()
{
$input = <<<EOF
hash:
EOF;
$this->assertEquals(array('hash' => null), Yaml::parse($input));
}
}
class B