lib/util/sfYamlDumper.class.php lib/util/sfYamlParser.class.php test/unit/util/fixtures/yaml/YtsAnchorAlias.yml test/unit/util/fixtures/yaml/YtsBasicTests.yml test/unit/util/fixtures/yaml/YtsBlockMapping.yml test/unit/util/fixtures/yaml/YtsDocumentSeparator.yml test/unit/util/fixtures/yaml/YtsErrorTests.yml test/unit/util/fixtures/yaml/YtsFlowCollections.yml test/unit/util/fixtures/yaml/YtsFoldedScalars.yml test/unit/util/fixtures/yaml/YtsNullsAndEmpties.yml test/unit/util/fixtures/yaml/YtsSpecificationExamples.yml test/unit/util/fixtures/yaml/YtsTypeTransfers.yml test/unit/util/fixtures/yaml/index.yml test/unit/util/fixtures/yaml/sfComments.yml test/unit/util/fixtures/yaml/sfTests.yml test/unit/util/sfYamlDumperTest.php test/unit/util/sfYamlParserTest.php @@ -63,15 +63,6 @@ Url: http://www.pradosoft.com/ Copyright: 2004-2006, The PRADO Group License: BSD - see licenses/LICENSE.prado file -Spyc ----- - -symfony contains the Spyc software - -Url: http://spyc.sourceforge.net/ -Copyright: 2005-2006 Chris Wanstrath -License: MIT - http://www.opensource.org/licenses/mit-license.php - lime ---- COPYRIGHT @@ -352,8 +352,9 @@ class sfCoreAutoload 'sfParameterHolder' => 'util', 'sfToolkit' => 'util', 'sfYaml' => 'util', + 'sfYamlDumper' => 'util', 'sfYamlInline' => 'util', - 'Spyc' => 'util', + 'sfYamlParser' => 'util', 'sfValidatorI18nChoiceCountry' => 'validator/i18n', 'sfValidatorI18nChoiceLanguage' => 'validator/i18n', 'sfValidator' => 'validator', lib/autoload/sfCoreAutoload.class.php @@ -61,7 +61,7 @@ abstract class sfYamlConfigHandler extends sfConfigHandler // parse our config $config = sfYaml::load($configFile); - if ($config === false || $config === null) + if ($config === false) { // configuration couldn't be parsed throw new sfParseException(sprintf('Configuration file "%s" could not be parsed', $configFile)); lib/config/sfYamlConfigHandler.class.php @@ -282,7 +282,7 @@ class sfPropelData extends sfData // save to file(s) if (!is_dir($directory_or_file)) { - file_put_contents($directory_or_file, sfYaml::dump($dumpData)); + file_put_contents($directory_or_file, sfYaml::dump($dumpData, 3)); } else { @@ -294,7 +294,7 @@ class sfPropelData extends sfData continue; } - file_put_contents(sprintf("%s/%03d-%s.yml", $directory_or_file, ++$i, $tableName), sfYaml::dump(array($tableName => $dumpData[$tableName]))); + file_put_contents(sprintf("%s/%03d-%s.yml", $directory_or_file, ++$i, $tableName), sfYaml::dump(array($tableName => $dumpData[$tableName]), 3)); } } } lib/plugins/sfPropelPlugin/lib/propel/sfPropelData.class.php @@ -897,7 +897,7 @@ class sfPropelDatabaseSchema public function asYAML() { - return sfYaml::dump(array($this->connection_name => $this->database)); + return sfYaml::dump(array($this->connection_name => $this->database), 3); } protected function getNameAndAttributes($hash, $name_attribute = 'name') lib/plugins/sfPropelPlugin/lib/propel/sfPropelDatabaseSchema.class.php @@ -90,7 +90,7 @@ EOF; } else { - fwrite(STDOUT, sfYaml::dump($data->getData('all', $options['connection']))); + fwrite(STDOUT, sfYaml::dump($data->getData('all', $options['connection']), 3)); } } } lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php @@ -85,7 +85,7 @@ EOF; 'param' => array_merge(isset($config[$options['env']][$options['name']]['param']) ? $config[$options['env']][$options['name']]['param'] : array(), array('dsn' => $arguments['dsn'])), ); - file_put_contents($file, sfYaml::dump($config)); + file_put_contents($file, sfYaml::dump($config, 4)); // update propel.ini if ( lib/task/configure/sfConfigureDatabaseTask.class.php @@ -44,7 +44,7 @@ class sfYaml return $input; } - // syck is prefered over spyc + // syck is prefered over sfYamlParser if (function_exists('syck_load')) { $retval = syck_load($input); @@ -53,11 +53,10 @@ class sfYaml } else { - require_once(dirname(__FILE__).'/Spyc.class.php'); + require_once dirname(__FILE__).'/sfYamlParser.class.php'; + $yaml = new sfYamlParser(); - $spyc = new Spyc(); - - return $spyc->load($input); + return $yaml->parse($input); } } @@ -71,7 +70,7 @@ class sfYaml * * @return string */ - public static function dump($array) + public static function dump($array, $inline = 2) { if (function_exists('syck_dump')) { @@ -79,11 +78,10 @@ class sfYaml } else { - require_once(dirname(__FILE__).'/Spyc.class.php'); - - $spyc = new Spyc(); + require_once dirname(__FILE__).'/sfYamlDumper.class.php'; + $yaml = new sfYamlDumper(); - return $spyc->dump($array, false, 0); + return $yaml->dump($array, $inline); } } lib/util/sfYaml.class.php @@ -80,6 +80,10 @@ class sfYamlInline return "''"; case preg_match(self::getTimestampRegex(), $value): return "'$value'"; + case in_array(strtolower($value), array('true', 'on', '+', 'yes', 'y')): + return "'$value'"; + case in_array(strtolower($value), array('false', 'off', '-', 'no', 'n')): + return "'$value'"; default: return $value; } lib/util/sfYamlInline.class.php @@ -85,7 +85,7 @@ $testsForDump = array( '[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'), // mappings - '{ foo: bar, bar: foo, false: false, null: null, integer: 12 }' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12), + '{ foo: bar, bar: foo, \'false\': false, null: null, integer: 12 }' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12), '{ foo: bar, bar: \'foo: bar\' }' => array('foo' => 'bar', 'bar' => 'foo: bar'), // nested sequences and mappings test/unit/util/sfYamlInlineTest.php lib/util/Spyc.class.php test/unit/util/SpycTest.php test/unit/util/fixtures/Spyc/YtsAnchorAlias.yml test/unit/util/fixtures/Spyc/YtsBasicTests.yml test/unit/util/fixtures/Spyc/YtsBlockMapping.yml test/unit/util/fixtures/Spyc/YtsDocumentSeparator.yml test/unit/util/fixtures/Spyc/YtsErrorTests.yml test/unit/util/fixtures/Spyc/YtsFlowCollections.yml test/unit/util/fixtures/Spyc/YtsFoldedScalars.yml test/unit/util/fixtures/Spyc/YtsNullsAndEmpties.yml test/unit/util/fixtures/Spyc/YtsSpecificationExamples.yml test/unit/util/fixtures/Spyc/YtsTypeTransfers.yml test/unit/util/fixtures/Spyc/index.yml test/unit/util/fixtures/Spyc/sfComments.yml test/unit/util/fixtures/Spyc/sfTests.yml cc901dee2d02ba6b0a333bbc68f993c27b104a65 fabien fabien@ee427ae8-e902-0410-961c-c3ed070cd9f9 http://github.com/WIZARDISHUNGRY/symfony/commit/b094cdde6352ab1dffd1bca30e130022ea6bbede b094cdde6352ab1dffd1bca30e130022ea6bbede 2008-03-14T14:59:38-07:00 2008-03-14T14:59:38-07:00 replaced Spyc with a new YAML parser/dumper (closes #3083, #2887, #2622, #2514, #1966, #1339, #3016) * removed Spyc * added sfYamlParser, sfYamlDumper (should be totally BC thanks to the unit tests) * the parser and the dumper are much more robust and much more easier to fix * exceptions are thrown when a non valid YAML file is parsed (when you forget a : after a key for example, or if the indentation is not right ;)) * fixed a bunch of bugs of the old parser * speed is more or less the same as Spyc * added an option to control the dump to switch from the block to the flow notation (propel:build-schema is now much more readable in YAML) * added more unit tests git-svn-id: http://svn.symfony-project.com/branches/1.1@7892 ee427ae8-e902-0410-961c-c3ed070cd9f9 e1597760981e3f800046ff1477f9f9d74a6ea372 fabien fabien@ee427ae8-e902-0410-961c-c3ed070cd9f9