Changeset 7886

Timestamp:

03/14/08 20:16:02 (1 year ago)

Author:

fabien

Message:

fixed bugs in sfYamlInline

• throw an exception when trying to dump a resource
  
• escape \n in strings when dumping
  
• change ' escaping to (as in the YAML spec)
  
• better support for timestamps (as in the YAML spec)
  
• fixed dumping an empty string
  
• fixed dumping keys that contains special characters that need escaping
  
• remove comments at the end of a line
  
• unescape \n in "" string when loading a value
  
• added support for !str
  
• fixed support for floats
  

Files:

• branches/1.1/lib/util/sfYamlInline.class.php (modified) (10 diffs)
• branches/1.1/test/unit/util/sfYamlInlineTest.php (modified) (2 diffs)

branches/1.1/lib/util/sfYamlInline.class.php

@@ -28 +28 @@
-  static public function load($value)
-  {
-
+
+
+
-    {
-      return '';
-    }
-
-    $value = trim($value);
-
-    switch ($value[0])
@@ -57 +57 @@
-    switch (true)
-    {
+      case is_resource($value):
+        throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
-      case is_object($value):
-        throw new sfException('Unable to dump objects to a YAML string.');
@@ -71 +73 @@
-      case is_numeric($value):
-        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : $value;
+      case false !== strpos($value, "\n"):
+        return sprintf('"%s"', str_replace(array('"', "\n"), array('\\"', '\n'), $value));
-      case preg_match('/[ \s \' " \: \{ \} \[ \] , ]/x', $value):
-
+
+
+
+
+
-      default:
-        return $value;
@@ -107 +115 @@
-    foreach ($value as $key => $val)
-    {
-$key
+self::dump($key)
-    }
-
@@ -124 +132 @@
-   * @return string YAML
-   */
-rotected
+ublic
-  {
-    if (in_array($scalar[$i], $stringDelimiters))
@@ -141 +149 @@
-        $output = substr($scalar, $i);
-        $i += strlen($output);
+
+        // remove comments
+        if (false !== $strpos = strpos($output, ' #'))
+        {
+          $output = rtrim(substr($output, 0, $strpos - 1));
+        }
-      }
-      else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match))
@@ -172 +186 @@
-    $buffer = '';
-    $len = strlen($scalar);
+    $escaped = '"' == $delimiter ? '\\"' : "''";
+
-    while ($i < $len)
-    {
-'\\'.$delimiter
+$escaped
-      {
-        $buffer .= $delimiter;
@@ -189 +205 @@
-
-      ++$i;
+    }
+
+    if ('"' == $delimiter)
+    {
+      // evaluate the string
+      $buffer = str_replace('\\n', "\n", $buffer);
-    }
-
@@ -321 +343 @@
-      case '~' == $scalar:
-        return null;
+      case 0 === strpos($scalar, '!str'):
+        return (string) substr($scalar, 5);
-      case ctype_digit($scalar):
-        return '0' == $scalar[0] ? octdec($scalar) : intval($scalar);
@@ -333 +357 @@
-      case 0 == strcasecmp($scalar, '-.inf'):
-        return log(0);
-
-
+
+
+
+
-      default:
-        return (string) $scalar;
-    }
-  }
+
+  static protected function getTimestampRegex()
+  {
+    return <<<EOF
+    ~^
+    (?P<year>[0-9][0-9][0-9][0-9])
+    -(?P<month>[0-9][0-9]?)
+    -(?P<day>[0-9][0-9]?)
+    (?:(?:[Tt]|[ \t]+)
+    (?P<hour>[0-9][0-9]?)
+    :(?P<minute>[0-9][0-9])
+    :(?P<second>[0-9][0-9])
+    (?:\.(?P<fraction>[0-9]*))?
+    (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+    (?::(?P<tz_minute>[0-9][0-9]))?))?)?
+    $~x
+EOF;
+  }
-}

branches/1.1/test/unit/util/sfYamlInlineTest.php

@@ -34 +34 @@
-  '2007-10-30 02:59:43 Z' => gmmktime(2, 59, 43, 10, 30, 2007),
-
-"string
-\'quoted strings inside\
+\"string\
+''quoted strings inside'
-
-  // sequences
@@ -79 +79 @@
-  '-.Inf' => log(0),
-
-
-
+
-
-  // sequences