tweet_live: comparison web/lib/Zend/Config/Yaml.php

equal deleted inserted replaced

-:2251fb41dbc7
+:1e110b03ae96
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category  Zend
 * @package   Zend_Config
-* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd     New BSD License
-* @version   $Id: Yaml.php 23294 2010-11-05 00:27:34Z ramon $
+* @version   $Id: Yaml.php 25169 2012-12-22 12:23:11Z rob $
 */
 /**
 * @see Zend_Config
 */
 /**
 * YAML Adapter for Zend_Config
 *
 * @category  Zend
 * @package   Zend_Config
-* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Config_Yaml extends Zend_Config
 {
 /**
 }
 /**
 * Set callback for decoding YAML
 *
-* @param  $yamlDecoder the decoder to set
+* @param  callable $yamlDecoder the decoder to set
 * @return Zend_Config_Yaml
 */
 public function setYamlDecoder($yamlDecoder)
 {
 if (!is_callable($yamlDecoder)) {
 * Options may include:
 * - allow_modifications: whether or not the config object is mutable
 * - skip_extends: whether or not to skip processing of parent configuration
 * - yaml_decoder: a callback to use to decode the Yaml source
 *
-* @param  string  $yaml     YAML file to process
+* @param  string        $yaml     YAML file to process
-* @param  mixed   $section Section to process
+* @param  mixed         $section  Section to process
-* @param  boolean $options Whether modifiacations are allowed at runtime
+* @param  array|boolean $options
 */
 public function __construct($yaml, $section = null, $options = false)
 {
 if (empty($yaml)) {
 require_once 'Zend/Config/Exception.php';
 } elseif (is_array($section)) {
 $dataArray = array();
 foreach ($section as $sectionName) {
 if (!isset($config[$sectionName])) {
 require_once 'Zend/Config/Exception.php';
-throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section));
+throw new Zend_Config_Exception(sprintf(
+'Section "%s" cannot be found',
+implode(' ', (array)$section)
+));
 }
 $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray);
 }
 parent::__construct($dataArray, $allowModifications);
 } else {
 if (!isset($config[$section])) {
 require_once 'Zend/Config/Exception.php';
-throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section));
+throw new Zend_Config_Exception(sprintf(
+'Section "%s" cannot be found',
+implode(' ', (array)$section)
+));
 }
 $dataArray = $this->_processExtends($config, $section);
 if (!is_array($dataArray)) {
 // Section in the yaml data contains just one top level string
 protected static function _decodeYaml($currentIndent, &$lines)
 {
 $config   = array();
 $inIndent = false;
 while (list($n, $line) = each($lines)) {
-$lineno = $n+1;
+$lineno = $n + 1;
+$line = rtrim(preg_replace("/#.*$/", "", $line));
 if (strlen($line) == 0) {
 continue;
 }
-if ($line[0] == '#') {
-// comment
-continue;
-}
 $indent = strspn($line, " ");
 // line without the spaces
 $line = trim($line);
 if (strlen($line) == 0) {
 if (!$inIndent) {
 $currentIndent = $indent;
 $inIndent      = true;
 }
-if (preg_match("/(\w+):\s*(.*)/", $line, $m)) {
+if (preg_match("/(?!-)([\w\-]+):\s*(.*)/", $line, $m)) {
 // key: value
-if ($m[2]) {
+if (strlen($m[2])) {
 // simple key: value
-$value = $m[2];
+$value = preg_replace("/#.*$/", "", $m[2]);
-// Check for booleans and constants
+$value = self::_parseValue($value);
-if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) {
-$value = true;
-} elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) {
-$value = false;
-} elseif (!self::$_ignoreConstants) {
-// test for constants
-$value = self::_replaceConstants($value);
-}
 } else {
 // key: and then values on new lines
 $value = self::_decodeYaml($currentIndent + 1, $lines);
 if (is_array($value) && !count($value)) {
 $value = "";
 $config[$m[1]] = $value;
 } elseif ($line[0] == "-") {
 // item in the list:
 // - FOO
 if (strlen($line) > 2) {
-$config[] = substr($line, 2);
+$value = substr($line, 2);
+$config[] = self::_parseValue($value);
 } else {
 $config[] = self::_decodeYaml($currentIndent + 1, $lines);
 }
 } else {
 require_once 'Zend/Config/Exception.php';
 }
 return $config;
 }
 /**
+* Parse values
+*
+* @param string $value
+* @return string
+*/
+protected static function _parseValue($value)
+{
+$value = trim($value);
+// remove quotes from string.
+if ('"' == $value['0']) {
+if ('"' == $value[count($value) -1]) {
+$value = substr($value, 1, -1);
+}
+} elseif ('\'' == $value['0'] && '\'' == $value[count($value) -1]) {
+$value = strtr($value, array("''" => "'", "'" => ''));
+}
+// Check for booleans and constants
+if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) {
+$value = true;
+} elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) {
+$value = false;
+} elseif (strcasecmp($value, 'null') === 0) {
+$value = null;
+} elseif (!self::$_ignoreConstants) {
+// test for constants
+$value = self::_replaceConstants($value);
+}
+return $value;
+}
+/**
 * Replace any constants referenced in a string with their values
 *
 * @param  string $value
 * @return string
 */

changeset 886	1e110b03ae96
parent 807	877f952ae2bd
child 1230	68c69c656a2c