Changeset 8489
- Timestamp:
- 04/17/08 00:25:29 (5 months ago)
- Files:
-
- branches/1.1/lib/yaml/sfYamlParser.class.php (modified) (1 diff)
- branches/1.1/test/unit/yaml/fixtures/sfTests.yml (modified) (1 diff)
- branches/1.1/test/unit/yaml/sfYamlDumperTest.php (modified) (1 diff)
- branches/1.1/test/unit/yaml/sfYamlParserTest.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/yaml/sfYamlParser.class.php
r8410 r8489 86 86 else 87 87 { 88 $data[] = $this->parseValue($values['value']); 88 if (preg_match('/^([^ ]+)\: +({.*?)$/', $values['value'], $matches)) 89 { 90 $data[$matches[1]] = sfYamlInline::load($matches[2]); 91 } 92 else 93 { 94 $data[] = $this->parseValue($values['value']); 95 } 89 96 } 90 97 } branches/1.1/test/unit/yaml/fixtures/sfTests.yml
r8286 r8489 83 83 php: | 84 84 array('foo' => '10.0.0.2') 85 --- 86 test: A sequence with an embedded mapping 87 brief: > 88 A sequence with an embedded mapping 89 yaml: | 90 - foo 91 - bar: { bar: foo } 92 php: | 93 array('foo', 'bar' => array('bar' => 'foo')) branches/1.1/test/unit/yaml/sfYamlDumperTest.php
r8286 r8489 13 13 require_once(dirname(__FILE__).'/../../../lib/yaml/sfYamlDumper.class.php'); 14 14 15 $t = new lime_test(1 39, new lime_output_color());15 $t = new lime_test(140, new lime_output_color()); 16 16 17 17 $parser = new sfYamlParser(); branches/1.1/test/unit/yaml/sfYamlParserTest.php
r8286 r8489 12 12 require_once(dirname(__FILE__).'/../../../lib/yaml/sfYamlParser.class.php'); 13 13 14 $t = new lime_test(1 39, new lime_output_color());14 $t = new lime_test(140, new lime_output_color()); 15 15 16 16 $parser = new sfYamlParser();
