[Yaml] add option to dump objects as maps

xabbuh · xabbuh · commit 393d06d575dd · 2016-02-09T22:32:49.000+01:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -144,6 +144,10 @@ public static function dump($value, $exceptionOnInvalidType = false, $flags = 0)
                     return '!php/object:'.serialize($value);
                 }
 
+                if (Yaml::DUMP_OBJECT_AS_MAP & $flags && $value instanceof \stdClass) {
+                    return self::dumpArray((array) $value, $exceptionOnInvalidType, $flags);
+                }
+
                 if ($exceptionOnInvalidType) {
                     throw new DumpException('Object support when dumping a YAML file has been disabled.');
                 }
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -239,6 +239,23 @@ public function getEscapeSequences()
             'paragraph-separator' => array("\t\\P", '"\t\\\\P"'),
         );
     }
+
+    public function testDumpObjectAsMap()
+    {
+        $bar = new \stdClass();
+        $bar->class = 'classBar';
+        $bar->args = array('bar');
+        $zar = new \stdClass();
+        $foo = new \stdClass();
+        $foo->bar = $bar;
+        $foo->zar = $zar;
+        $object = new \stdClass();
+        $object->foo = $foo;
+
+        $yaml = $this->dumper->dump($object, 0, 0, false, Yaml::DUMP_OBJECT_AS_MAP);
+
+        $this->assertEquals($object, Yaml::parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
 }
 
 class A
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -24,6 +24,7 @@ class Yaml
     const PARSE_EXCEPTION_ON_INVALID_TYPE = 2;
     const PARSE_OBJECT = 4;
     const PARSE_OBJECT_FOR_MAP = 8;
+    const DUMP_OBJECT_AS_MAP = 16;
 
     /**
      * Parses YAML into a PHP value.

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,10 @@ public static function dump($value, $exceptionOnInvalidType = false, $flags = 0)`
`144`	`144`	`return '!php/object:'.serialize($value);`
`145`	`145`	`}`
`146`	`146`
	`147`	`+ if (Yaml::DUMP_OBJECT_AS_MAP & $flags && $value instanceof \stdClass) {`
	`148`	`+ return self::dumpArray((array) $value, $exceptionOnInvalidType, $flags);`
	`149`	`+ }`
	`150`	`+`
`147`	`151`	`if ($exceptionOnInvalidType) {`
`148`	`152`	`throw new DumpException('Object support when dumping a YAML file has been disabled.');`
`149`	`153`	`}`