[Yaml] Add an option to dump null as tilde

symfony · fancyweb · Mar 30, 2018 · Mar 30, 2018 · Mar 30, 2018 · 8a2b28bfba9a65c41b3931c8d2edcb93fb77cc7f
commit 8a2b28bfba9a65c41b3931c8d2edcb93fb77cc7f
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -127,7 +127,7 @@ public static function dump($value, int $flags = 0): string
                     throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
                 }
 
-                return 'null';
+                return self::getNullRepresentationValue($flags);
             case $value instanceof \DateTimeInterface:
                 return $value->format('c');
             case is_object($value):
@@ -153,11 +153,11 @@ public static function dump($value, int $flags = 0): string
                     throw new DumpException('Object support when dumping a YAML file has been disabled.');
                 }
 
-                return 'null';
+                return self::getNullRepresentationValue($flags);
             case is_array($value):
                 return self::dumpArray($value, $flags);
             case null === $value:
-                return 'null';
+                return self::getNullRepresentationValue($flags);
             case true === $value:
                 return 'true';
             case false === $value:
@@ -738,4 +738,13 @@ private static function getHexRegex(): string
     {
         return '~^0x[0-9a-f_]++$~i';
     }
+
+    private static function getNullRepresentationValue(int $flags): string
+    {
+        if (Yaml::DUMP_NULL_AS_TILDE & $flags) {
+            return '~';
+        }
+
+        return 'null';
+    }
 }
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -421,6 +421,11 @@ public function testNegativeIndentationThrowsException()
     {
         new Dumper(-4);
     }
+
+    public function testDumpNullAsTilde()
+    {
+        $this->assertSame('{ foo: ~ }', $this->dumper->dump(array('foo' => null), 0, 0, Yaml::DUMP_NULL_AS_TILDE));
+    }
 }
 
 class A

diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -33,6 +33,7 @@ class Yaml
     const PARSE_CONSTANT = 256;
     const PARSE_CUSTOM_TAGS = 512;
     const DUMP_EMPTY_ARRAY_AS_SEQUENCE = 1024;
+    const DUMP_NULL_AS_TILDE = 2048;
 
     /**
      * Parses a YAML file into a PHP value.
-Original file line number
+Diff line change
@@ Expand Up / @@ -421,6 +421,11 @@ public function testNegativeIndentationThrowsException() @@
         {
             new Dumper(-4);
         }
+        public function testDumpNullAsTilde()
+        {
+            $this->assertSame('{ foo: ~ }', $this->dumper->dump(array('foo' => null), 0, 0, Yaml::DUMP_NULL_AS_TILDE));
+        }
     }
     class A
@@ Expand Down @@