Changeset 28186
- Timestamp:
- 02/22/10 15:45:05 (3 years ago)
- Files:
-
- branches/2.0/src/Symfony/Components/Yaml/Parser.php (modified) (2 diffs)
- branches/2.0/tests/fixtures/Symfony/Components/Yaml/sfTests.yml (modified) (1 diff)
- branches/2.0/tests/unit/Symfony/Components/Yaml/DumperTest.php (modified) (1 diff)
- branches/2.0/tests/unit/Symfony/Components/Yaml/ParserTest.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/2.0/src/Symfony/Components/Yaml/Parser.php
r28176 r28186 190 190 else 191 191 { 192 if (1 == count($this->lines)) 192 // 1-liner followed by newline 193 if (2 == count($this->lines) && empty($this->lines[1])) 193 194 { 194 195 $value = Inline::load($this->lines[0]); … … 541 542 $value = str_replace(array("\r\n", "\r"), "\n", $value); 542 543 543 // remove trailing newlines 544 $value = rtrim($value, "\n"); 544 if (!preg_match("#\n$#", $value)) 545 { 546 $value .= "\n"; 547 } 545 548 546 549 // strip YAML header branches/2.0/tests/fixtures/Symfony/Components/Yaml/sfTests.yml
r27917 r28186 13 13 php: | 14 14 array('foo' => array()) 15 --- 16 test: Empty value 17 yaml: | 18 foo: 19 php: | 20 array('foo' => null) 15 21 --- 16 22 test: Inline string parsing branches/2.0/tests/unit/Symfony/Components/Yaml/DumperTest.php
r27917 r28186 17 17 Yaml::setSpecVersion('1.1'); 18 18 19 $t = new LimeTest(14 8);19 $t = new LimeTest(149); 20 20 21 21 $parser = new Parser(); branches/2.0/tests/unit/Symfony/Components/Yaml/ParserTest.php
r27919 r28186 17 17 Yaml::setSpecVersion('1.1'); 18 18 19 $t = new LimeTest(14 8);19 $t = new LimeTest(149); 20 20 21 21 $parser = new Parser();
