Fixed issue 30 (ampersands)

defunkt · May 31, 2010 · d672cb8 · d672cb8
1 parent 2da278b
commit d672cb8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/spyc.php b/spyc.php
@@ -303,7 +303,8 @@ private function _dumpNode($key, $value, $indent, $previous_key = -1, $first_key
     // do some folding here, for blocks
     if (is_string ($value) && ((strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false ||
       strpos($value,"*") !== false || strpos($value,"#") !== false || strpos($value,"<") !== false || strpos($value,">") !== false || strpos ($value, '  ') !== false ||
-      strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || substr ($value, -1, 1) == ':') 
+      strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || strpos($value,"&") !== false ||
+      substr ($value, -1, 1) == ':')
     ) {
       $value = $this->_doLiteralBlock($value,$indent);
     } else {

diff --git a/tests/DumpTest.php b/tests/DumpTest.php
@@ -48,6 +48,11 @@ public function testDumpAsterisks() {
       $this->assertEquals ($awaiting, $dump);
     }
 
+    public function testDumpAmpersands() {
+      $dump = Spyc::YAMLDump(array ('some' => '&foo'));
+      $awaiting = "---\nsome: '&foo'\n";
+      $this->assertEquals ($awaiting, $dump);
+    }
 
     public function testDumpNumericHashes() {
       $dump = Spyc::YAMLDump(array ("titel"=> array("0" => "", 1 => "Dr.", 5 => "Prof.", 6 => "Prof. Dr.")));