Changeset 10575

Timestamp:

08/01/08 15:08:42 (4 months ago)

Author:

nicolas

Message:

[1.2] backport of r10574 - fixed sfYaml::dump misunderstands hash as array (refs #4025)

Files:

• branches/1.2/lib/yaml/sfYamlDumper.class.php (modified) (1 diff)
• branches/1.2/test/unit/yaml/fixtures/sfTests.yml (modified) (1 diff)
• branches/1.2/test/unit/yaml/sfYamlDumperTest.php (modified) (1 diff)
• branches/1.2/test/unit/yaml/sfYamlParserTest.php (modified) (1 diff)

branches/1.2/lib/yaml/sfYamlDumper.class.php

@@ -41 +41 @@
-    else
-    {
-count(array_diff_key($input, array_fill(0, count($input), true))
+array_keys($input) !== range(0, count($input) - 1
-
-      foreach ($input as $key => $value)

branches/1.2/test/unit/yaml/fixtures/sfTests.yml

@@ -92 +92 @@
-php: |
-  array('foo', array('bar' => array('bar' => 'foo')))
+---
+test: A sequence with an unordered array
+brief: >
+  A sequence with an unordered array
+yaml: |
+  1: foo
+  0: bar
+php: |
+  array(1 => 'foo', 0 => 'bar')

branches/1.2/test/unit/yaml/sfYamlDumperTest.php

@@ -13 +13 @@
-require_once(dirname(__FILE__).'/../../../lib/yaml/sfYamlDumper.class.php');
-
-0
+1
-
-$parser = new sfYamlParser();

branches/1.2/test/unit/yaml/sfYamlParserTest.php

@@ -12 +12 @@
-require_once(dirname(__FILE__).'/../../../lib/yaml/sfYamlParser.class.php');
-
-0
+1
-
-$parser = new sfYamlParser();